From: alex@webkit.org Date: Tue, 2 Feb 2016 11:35:33 +0000 (+0000) Subject: [GTK][EFL] Upgrade OpenWebRTC dependency X-Git-Url: http://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=329bc3037cb29bbc969785b60f1ab8e368ba52dc [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 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2016-02-02 Alejandro G. Castro + + [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 [Win] WTFHeaderDetection.h no longer needed diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index 6855e14..2274b0f 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,16 @@ +2016-02-02 Alejandro G. Castro + + [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 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 --- 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 --- 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 --- 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 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,17 @@ +2016-02-02 Alejandro G. Castro + + [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 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 --- 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 --- 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 index 0000000..2ca5155 --- /dev/null +++ b/Tools/gtk/jhbuild-webrtc.modules @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +