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

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

diff --git a/ChangeLog b/ChangeLog
index 64e8656c6ef8b62ba7a95020ef547159a5401bc9..e6f00ad3ebf50dcc1bb77b7cd60f67e4d5503bae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+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.
+
 2015-03-23  Carlos Garcia Campos  <cgarcia@igalia.com>
 
         [GTK] Add a configure option to build without Redirected XComposite Window

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 750f9965b26a4f0c5a073ce1a7fbef5c64155746..40b803194a71fefa82dfc0b01395bb4a69b81665 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2015-03-23 Yoav Weiss  <yoav@yoav.ws>
 
         Update empty image canvas tests and fix a related bug

diff --git a/Source/WebCore/PlatformEfl.cmake b/Source/WebCore/PlatformEfl.cmake
index f0a3c43104c97d9ee6121528b13d427c7d2266e8..5bac12c5d1d20d3f6527c3fa999ed50c23175720 100644 (file)
--- a/Source/WebCore/PlatformEfl.cmake
+++ b/Source/WebCore/PlatformEfl.cmake
@@ -331,6 +331,15 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${HARFBUZZ_INCLUDE_DIRS}
 )
 
+if (ENABLE_MEDIA_STREAM)
+    list(APPEND WebCore_INCLUDE_DIRECTORIES
+        ${OPENWEBRTC_INCLUDE_DIRS}
+    )
+    list(APPEND WebCore_LIBRARIES
+        ${OPENWEBRTC_LIBRARIES}
+    )
+endif ()
+
 if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
     list(APPEND WebCore_INCLUDE_DIRECTORIES
         "${WEBCORE_DIR}/platform/graphics/gstreamer"

diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index 444a3b3dfd8ead001965269fae2a2da0ba042d30..15cce39f0807dc6563a1259aad87614e451b22b2 100644 (file)
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -194,6 +194,13 @@ if (ENABLE_GEOLOCATION)
     endif ()
 endif ()
 
+if (ENABLE_MEDIA_STREAM)
+    find_package(OpenWebRTC)
+    if (OPENWEBRTC_FOUND)
+        add_definitions(-DWTF_USE_OPENWEBRTC)
+    endif ()
+endif ()
+
 if (ENABLE_NETSCAPE_PLUGIN_API)
     set(ENABLE_PLUGIN_PROCESS 1)
 endif ()

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4895b5e1ec624ab93b5b48e89e24b1c6411861e9..9e41afe45fb0add23e84c72f3026732dee52cff0 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,16 @@
+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.
+
 2015-03-23  Brent Fulgham  <bfulgham@apple.com>
 
         Regression(r181257): WTF_WorkQueue.Simple is flaky

diff --git a/Tools/efl/install-dependencies b/Tools/efl/install-dependencies
index 7c22a6db841964d6db021896596ec486728a67ca..62da765226cd2d4c71bf24373e8f7d6f07402e72 100755 (executable)
--- a/Tools/efl/install-dependencies
+++ b/Tools/efl/install-dependencies
@@ -73,8 +73,10 @@ function installDependenciesWithApt {
         libgpg-error-dev \
         libicu-dev \
         libjpeg-dev \
+        libjson-glib-dev \
         liblua5.1-0-dev \
         libmpg123-dev \
+        liborc-0.4-dev \
         libp11-kit-dev \
         libpng-dev \
         libpulse-dev \

diff --git a/Tools/efl/jhbuild.modules b/Tools/efl/jhbuild.modules
index 2b6f9aac113014ca47e72538a59e4d8aa4d1b20e..1c15711bd891a6df8145a8967fbe1f5ea62fffa2 100644 (file)
--- a/Tools/efl/jhbuild.modules
+++ b/Tools/efl/jhbuild.modules
@@ -22,6 +22,7 @@
       <dep package="gst-libav"/>
       <dep package="libseccomp"/>
       <dep package="atk"/>
+      <dep package="openwebrtc"/>
     </dependencies>
   </metamodule>
 
@@ -39,6 +40,8 @@
       href="http://cairographics.org"/>
   <repository type="tarball" name="freedesktop.org"
       href="http://www.freedesktop.org"/>
+  <repository type="tarball" name="nice.freedesktop.org"
+      href="http://nice.freedesktop.org/"/>
   <repository type="tarball" name="enlightenment.fr"
       href="http://git.enlightenment.fr/cgit.cgi/svn/"/>
   <repository type="tarball" name="xmlsoft.org"
@@ -294,4 +297,43 @@
     </dependencies>
   </autotools>
 
+  <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>
+
 </moduleset>