<!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>[181624] 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/181624">181624</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-17 01:39:05 -0700 (Tue, 17 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] basic OpenWebRTC build support
https://bugs.webkit.org/show_bug.cgi?id=142393
Reviewed by Carlos Garcia Campos.
.:
* Source/cmake/FindOpenWebRTC.cmake: Added.
* Source/cmake/OptionsGTK.cmake: Look for OpenWebRTC library if
mediastream build is enabled.
Source/WebCore:
* PlatformGTK.cmake: Add OpenWebRTC CFLAGS and LDFLAGS.
Tools:
* gtk/jhbuild.modules: Add OpenWebRTC and its dependencies. This
is not the upstream OpenWebRTC repository. This temporary fork
contains a few patches needed by WebKit for audio/video rendering.</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="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkinstalldependencies">trunk/Tools/gtk/install-dependencies</a></li>
<li><a href="#trunkToolsgtkjhbuildmodules">trunk/Tools/gtk/jhbuild.modules</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeFindOpenWebRTCcmake">trunk/Source/cmake/FindOpenWebRTC.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (181623 => 181624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-03-17 07:58:27 UTC (rev 181623)
+++ trunk/ChangeLog 2015-03-17 08:39:05 UTC (rev 181624)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-17 Philippe Normand <pnormand@igalia.com>
+
+ [GTK] basic OpenWebRTC build support
+ https://bugs.webkit.org/show_bug.cgi?id=142393
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/FindOpenWebRTC.cmake: Added.
+ * Source/cmake/OptionsGTK.cmake: Look for OpenWebRTC library if
+ mediastream build is enabled.
+
</ins><span class="cx"> 2015-03-17 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMake][EFL] Build test tools only for developer mode
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (181623 => 181624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-17 07:58:27 UTC (rev 181623)
+++ trunk/Source/WebCore/ChangeLog 2015-03-17 08:39:05 UTC (rev 181624)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-03-17 Philippe Normand <pnormand@igalia.com>
+
+ [GTK] basic OpenWebRTC build support
+ https://bugs.webkit.org/show_bug.cgi?id=142393
+
+ Reviewed by Carlos Garcia Campos.
+
+ * PlatformGTK.cmake: Add OpenWebRTC CFLAGS and LDFLAGS.
+
</ins><span class="cx"> 2015-03-17 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove never used "useLayerOnTop" bindings generator argument
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (181623 => 181624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2015-03-17 07:58:27 UTC (rev 181623)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2015-03-17 08:39:05 UTC (rev 181624)
</span><span class="lines">@@ -368,6 +368,15 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</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_TEXTURE_MAPPER)
</span><span class="cx"> list(APPEND WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBCORE_DIR}/platform/graphics/texmap"
</span></span></pre></div>
<a id="trunkSourcecmakeFindOpenWebRTCcmake"></a>
<div class="addfile"><h4>Added: trunk/Source/cmake/FindOpenWebRTC.cmake (0 => 181624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindOpenWebRTC.cmake (rev 0)
+++ trunk/Source/cmake/FindOpenWebRTC.cmake 2015-03-17 08:39:05 UTC (rev 181624)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+# - Try to find OpenWebRTC.
+# Once done, this will define
+#
+# OPENWEBRTC_FOUND - system has OpenWebRTC.
+# OPENWEBRTC_INCLUDE_DIRS - the OpenWebRTC include directories
+# OPENWEBRTC_LIBRARIES - link these to use OpenWebRTC.
+#
+# Copyright (C) 2015 Igalia S.L.
+# Copyright (C) 2015 Metrological.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(OPENWEBRTC openwebrtc-0.1)
+
+set(VERSION_OK TRUE)
+if (OPENWEBRTC_VERSION)
+ if (OPENWEBRTC_FIND_VERSION_EXACT)
+ if (NOT("${OPENWEBRTC_FIND_VERSION}" VERSION_EQUAL "${OPENWEBRTC_VERSION}"))
+ set(VERSION_OK FALSE)
+ endif ()
+ else ()
+ if ("${OPENWEBRTC_VERSION}" VERSION_LESS "${OPENWEBRTC_FIND_VERSION}")
+ set(VERSION_OK FALSE)
+ endif ()
+ endif ()
+endif ()
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENWEBRTC DEFAULT_MSG OPENWEBRTC_INCLUDE_DIRS OPENWEBRTC_LIBRARIES VERSION_OK)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (181623 => 181624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2015-03-17 07:58:27 UTC (rev 181623)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-03-17 08:39:05 UTC (rev 181624)
</span><span class="lines">@@ -304,6 +304,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"> find_package(GTKUnixPrint)
</span><span class="cx"> if (GTK_UNIX_PRINT_FOUND)
</span><span class="cx"> set(HAVE_GTK_UNIX_PRINTING 1)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (181623 => 181624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-17 07:58:27 UTC (rev 181623)
+++ trunk/Tools/ChangeLog 2015-03-17 08:39:05 UTC (rev 181624)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-03-17 Philippe Normand <pnormand@igalia.com>
+
+ [GTK] basic OpenWebRTC build support
+ https://bugs.webkit.org/show_bug.cgi?id=142393
+
+ Reviewed by Carlos Garcia Campos.
+
+ * gtk/jhbuild.modules: Add OpenWebRTC and its dependencies. This
+ is not the upstream OpenWebRTC repository. This temporary fork
+ contains a few patches needed by WebKit for audio/video rendering.
+
</ins><span class="cx"> 2015-03-17 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMake][EFL] Build test tools only for developer mode
</span></span></pre></div>
<a id="trunkToolsgtkinstalldependencies"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/install-dependencies (181623 => 181624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/install-dependencies 2015-03-17 07:58:27 UTC (rev 181623)
+++ trunk/Tools/gtk/install-dependencies 2015-03-17 08:39:05 UTC (rev 181624)
</span><span class="lines">@@ -121,9 +121,13 @@
</span><span class="cx"> libegl1-mesa-dev \
</span><span class="cx"> libgcrypt11-dev \
</span><span class="cx"> libgpg-error-dev \
</span><ins>+ libjson-glib-dev \
+ liborc-0.4-dev \
</ins><span class="cx"> libp11-kit-dev \
</span><span class="cx"> libpciaccess-dev \
</span><ins>+ libssl-dev \
</ins><span class="cx"> libtiff5-dev \
</span><ins>+ libv4l-dev \
</ins><span class="cx"> libxcb-xfixes0-dev \
</span><span class="cx"> libxfont-dev \
</span><span class="cx"> libxkbfile-dev \
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (181623 => 181624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules 2015-03-17 07:58:27 UTC (rev 181623)
+++ trunk/Tools/gtk/jhbuild.modules 2015-03-17 08:39:05 UTC (rev 181624)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> <dep package="gst-libav"/>
</span><span class="cx"> <dep package="xserver"/>
</span><span class="cx"> <dep package="mesa"/>
</span><ins>+ <dep package="openwebrtc"/>
</ins><span class="cx"> </dependencies>
</span><span class="cx"> </metamodule>
</span><span class="cx">
</span><span class="lines">@@ -57,8 +58,11 @@
</span><span class="cx"> href="http://gstreamer.freedesktop.org/src/"/>
</span><span class="cx"> <repository type="tarball" name="savannah.gnu.org"
</span><span class="cx"> href="http://download.savannah.gnu.org/releases/"/>
</span><ins>+ <repository type="git" name="freedesktop-git"
+ href="http://anongit.freedesktop.org/git"/>
+ <repository type="svn" name="sctp-refimpl-google"
+ href="http://sctp-refimpl.googlecode.com/svn/"/>
</ins><span class="cx">
</span><del>-
</del><span class="cx"> <autotools id="cairo"
</span><span class="cx"> autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no --disable-lto"
</span><span class="cx"> makeargs="">
</span><span class="lines">@@ -360,4 +364,31 @@
</span><span class="cx"> </branch>
</span><span class="cx"> </autotools>
</span><span class="cx">
</span><ins>+ <autotools id="libusrsctp" autogen-sh="./bootstrap; ./configure">
+ <branch repo="sctp-refimpl-google" module="trunk/KERN/usrsctp/" revision="r9168"/>
+ </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.git" checkoutdir="gst-plugins-openwebrtc" tag="master"/>
+ </autotools>
+
+ <autotools id="libnice">
+ <dependencies>
+ <dep package="gstreamer"/>
+ </dependencies>
+ <branch repo="freedesktop-git" module="libnice/libnice.git" tag="0.1.10" checkoutdir="libnice"/>
+ </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.git" checkoutdir="openwebrtc" tag="configurable-sinks"/>
+ </autotools>
+
</ins><span class="cx"> </moduleset>
</span></span></pre>
</div>
</div>
</body>
</html>