Diff
Modified: trunk/Tools/ChangeLog (176566 => 176567)
--- trunk/Tools/ChangeLog 2014-11-28 16:39:36 UTC (rev 176566)
+++ trunk/Tools/ChangeLog 2014-11-28 17:05:45 UTC (rev 176567)
@@ -1,3 +1,17 @@
+2014-11-28 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r176564.
+ https://bugs.webkit.org/show_bug.cgi?id=139093
+
+ massive failures on release test bot (Requested by philn on
+ #webkit).
+
+ Reverted changeset:
+
+ "[GStreamer] Bump internal jhbuild versions to 1.4.4"
+ https://bugs.webkit.org/show_bug.cgi?id=138866
+ http://trac.webkit.org/changeset/176564
+
2014-11-28 Carlos Garcia Campos <[email protected]>
[GTK] Use GMainLoopSource in WebKitTestRunner
Modified: trunk/Tools/gtk/jhbuild.modules (176566 => 176567)
--- trunk/Tools/gtk/jhbuild.modules 2014-11-28 16:39:36 UTC (rev 176566)
+++ trunk/Tools/gtk/jhbuild.modules 2014-11-28 17:05:45 UTC (rev 176567)
@@ -273,10 +273,10 @@
</autotools>
<autotools id="gstreamer" autogenargs="--disable-gtk-doc">
- <branch module="gstreamer/gstreamer-1.4.4.tar.xz" version="1.4.4"
+ <branch module="gstreamer/gstreamer-1.2.1.tar.xz" version="1.2.1"
repo="gstreamer"
- hash="sha256:f0e305d91a93d05bf9e332cd4256ca07d77f5186a4d73847b7ae6db218f2c237"
- md5sum="98f4a6d45a28dd195144baef0244ba38"/>
+ hash="sha256:a4523d2471bca6cd0059a32e3b042f50faa4dadc6439852af8b43ca3f17d1fc9"
+ md5sum="55d50f48a496799dbb0b195c9c6c6153"/>
</autotools>
<autotools id="gst-plugins-base"
@@ -285,10 +285,12 @@
<dependencies>
<dep package="gstreamer"/>
</dependencies>
- <branch module="gst-plugins-base/gst-plugins-base-1.4.4.tar.xz" version="1.4.4"
+ <branch module="gst-plugins-base/gst-plugins-base-1.2.1.tar.xz" version="1.2.1"
repo="gstreamer"
- hash="sha256:49cd9e8f23c416b1607b43837a09833fa03e0106929d81ead2ddfde6c0ade44b"
- md5sum="0c42eca8f9e4efd56d2ce8e9249ce4a1">
+ hash="sha256:de2444a5c150d4e4b680364d7c0414cd8b015d95b305ff65d65a17683379532f"
+ md5sum="2e75fb03ed7e4d24d88601fcac4d57aa">
+ <patch file="gst-plugins-base-fix-build-gcc-4.9-x86.patch" strip="1"/>
+ <patch file="gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch" strip="1"/>
</branch>
</autotools>
@@ -297,10 +299,11 @@
<dep package="gst-plugins-base"/>
</dependencies>
- <branch module="gst-plugins-good/gst-plugins-good-1.4.4.tar.xz" version="1.4.4"
+ <branch module="gst-plugins-good/gst-plugins-good-1.2.1.tar.xz" version="1.2.1"
repo="gstreamer"
- hash="sha256:2df90e99da45211c7b2525ae4ac34830a9e7784bd48c072c406c0cf014bdb277"
- md5sum="673cf9276952bd3937dafd817c9ead2b">
+ hash="sha256:660fa02dbe01086fcf702d87acc0ba5dde2559d6a11ecf438874afe504c50517"
+ md5sum="082156e9fb737ee6132b6b663f2901a1">
+ <patch file="gst-events-arent-gstobjects.patch" strip="1"/>
</branch>
</autotools>
@@ -308,20 +311,20 @@
<dependencies>
<dep package="gst-plugins-base"/>
</dependencies>
- <branch module="gst-plugins-bad/gst-plugins-bad-1.4.4.tar.xz" version="1.4.4"
+ <branch module="gst-plugins-bad/gst-plugins-bad-1.2.1.tar.xz" version="1.2.1"
repo="gstreamer"
- hash="sha256:e41b36105c0a13a2cb1ff9f559714e839b82dc3841484cd664790fb7947e55c7"
- md5sum="972c6e22dd2e44fcf0b04b9d810a56be"/>
+ hash="sha256:f33e7c81fcb742fe50b73ad87ef8a4baa7d6b59c5002a10bf63c8dee22404929"
+ md5sum="8ee6863cbb917bb4bd235698b87192a4"/>
</autotools>
<autotools id="gst-libav" autogenargs="--with-libav-extra-configure='--disable-yasm' --disable-gtk-doc">
<dependencies>
<dep package="gst-plugins-base"/>
</dependencies>
- <branch module="gst-libav/gst-libav-1.4.4.tar.xz" version="1.4.4"
+ <branch module="gst-libav/gst-libav-1.2.1.tar.xz" version="1.2.1"
repo="gstreamer"
- hash="sha256:2ec7285e5ec6731963b0955487cceb9eb04e285ca682f3ef575996c068cde8aa"
- md5sum="64a3e2cda2687132cadca4efdc63f3b4"/>
+ hash="sha256:fd152b7aec56ae76ad58b9759913a8bfe1792bdf64f260d0acaba75b75076676"
+ md5sum="4c300da1cf14b4e167d65cd5d8de1ef1"/>
</autotools>
<autotools id="xserver" autogenargs="--disable-xinerama --enable-glx --enable-composite --disable-xorg --disable-dmx --disable-xnest --disable-xquartz --disable-xwin --disable-xephyr --disable-xfake --disable-xfbdev --disable-install-setuid --disable-unit-tests --enable-unix-transport --enable-tcp-transport --disable-local-transport --with-xkb-path=/usr/share/X11/xkb --with-xkb-output=/var/lib/xkb --with-xkb-bin-directory=/usr/bin --without-dtrace">
Added: trunk/Tools/gtk/patches/gst-events-arent-gstobjects.patch (0 => 176567)
--- trunk/Tools/gtk/patches/gst-events-arent-gstobjects.patch (rev 0)
+++ trunk/Tools/gtk/patches/gst-events-arent-gstobjects.patch 2014-11-28 17:05:45 UTC (rev 176567)
@@ -0,0 +1,23 @@
+From 673301ef4891e2f582ccc0f4f4bc25c2e1ae7eab Mon Sep 17 00:00:00 2001
+From: Thiago Santos <[email protected]>
+Date: Wed, 23 Oct 2013 13:38:20 -0300
+Subject: qtdemux: use correct unref function
+
+Events aren't GstObjects, but GstMiniObjects
+
+diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
+index b1d82a4..79ad79c 100644
+--- a/gst/isomp4/qtdemux.c
++++ b/gst/isomp4/qtdemux.c
+@@ -1825,7 +1825,7 @@ gst_qtdemux_reset (GstQTDemux * qtdemux, gboolean hard)
+ #endif
+ qtdemux->major_brand = 0;
+ if (qtdemux->pending_newsegment)
+- gst_object_unref (qtdemux->pending_newsegment);
++ gst_event_unref (qtdemux->pending_newsegment);
+ qtdemux->pending_newsegment = NULL;
+ qtdemux->upstream_newsegment = TRUE;
+ qtdemux->upstream_seekable = FALSE;
+--
+cgit v0.10.2
+
Added: trunk/Tools/gtk/patches/gst-plugins-base-fix-build-gcc-4.9-x86.patch (0 => 176567)
--- trunk/Tools/gtk/patches/gst-plugins-base-fix-build-gcc-4.9-x86.patch (rev 0)
+++ trunk/Tools/gtk/patches/gst-plugins-base-fix-build-gcc-4.9-x86.patch 2014-11-28 17:05:45 UTC (rev 176567)
@@ -0,0 +1,48 @@
+From de61ce80e57b7df1680312eac2143bc1eb314361 Mon Sep 17 00:00:00 2001
+From: Carlos Alberto Lopez Perez <[email protected]>
+Date: Fri, 22 Aug 2014 10:11:19 +0000
+Subject: [PATCH] Fix build on x86 with GCC 4.9. Apply the following two
+ upstream patches:
+
+ From daa194b71ea6f9e8ee522ab02e8c56150b7e62b3 Mon Sep 17 00:00:00 2001
+ From: Antoine Jacoutot <[email protected]>
+ Date: Mon, 20 Jan 2014 15:44:09 +0100
+ Subject: audioresample: Fix build on x86 if emmintrin.h is available but can't
+ be used
+
+ On i386, EMMINTRIN is defined but not usable without SSE so check for
+ __SSE__ and __SSE2__ as well.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=670690
+
+ From 4e3d101aa854cfee633a9689efeb75e5001baa5e Mon Sep 17 00:00:00 2001
+ From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <[email protected]>
+ Date: Mon, 20 Jan 2014 16:11:04 +0100
+ Subject: audioresample: It's HAVE_EMMINTRIN_H, not HAVE_XMMINTRIN_H for SSE2
+---
+ gst/audioresample/resample.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
+index 98d006c..4410bdd 100644
+--- a/gst/audioresample/resample.c
++++ b/gst/audioresample/resample.c
+@@ -77,13 +77,13 @@
+ #define EXPORT G_GNUC_INTERNAL
+
+ #ifdef _USE_SSE
+-#ifndef HAVE_XMMINTRIN_H
++#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H)
+ #undef _USE_SSE
+ #endif
+ #endif
+
+ #ifdef _USE_SSE2
+-#ifndef HAVE_EMMINTRIN_H
++#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H)
+ #undef _USE_SSE2
+ #endif
+ #endif
+--
+2.1.0
+
Added: trunk/Tools/gtk/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch (0 => 176567)
--- trunk/Tools/gtk/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch (rev 0)
+++ trunk/Tools/gtk/patches/gst-prevent-neon-check-in-configure-from-passing-under-aarch64.patch 2014-11-28 17:05:45 UTC (rev 176567)
@@ -0,0 +1,34 @@
+From ad090272c831b5c62f0b310c776e76e3b1ffc88d Mon Sep 17 00:00:00 2001
+From: Iain Lane <[email protected]>
+Date: Fri, 15 Nov 2013 14:17:03 +0000
+Subject: [PATCH] Prevent the NEON check in configure from passing under
+ aarch64.
+
+The test verifies that the NEON C intrinsics work, but the rest of the
+codebase uses lots of direct ARMv7 NEON assembly. The same intrinsics
+work in A64, but the assembly is slightly different.
+
+Prevent the check from passing so that we don't use this where it won't
+work.
+
+Patch originally by William Grant <[email protected]>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=712367
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index e5c223f..0495371 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -190,6 +190,7 @@ AC_LINK_IFELSE([
+ AC_LANG_PROGRAM([[
+ #include <arm_neon.h>
+ int32x4_t testfunc(int16_t *a, int16_t *b) {
++ asm volatile ("vmull.s16 q0, d0, d0" : : : "q0");
+ return vmull_s16(vld1_s16(a), vld1_s16(b));
+ }
+ ]])],
+--
+1.8.4.3
\ No newline at end of file
