[GTK][EFL] Upgrade OpenWebRTC dependency

https://bugs.webkit.org/show_bug.cgi?id=153489

Reviewed by Philippe Normand.

.:

* Source/cmake/FindOpenWebRTC.cmake: Bump OpenWebRTC dependency,
required to make the mediastream work.

Tools:

* Scripts/run-gtk-tests:
(TestRunner): Avoid running the mediastream API test.
* Scripts/webkitperl/FeatureList.pm: Stop compiling mediastream by
default for gtk and efl.
* gtk/jhbuild-webrtc.modules: Added modules files with
dependencies required to compile and test the mediastream.

LayoutTests:

Skiped the mediastream tests by default, until we have the code
ready and gstreamer dependency is bumped.

* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:

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

diff --git a/ChangeLog b/ChangeLog
index 5660648..6289882 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-02-02  Alejandro G. Castro  <alex@igalia.com>
+
+        [GTK][EFL] Upgrade OpenWebRTC dependency
+        https://bugs.webkit.org/show_bug.cgi?id=153489
+
+        Reviewed by Philippe Normand.
+
+        * Source/cmake/FindOpenWebRTC.cmake: Bump OpenWebRTC dependency,
+        required to make the mediastream work.
+
 2016-02-01  Alex Christensen  <achristensen@webkit.org>
 
         [Win] WTFHeaderDetection.h no longer needed

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6855e14..2274b0f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2016-02-02  Alejandro G. Castro  <alex@igalia.com>
+
+        [GTK][EFL] Upgrade OpenWebRTC dependency
+        https://bugs.webkit.org/show_bug.cgi?id=153489
+
+        Reviewed by Philippe Normand.
+
+        Skiped the mediastream tests by default, until we have the code
+        ready and gstreamer dependency is bumped.
+
+        * platform/efl/TestExpectations:
+        * platform/gtk/TestExpectations:
+
 2016-02-01  Chris Dumez  <cdumez@apple.com>
 
         object.__lookupGetter__() / object.__lookupSetter__() does not work for native bindings

diff --git a/LayoutTests/platform/efl/TestExpectations b/LayoutTests/platform/efl/TestExpectations
index 15b4631..2966a5a 100644 (file)
--- a/LayoutTests/platform/efl/TestExpectations
+++ b/LayoutTests/platform/efl/TestExpectations
@@ -79,6 +79,11 @@ fast/text/arabic-times-new-roman.html [ Skip ]
 # Need to implement font feature seeting for EFL port since r188146.
 css3/font-feature-settings-rendering.html [ Skip ]
 
+# Requires MEDIA_STREAM support.
+webkit.org/b/87662 fast/mediastream [ Skip ]
+webkit.org/b/87662 fast/events/constructors/media-stream-event-constructor.html [ Skip ]
+webkit.org/b/87662 http/tests/media/media-stream [ Skip ]
+
 # ----------------------------------------
 # Tests which also fail in other platforms
 # ----------------------------------------
@@ -1470,10 +1475,6 @@ webkit.org/b/138307 media/encrypted-media/encrypted-media-can-play-type.html [ S
 webkit.org/b/88080 pointer-lock [ Skip ]
 webkit.org/b/88080 http/tests/pointer-lock [ Skip ]
 
-# Requires MEDIA_STREAM support.
-webkit.org/b/87662 fast/mediastream [ Skip ]
-webkit.org/b/87662 fast/events/constructors/media-stream-event-constructor.html [ Skip ]
-
 # Requires INDIE_UI support
 webkit.org/b/111446 indieui [ Skip ]
 

diff --git a/LayoutTests/platform/gtk/TestExpectations b/LayoutTests/platform/gtk/TestExpectations
index 6eb92dc..ec89a10 100644 (file)
--- a/LayoutTests/platform/gtk/TestExpectations
+++ b/LayoutTests/platform/gtk/TestExpectations
@@ -331,36 +331,6 @@ webkit.org/b/95582 batterystatus/event-after-navigation.html [ Timeout ]
 webkit.org/b/85211 ietestcenter/css3/flexbox/flexbox-align-stretch-001.htm [ ImageOnlyFailure ]
 webkit.org/b/85212 ietestcenter/css3/flexbox/flexbox-layout-002.htm [ ImageOnlyFailure ]
 
-# Mediastream implementation is not complete yet.
-webkit.org/b/79203 fast/mediastream/MediaStream-MediaElement-srcObject.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/MediaStreamTrack.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/MediaStreamTrack-onended.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-AddRemoveStream.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-createAnswer.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-createOffer.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-datachannel.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-dtmf.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-events.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-getConfiguration.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-have-local-offer.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-have-local-pranswer.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-have-remote-offer.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-have-remote-pranswer.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-ice.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-localDescription.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-onnegotiationneeded.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-remoteDescription.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-stable.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-stats.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/RTCPeerConnection-statsSelector.html [ Skip ]
-webkit.org/b/79203 fast/events/constructors/media-stream-event-constructor.html [ Skip ]
-webkit.org/b/79203 webaudio/mediastreamaudiodestinationnode.html [ Skip ]
-webkit.org/b/79203 webaudio/mediastreamaudiosourcenode.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/MediaStream-video-element.html [ Skip ]
-webkit.org/b/79203 fast/mediastream/MediaStream-video-element-track-stop.html [ Skip ]
-webkit.org/b/151344 fast/mediastream/MediaStream-add-ended-tracks.html [ Skip ]
-webkit.org/b/151344 fast/mediastream/MediaStream-add-remove-tracks.html [ Skip ]
-
 # Text Autosizing is not yet enabled.
 webkit.org/b/99063 fast/text-autosizing [ Skip ]
 
@@ -663,6 +633,10 @@ media/controls [ Skip ]
 # WIRELESS_PLAYBACK_TARGET not enabled.
 media/airplay-target-availability.html
 
+# Mediastream implementation requires new Gstreamer/OpenWebRTC
+webkit.org/b/153540 fast/mediastream [ Skip ]
+webkit.org/b/153540 http/tests/media/media-stream [ Skip ]
+
 #////////////////////////////////////////////////////////////////////////////////////////
 # End of Expected failures
 #////////////////////////////////////////////////////////////////////////////////////////

diff --git a/Source/cmake/FindOpenWebRTC.cmake b/Source/cmake/FindOpenWebRTC.cmake
index 2fface0..1ac85a8 100644 (file)
--- a/Source/cmake/FindOpenWebRTC.cmake
+++ b/Source/cmake/FindOpenWebRTC.cmake
@@ -30,7 +30,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 find_package(PkgConfig)
-pkg_check_modules(OPENWEBRTC openwebrtc-0.1 openwebrtc-gst-0.1)
+pkg_check_modules(OPENWEBRTC openwebrtc-0.3 openwebrtc-gst-0.3)
 
 set(VERSION_OK TRUE)
 if (OPENWEBRTC_VERSION)

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 86a6ae3..5dbfab7 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2016-02-02  Alejandro G. Castro  <alex@igalia.com>
+
+        [GTK][EFL] Upgrade OpenWebRTC dependency
+        https://bugs.webkit.org/show_bug.cgi?id=153489
+
+        Reviewed by Philippe Normand.
+
+        * Scripts/run-gtk-tests:
+        (TestRunner): Avoid running the mediastream API test.
+        * Scripts/webkitperl/FeatureList.pm: Stop compiling mediastream by
+        default for gtk and efl.
+        * gtk/jhbuild-webrtc.modules: Added modules files with
+        dependencies required to compile and test the mediastream.
+
 2016-02-01  Jason Marcell  <jmarcell@apple.com>
 
         Add code to parse the git branches out of the Trac RSS feed

diff --git a/Tools/Scripts/run-gtk-tests b/Tools/Scripts/run-gtk-tests
index fb8233b..752d489 100755 (executable)
--- a/Tools/Scripts/run-gtk-tests
+++ b/Tools/Scripts/run-gtk-tests
@@ -82,6 +82,7 @@ class TestRunner:
         SkippedTest("WebKit2/TestWebKit2", "WebKit2.TerminateTwice", "Test causes crash on the next test", 121970),
         SkippedTest("WebKit2/TestWebKit2", "WebKit2.GeolocationTransitionToHighAccuracy", "Test causes crash on the next test", 125068),
         SkippedTest("WebKit2/TestWebKit2", "WebKit2.GeolocationTransitionToLowAccuracy", "Test causes crash on the next test", 125068),
+        SkippedTest("WebKit2/UserMedia", "WebKit2.UserMediaBasic", "We will not test by default until the upgrade gstreamer to 1.9", 153540),
     ]
 
     SLOW = [

diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm
index e2ee49d..2abad9b 100644 (file)
--- a/Tools/Scripts/webkitperl/FeatureList.pm
+++ b/Tools/Scripts/webkitperl/FeatureList.pm
@@ -336,7 +336,7 @@ my @features = (
       define => "ENABLE_MEDIA_STATISTICS", default => 0, value => \$mediaStatisticsSupport },
 
     { option => "media-stream", desc => "Toggle Media Stream support",
-      define => "ENABLE_MEDIA_STREAM", default => (isGtk() || isEfl()), value => \$mediaStreamSupport },
+      define => "ENABLE_MEDIA_STREAM", default => 0, value => \$mediaStreamSupport },
 
     { option => "meter-element", desc => "Toggle Meter Element support",
       define => "ENABLE_METER_ELEMENT", default => !isAppleWinWebKit(), value => \$meterElementSupport },

diff --git a/Tools/gtk/jhbuild-webrtc.modules b/Tools/gtk/jhbuild-webrtc.modules
new file mode 100644 (file)
index 0000000..2ca5155
--- /dev/null
+++ b/Tools/gtk/jhbuild-webrtc.modules
@@ -0,0 +1,132 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href="moduleset.xsl"?>
+<moduleset>
+
+  <repository type="git" name="github.com"
+      href="https://github.com"/>
+  <repository type="tarball" name="github-tarball"
+      href="https://github.com/"/>
+  <repository type="git" name="freedesktop-git"
+      href="http://anongit.freedesktop.org/git"/>
+
+  <autotools id="libsrtp" autogen-sh="configure">
+    <branch module="cisco/libsrtp/archive/v${version}.tar.gz" version="1.5.2"
+            checkoutdir="libsrtp-${version}"
+            repo="github-tarball"
+            hash="sha256:86e1efe353397c0751f6bdd709794143bd1b76494412860f16ff2b6d9c304eda"
+            md5sum="2309aa6027992810a4285b042c71e644">
+    </branch>
+  </autotools>
+
+  <autotools id="openh264" supports-non-srcdir-builds="no" autogen-sh="pseudo-configure">
+    <branch module="cisco/openh264/archive/v1.4.0.tar.gz" version="1.4.0"
+            checkoutdir="openh264-1.4.0"
+            repo="github-tarball">
+      <patch file="openh264-configure.patch" strip="0"/>
+    </branch>
+  </autotools>
+
+  <autotools id="gstreamer" autogenargs="--disable-gtk-doc">
+    <if condition-set="macos">
+      <autogenargs value="--disable-introspection"/>
+      <makeargs value="CFLAGS+=-Wno-error"/>
+    </if>
+
+    <dependencies>
+      <dep package="orc"/>
+    </dependencies>
+    <branch repo="freedesktop-git" module="gstreamer/gstreamer" version="1.7" checkoutdir="gstreamer" tag="61a8c946acb077959dfec78fc6393a5bea17a260"/>
+  </autotools>
+
+  <autotools id="gst-plugins-base"
+             autogen-sh="autogen.sh"
+             autogenargs="--disable-examples --disable-gtk-doc">
+    <if condition-set="macos">
+      <autogenargs value="--disable-introspection"/>
+      <makeargs value="CFLAGS+=-Wno-error"/>
+    </if>
+    <dependencies>
+      <dep package="gstreamer"/>
+      <dep package="orc"/>
+    </dependencies>
+    <branch repo="freedesktop-git" module="gstreamer/gst-plugins-base" version="1.7" checkoutdir="gst-plugins-base" tag="5f79ccb420d6b270d108892f1c7e3dedbd64b57a"/>
+  </autotools>
+
+  <autotools id="gst-plugins-good" autogenargs="--disable-examples --disable-soup --disable-gtk-doc">
+    <if condition-set="macos">
+      <autogenargs value="--disable-introspection"/>
+      <makeargs value="CFLAGS+=-Wno-error  OBJCFLAGS+=-Wno-error"/>
+    </if>
+    <dependencies>
+      <dep package="gst-plugins-base"/>
+      <dep package="libvpx"/>
+    </dependencies>
+
+    <branch repo="freedesktop-git" module="gstreamer/gst-plugins-good" version="1.7" checkoutdir="gst-plugins-good" tag="0d4e3847f0c9106ed345f0316e4954f82332e250"/>
+  </autotools>
+
+  <autotools id="gst-plugins-bad" autogenargs="--disable-examples --disable-gtk-doc --enable-openh264 --enable-opus --enable-srtp -- PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$JHBUILD_PREFIX/lib/pkgconfig">
+    <makeargs value="CFLAGS+=-Wno-error CXXFLAGS+=-Wno-error OBJCFLAGS+=-Wno-error"/>
+    <if condition-set="macos">
+      <autogenargs value="--disable-introspection"/>
+    </if>
+    <dependencies>
+      <dep package="gst-plugins-base"/>
+      <dep package="libsrtp"/>
+      <dep package="openh264"/>
+    </dependencies>
+
+    <branch repo="freedesktop-git" module="gstreamer/gst-plugins-bad" version="1.7" checkoutdir="gst-plugins-bad" tag="3d5a1ccbf4e5b036164a02c6bd6b0b0ddab19880"/>
+  </autotools>
+
+  <autotools id="gst-libav" autogenargs="--with-libav-extra-configure='--disable-yasm' --disable-gtk-doc">
+    <if condition-set="macos">
+      <makeargs value="CFLAGS+=-Wno-error"/>
+    </if>
+    <dependencies>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+
+    <branch repo="freedesktop-git" module="gstreamer/gst-libav" version="1.5" checkoutdir="gst-libav" tag="1.5.2"/>
+  </autotools>
+
+  <autotools id="libusrsctp" supports-non-srcdir-builds="no" autogen-sh="./bootstrap; ./configure --disable-warnings-as-errors">
+    <branch repo="github.com" module="sctplab/usrsctp.git" checkoutdir="usrsctp" tag="c53d43ee76673ee281806497eb43750c239c145f"/>
+   </autotools>
+
+   <autotools id="gst-plugins-openwebrtc" supports-parallel-builds="no" supports-non-srcdir-builds="no" autogen-sh="./autogen.sh; ./configure">
+     <if condition-set="macos">
+       <makeargs value="CFLAGS+=-Wno-error"/>
+     </if>
+     <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="5eb92d7e58a5aec82034d1a6d3f5ef66501172b7"/>
+   </autotools>
+
+   <autotools id="libnice" supports-non-srcdir-builds="no">
+    <dependencies>
+      <dep package="gstreamer"/>
+    </dependencies>
+    <branch repo="freedesktop-git" module="libnice/libnice.git" tag="0.1.13" checkoutdir="libnice"/>
+  </autotools>
+
+  <autotools id="libvpx" supports-non-srcdir-builds="no"
+       autogen-template="./configure --prefix=%(prefix)s --enable-shared --enable-pic --as=yasm --disable-unit-tests ">
+       <branch repo="github.com" module="webmproject/libvpx.git" checkoutdir="libvpx" tag="v1.4.0"/>
+  </autotools>
+
+  <autotools id="openwebrtc" autogenargs="--enable-bridge=no --enable-owr-gst=yes">
+     <if condition-set="macos">
+       <makeargs value="CFLAGS+=-Wno-error"/>
+     </if>
+    <dependencies>
+      <dep package="gst-plugins-openwebrtc"/>
+      <dep package="libnice"/>
+     </dependencies>
+    <branch repo="github.com" module="EricssonResearch/openwebrtc.git" checkoutdir="openwebrtc" tag="f511ea1fa79a33fa3d52bfd1c0969c28084aeb35"/>
+  </autotools>
+
+</moduleset>