[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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181624 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index caea6610d950351f827a8ad000cebcd1017fe057..8077c6972ec31961481c89e0f3614275c2682a63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2015-03-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [CMake][EFL] Build test tools only for developer mode

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index e055263134cf0dd9a2fcf0bdae05e71a754e698d..230b3f456a24f1fad13ad7466fabfdc598048439 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+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.
+
 2015-03-17  Joseph Pecoraro  <pecoraro@apple.com>
 
         Remove never used "useLayerOnTop" bindings generator argument

diff --git a/Source/WebCore/PlatformGTK.cmake b/Source/WebCore/PlatformGTK.cmake
index 3dc88af91ba97dd220d241f9301183350bc1470e..dd264907eae0409aa820c6073ea7741b25ff0722 100644 (file)
--- a/Source/WebCore/PlatformGTK.cmake
+++ b/Source/WebCore/PlatformGTK.cmake
@@ -368,6 +368,15 @@ if (ENABLE_WEB_AUDIO)
     )
 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"

diff --git a/Source/cmake/FindOpenWebRTC.cmake b/Source/cmake/FindOpenWebRTC.cmake
new file mode 100644 (file)
index 0000000..9605326
--- /dev/null
+++ b/Source/cmake/FindOpenWebRTC.cmake
@@ -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)

diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 6ce63cca447c766e649d85c336b68db47b1626d9..3563afb0dc3432f9d3dcb583261976b328fa9b2f 100644 (file)
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -304,6 +304,13 @@ if (ENABLE_GEOLOCATION)
     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)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c65eee35ed7625a8e30c21cc5bd910f97d9158a2..07c31ac34ef1268db38d089bed19f34b72d01a63 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2015-03-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         [CMake][EFL] Build test tools only for developer mode

diff --git a/Tools/gtk/install-dependencies b/Tools/gtk/install-dependencies
index f9df2711ee71ee068bc8d6e3626dc470eed0d315..00324e66010a157250df0f6405a37037fef32417 100755 (executable)
--- a/Tools/gtk/install-dependencies
+++ b/Tools/gtk/install-dependencies
@@ -121,9 +121,13 @@ function installDependenciesWithApt {
         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 \

diff --git a/Tools/gtk/jhbuild.modules b/Tools/gtk/jhbuild.modules
index 0a23896198614ed82a290090071a6ea375795ddd..ff4b75605e1e10e9aecaa0e841723f78625599ac 100644 (file)
--- a/Tools/gtk/jhbuild.modules
+++ b/Tools/gtk/jhbuild.modules
@@ -30,6 +30,7 @@
       <dep package="gst-libav"/>
       <dep package="xserver"/>
       <dep package="mesa"/>
+      <dep package="openwebrtc"/>
     </dependencies>
   </metamodule>
 
@@ -57,7 +58,10 @@
       href="http://gstreamer.freedesktop.org/src/"/>
   <repository type="tarball" name="savannah.gnu.org"
       href="http://download.savannah.gnu.org/releases/"/>
-
+  <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/"/>
 
   <autotools id="cairo"
              autogenargs="--enable-gl=yes --enable-egl=yes --enable-glx=yes ac_cv_func_rsvg_pixbuf_from_file=no --disable-lto"
@@ -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>