Diff
Modified: trunk/ChangeLog (181623 => 181624)
--- trunk/ChangeLog 2015-03-17 07:58:27 UTC (rev 181623)
+++ trunk/ChangeLog 2015-03-17 08:39:05 UTC (rev 181624)
@@ -1,3 +1,14 @@
+2015-03-17 Philippe Normand <pnorm...@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.
+
2015-03-17 Gyuyoung Kim <gyuyoung....@samsung.com>
[CMake][EFL] Build test tools only for developer mode
Modified: trunk/Source/WebCore/ChangeLog (181623 => 181624)
--- 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)
@@ -1,3 +1,12 @@
+2015-03-17 Philippe Normand <pnorm...@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.
+
2015-03-17 Joseph Pecoraro <pecor...@apple.com>
Remove never used "useLayerOnTop" bindings generator argument
Modified: trunk/Source/WebCore/PlatformGTK.cmake (181623 => 181624)
--- 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)
@@ -368,6 +368,15 @@
)
endif ()
+if (ENABLE_MEDIA_STREAM)
+ list(APPEND WebCore_INCLUDE_DIRECTORIES
+ ${OPENWEBRTC_INCLUDE_DIRS}
+ )
+ list(APPEND WebCore_LIBRARIES
+ ${OPENWEBRTC_LIBRARIES}
+ )
+endif ()
+
if (ENABLE_TEXTURE_MAPPER)
list(APPEND WebCore_INCLUDE_DIRECTORIES
"${WEBCORE_DIR}/platform/graphics/texmap"
Added: trunk/Source/cmake/FindOpenWebRTC.cmake (0 => 181624)
--- trunk/Source/cmake/FindOpenWebRTC.cmake (rev 0)
+++ trunk/Source/cmake/FindOpenWebRTC.cmake 2015-03-17 08:39:05 UTC (rev 181624)
@@ -0,0 +1,49 @@
+# - 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)
Modified: trunk/Source/cmake/OptionsGTK.cmake (181623 => 181624)
--- 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)
@@ -304,6 +304,13 @@
endif ()
endif ()
+if (ENABLE_MEDIA_STREAM)
+ find_package(OpenWebRTC)
+ if (OPENWEBRTC_FOUND)
+ add_definitions(-DWTF_USE_OPENWEBRTC)
+ endif ()
+endif ()
+
find_package(GTKUnixPrint)
if (GTK_UNIX_PRINT_FOUND)
set(HAVE_GTK_UNIX_PRINTING 1)
Modified: trunk/Tools/ChangeLog (181623 => 181624)
--- trunk/Tools/ChangeLog 2015-03-17 07:58:27 UTC (rev 181623)
+++ trunk/Tools/ChangeLog 2015-03-17 08:39:05 UTC (rev 181624)
@@ -1,3 +1,14 @@
+2015-03-17 Philippe Normand <pnorm...@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.
+
2015-03-17 Gyuyoung Kim <gyuyoung....@samsung.com>
[CMake][EFL] Build test tools only for developer mode
Modified: trunk/Tools/gtk/install-dependencies (181623 => 181624)
--- 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)
@@ -121,9 +121,13 @@
libegl1-mesa-dev \
libgcrypt11-dev \
libgpg-error-dev \
+ libjson-glib-dev \
+ liborc-0.4-dev \
libp11-kit-dev \
libpciaccess-dev \
+ libssl-dev \
libtiff5-dev \
+ libv4l-dev \
libxcb-xfixes0-dev \
libxfont-dev \
libxkbfile-dev \
Modified: trunk/Tools/gtk/jhbuild.modules (181623 => 181624)
--- 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)
@@ -30,6 +30,7 @@
<dep package="gst-libav"/>
<dep package="xserver"/>
<dep package="mesa"/>
+ <dep package="openwebrtc"/>
</dependencies>
</metamodule>
@@ -57,8 +58,11 @@
href=""
<repository type="tarball" name="savannah.gnu.org"
href=""
+ <repository type="git" name="freedesktop-git"
+ href=""
+ <repository type="svn" name="sctp-refimpl-google"
+ href=""
-
<autotools id="cairo"
autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no --disable-lto"
makeargs="">
@@ -360,4 +364,31 @@
</branch>
</autotools>
+ <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>
+
</moduleset>
