<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181892] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181892">181892</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-24 08:11:39 -0700 (Tue, 24 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL] Add OpenWebRTC in jhbuild
https://bugs.webkit.org/show_bug.cgi?id=142778
Reviewed by Gyuyoung Kim.
Original patch by Philippe Normand <pnormand@igalia.com>
.:
* Source/cmake/OptionsEfl.cmake: Look for OpenWebRTC library if
mediastream build is enabled.
Source/WebCore:
* PlatformEfl.cmake: Add OpenWebRTC CFLAGS and LDFLAGS.
Tools:
* efl/install-dependencies: Dependencies for OpenWebRTC.
* efl/jhbuild.modules: build OpenWebRTC, libusrsctp, libnice and
the openwebrtc gst plugins.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformEflcmake">trunk/Source/WebCore/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolseflinstalldependencies">trunk/Tools/efl/install-dependencies</a></li>
<li><a href="#trunkToolsefljhbuildmodules">trunk/Tools/efl/jhbuild.modules</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (181891 => 181892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/ChangeLog 2015-03-24 15:11:39 UTC (rev 181892)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-03-24 Csaba Osztrogonác <ossy@webkit.org>
+
+ [EFL] Add OpenWebRTC in jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=142778
+
+ Reviewed by Gyuyoung Kim.
+
+ Original patch by Philippe Normand <pnormand@igalia.com>
+
+ * Source/cmake/OptionsEfl.cmake: Look for OpenWebRTC library if
+ mediastream build is enabled.
+
</ins><span class="cx"> 2015-03-23 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Add a configure option to build without Redirected XComposite Window
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181891 => 181892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Source/WebCore/ChangeLog 2015-03-24 15:11:39 UTC (rev 181892)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-24 Csaba Osztrogonác <ossy@webkit.org>
+
+ [EFL] Add OpenWebRTC in jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=142778
+
+ Reviewed by Gyuyoung Kim.
+
+ Original patch by Philippe Normand <pnormand@igalia.com>
+
+ * PlatformEfl.cmake: Add OpenWebRTC CFLAGS and LDFLAGS.
+
</ins><span class="cx"> 2015-03-23 Yoav Weiss <yoav@yoav.ws>
</span><span class="cx">
</span><span class="cx"> Update empty image canvas tests and fix a related bug
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformEfl.cmake (181891 => 181892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformEfl.cmake 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-03-24 15:11:39 UTC (rev 181892)
</span><span class="lines">@@ -331,6 +331,15 @@
</span><span class="cx"> ${HARFBUZZ_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+if (ENABLE_MEDIA_STREAM)
+ list(APPEND WebCore_INCLUDE_DIRECTORIES
+ ${OPENWEBRTC_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${OPENWEBRTC_LIBRARIES}
+ )
+endif ()
+
</ins><span class="cx"> if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/gstreamer"
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (181891 => 181892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Source/cmake/OptionsEfl.cmake 2015-03-24 15:11:39 UTC (rev 181892)
</span><span class="lines">@@ -194,6 +194,13 @@
</span><span class="cx"> endif ()
</span><span class="cx"> endif ()
</span><span class="cx">
</span><ins>+if (ENABLE_MEDIA_STREAM)
+ find_package(OpenWebRTC)
+ if (OPENWEBRTC_FOUND)
+ add_definitions(-DWTF_USE_OPENWEBRTC)
+ endif ()
+endif ()
+
</ins><span class="cx"> if (ENABLE_NETSCAPE_PLUGIN_API)
</span><span class="cx"> set(ENABLE_PLUGIN_PROCESS 1)
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181891 => 181892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Tools/ChangeLog 2015-03-24 15:11:39 UTC (rev 181892)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-03-24 Csaba Osztrogonác <ossy@webkit.org>
+
+ [EFL] Add OpenWebRTC in jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=142778
+
+ Reviewed by Gyuyoung Kim.
+
+ Original patch by Philippe Normand <pnormand@igalia.com>
+
+ * efl/install-dependencies: Dependencies for OpenWebRTC.
+ * efl/jhbuild.modules: build OpenWebRTC, libusrsctp, libnice and
+ the openwebrtc gst plugins.
+
</ins><span class="cx"> 2015-03-23 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Regression(r181257): WTF_WorkQueue.Simple is flaky
</span></span></pre></div>
<a id="trunkToolseflinstalldependencies"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/install-dependencies (181891 => 181892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/install-dependencies 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Tools/efl/install-dependencies 2015-03-24 15:11:39 UTC (rev 181892)
</span><span class="lines">@@ -73,8 +73,10 @@
</span><span class="cx"> libgpg-error-dev \
</span><span class="cx"> libicu-dev \
</span><span class="cx"> libjpeg-dev \
</span><ins>+ libjson-glib-dev \
</ins><span class="cx"> liblua5.1-0-dev \
</span><span class="cx"> libmpg123-dev \
</span><ins>+ liborc-0.4-dev \
</ins><span class="cx"> libp11-kit-dev \
</span><span class="cx"> libpng-dev \
</span><span class="cx"> libpulse-dev \
</span></span></pre></div>
<a id="trunkToolsefljhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/jhbuild.modules (181891 => 181892)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/jhbuild.modules 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Tools/efl/jhbuild.modules 2015-03-24 15:11:39 UTC (rev 181892)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx"> <dep package="gst-libav"/>
</span><span class="cx"> <dep package="libseccomp"/>
</span><span class="cx"> <dep package="atk"/>
</span><ins>+ <dep package="openwebrtc"/>
</ins><span class="cx"> </dependencies>
</span><span class="cx"> </metamodule>
</span><span class="cx">
</span><span class="lines">@@ -39,6 +40,8 @@
</span><span class="cx"> href="http://cairographics.org"/>
</span><span class="cx"> <repository type="tarball" name="freedesktop.org"
</span><span class="cx"> href="http://www.freedesktop.org"/>
</span><ins>+ <repository type="tarball" name="nice.freedesktop.org"
+ href="http://nice.freedesktop.org/"/>
</ins><span class="cx"> <repository type="tarball" name="enlightenment.fr"
</span><span class="cx"> href="http://git.enlightenment.fr/cgit.cgi/svn/"/>
</span><span class="cx"> <repository type="tarball" name="xmlsoft.org"
</span><span class="lines">@@ -294,4 +297,43 @@
</span><span class="cx"> </dependencies>
</span><span class="cx"> </autotools>
</span><span class="cx">
</span><ins>+ <autotools id="libusrsctp" autogen-sh="./bootstrap; ./configure">
+ <branch repo="github.com" module="ossy-szeged/sctp-refimpl/archive/libusrsctp-r9168.tar.gz" version="r9168" checkoutdir="libusrsctp"
+ hash="sha256:c1947e6a67fdc0d12f9f078265141125d0df019c7189d60e24f2331f4b6aaec2"
+ md5sum="468386780c94370b1fb9b446ae3011ad" size="629523">
+ </branch>
+ </autotools>
+
+ <autotools id="gst-plugins-openwebrtc" supports-parallel-builds="no" autogen-sh="./autogen.sh; ./configure">
+ <dependencies>
+ <dep package="gst-plugins-base"/>
+ <dep package="libusrsctp"/>
+ </dependencies>
+ <branch repo="github.com" module="EricssonResearch/openwebrtc-gst-plugins/archive/e359b67484af90f416ea35e301205d2b53c77a14.tar.gz" checkoutdir="gst-plugins-openwebrtc" version="gst-plugins-openwebrtc-20150317"
+ hash="sha256:a456425efb88de39c16a4f8ac4214aaf53157f9df1323f08de375c77f227b6b7"
+ md5sum="827f13634ffa83cccf1a6312effbceaa" size="92883">
+ </branch>
+ </autotools>
+
+ <autotools id="libnice">
+ <dependencies>
+ <dep package="gstreamer"/>
+ </dependencies>
+ <branch repo="nice.freedesktop.org" module="releases/libnice-0.1.10.tar.gz" checkoutdir="libnice" version="0.1.10"
+ hash="sha256:1dbfb663b730889ae8cab13a2913fe557d581f70b513c918bbbd0b7d3eefebc9"
+ md5sum="27b62d0093ce29a39df1c6fcf0bb4396" size="903083">
+ </branch>
+ </autotools>
+
+ <autotools id="openwebrtc" autogenargs="--enable-bridge=no">
+ <dependencies>
+ <dep package="gst-plugins-openwebrtc"/>
+ <dep package="libnice"/>
+ </dependencies>
+ <branch repo="github.com" module="WebRTCinWebKit/openwebrtc/archive/1598e6f612d257196db70d0cf930ede94f83497a.tar.gz" checkoutdir="openwebrtc" version="configurable-sinks"
+ hash="sha256:584922ffd4cef9f991e6035bb6d87f6b09ded23e245d1ff15db3c0af9cddcf29"
+ md5sum="1598e6f612d257196db70d0cf930ede94f83497a.tar.gz" size="243435">
+ </branch>
+ </autotools>
+
</ins><span class="cx"> </moduleset>
</span></span></pre>
</div>
</div>
</body>
</html>