Changeset 181624 in webkit

Timestamp:

Mar 17, 2015 1:39:05 AM (9 years ago)

Author:

Philippe Normand

Message:

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

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PlatformGTK.cmake (modified) (1 diff)
• Source/cmake/FindOpenWebRTC.cmake (added)
• Source/cmake/OptionsGTK.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/gtk/install-dependencies (modified) (1 diff)
• Tools/gtk/jhbuild.modules (modified) (3 diffs)

trunk/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/PlatformGTK.cmake

@@ -366 +366 @@
     list(APPEND WebCore_LIBRARIES
         ${GSTREAMER_FFT_LIBRARIES}
+    )
+endif ()
+
+if (ENABLE_MEDIA_STREAM)
+    list(APPEND WebCore_INCLUDE_DIRECTORIES
+        ${OPENWEBRTC_INCLUDE_DIRS}
+    )
+    list(APPEND WebCore_LIBRARIES
+        ${OPENWEBRTC_LIBRARIES}
     )
 endif ()

trunk/Source/cmake/OptionsGTK.cmake

@@ -305 +305 @@
 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)

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/gtk/install-dependencies

@@ -122 +122 @@
         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 \

trunk/Tools/gtk/jhbuild.modules

@@ -31 +31 @@
       <dep package="xserver"/>
       <dep package="mesa"/>
+      <dep package="openwebrtc"/>
     </dependencies>
   </metamodule>
@@ -58 +59 @@
   <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"
@@ -361 +365 @@
   </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>