Title: [181892] trunk
- Revision
- 181892
- Author
- [email protected]
- Date
- 2015-03-24 08:11:39 -0700 (Tue, 24 Mar 2015)
Log Message
[EFL] Add OpenWebRTC in jhbuild
https://bugs.webkit.org/show_bug.cgi?id=142778
Reviewed by Gyuyoung Kim.
Original patch by Philippe Normand <[email protected]>
.:
* 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.
Modified Paths
Diff
Modified: trunk/ChangeLog (181891 => 181892)
--- trunk/ChangeLog 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/ChangeLog 2015-03-24 15:11:39 UTC (rev 181892)
@@ -1,3 +1,15 @@
+2015-03-24 Csaba Osztrogonác <[email protected]>
+
+ [EFL] Add OpenWebRTC in jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=142778
+
+ Reviewed by Gyuyoung Kim.
+
+ Original patch by Philippe Normand <[email protected]>
+
+ * Source/cmake/OptionsEfl.cmake: Look for OpenWebRTC library if
+ mediastream build is enabled.
+
2015-03-23 Carlos Garcia Campos <[email protected]>
[GTK] Add a configure option to build without Redirected XComposite Window
Modified: trunk/Source/WebCore/ChangeLog (181891 => 181892)
--- trunk/Source/WebCore/ChangeLog 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Source/WebCore/ChangeLog 2015-03-24 15:11:39 UTC (rev 181892)
@@ -1,3 +1,14 @@
+2015-03-24 Csaba Osztrogonác <[email protected]>
+
+ [EFL] Add OpenWebRTC in jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=142778
+
+ Reviewed by Gyuyoung Kim.
+
+ Original patch by Philippe Normand <[email protected]>
+
+ * PlatformEfl.cmake: Add OpenWebRTC CFLAGS and LDFLAGS.
+
2015-03-23 Yoav Weiss <[email protected]>
Update empty image canvas tests and fix a related bug
Modified: trunk/Source/WebCore/PlatformEfl.cmake (181891 => 181892)
--- trunk/Source/WebCore/PlatformEfl.cmake 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2015-03-24 15:11:39 UTC (rev 181892)
@@ -331,6 +331,15 @@
${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"
Modified: trunk/Source/cmake/OptionsEfl.cmake (181891 => 181892)
--- trunk/Source/cmake/OptionsEfl.cmake 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Source/cmake/OptionsEfl.cmake 2015-03-24 15:11:39 UTC (rev 181892)
@@ -194,6 +194,13 @@
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 ()
Modified: trunk/Tools/ChangeLog (181891 => 181892)
--- trunk/Tools/ChangeLog 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Tools/ChangeLog 2015-03-24 15:11:39 UTC (rev 181892)
@@ -1,3 +1,16 @@
+2015-03-24 Csaba Osztrogonác <[email protected]>
+
+ [EFL] Add OpenWebRTC in jhbuild
+ https://bugs.webkit.org/show_bug.cgi?id=142778
+
+ Reviewed by Gyuyoung Kim.
+
+ Original patch by Philippe Normand <[email protected]>
+
+ * efl/install-dependencies: Dependencies for OpenWebRTC.
+ * efl/jhbuild.modules: build OpenWebRTC, libusrsctp, libnice and
+ the openwebrtc gst plugins.
+
2015-03-23 Brent Fulgham <[email protected]>
Regression(r181257): WTF_WorkQueue.Simple is flaky
Modified: trunk/Tools/efl/install-dependencies (181891 => 181892)
--- trunk/Tools/efl/install-dependencies 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Tools/efl/install-dependencies 2015-03-24 15:11:39 UTC (rev 181892)
@@ -73,8 +73,10 @@
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 \
Modified: trunk/Tools/efl/jhbuild.modules (181891 => 181892)
--- trunk/Tools/efl/jhbuild.modules 2015-03-24 10:05:21 UTC (rev 181891)
+++ trunk/Tools/efl/jhbuild.modules 2015-03-24 15:11:39 UTC (rev 181892)
@@ -22,6 +22,7 @@
<dep package="gst-libav"/>
<dep package="libseccomp"/>
<dep package="atk"/>
+ <dep package="openwebrtc"/>
</dependencies>
</metamodule>
@@ -39,6 +40,8 @@
href=""
<repository type="tarball" name="freedesktop.org"
href=""
+ <repository type="tarball" name="nice.freedesktop.org"
+ href=""
<repository type="tarball" name="enlightenment.fr"
href=""
<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>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
