On Thu, Aug 28, 2014 at 09:40:30PM +0200, Aurelien Jarno wrote: > As discussed on IRC, I have just done a non-maintainer of > gst-plugins-base0.10 to fix bug#759532. Please find the diff attached.
Unfortunately it failed to build on *-i386 due to the switch to GCC 4.9 by default. I have done a second NMU to fix that, please find the patch attached. -- Aurelien Jarno GPG: 4096R/1DDD8C9B aurel...@aurel32.net http://www.aurel32.net
diff -Nru gst-plugins-base0.10-0.10.36/debian/changelog gst-plugins-base0.10-0.10.36/debian/changelog --- gst-plugins-base0.10-0.10.36/debian/changelog 2014-08-28 21:03:55.000000000 +0200 +++ gst-plugins-base0.10-0.10.36/debian/changelog 2014-08-28 23:39:30.000000000 +0200 @@ -1,3 +1,11 @@ +gst-plugins-base0.10 (0.10.36-1.3) unstable; urgency=medium + + * Non-maintainer upload to fix the previous one. + + debian/patches/20_fix-speex-sse-gcc-4.9.patch: new patch from + upstream to fix FTBFS on i386 with gcc 4.9. + + -- Aurelien Jarno <aure...@debian.org> Thu, 28 Aug 2014 21:39:29 +0000 + gst-plugins-base0.10 (0.10.36-1.2) unstable; urgency=medium * Non-maintainer upload with maintainer permission. diff -Nru gst-plugins-base0.10-0.10.36/debian/patches/20_fix-speex-sse-gcc-4.9.patch gst-plugins-base0.10-0.10.36/debian/patches/20_fix-speex-sse-gcc-4.9.patch --- gst-plugins-base0.10-0.10.36/debian/patches/20_fix-speex-sse-gcc-4.9.patch 1970-01-01 01:00:00.000000000 +0100 +++ gst-plugins-base0.10-0.10.36/debian/patches/20_fix-speex-sse-gcc-4.9.patch 2014-08-28 23:38:27.000000000 +0200 @@ -0,0 +1,35 @@ +commit 4e3d101aa854cfee633a9689efeb75e5001baa5e +Author: Sebastian Dröge <sebast...@centricular.com> +Date: Mon Jan 20 16:11:04 2014 +0100 + + audioresample: It's HAVE_EMMINTRIN_H, not HAVE_XMMINTRIN_H for SSE2 + +commit daa194b71ea6f9e8ee522ab02e8c56150b7e62b3 +Author: Antoine Jacoutot <ajacou...@gnome.org> +Date: Mon Jan 20 15:44:09 2014 +0100 + + 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 + +--- 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 diff -Nru gst-plugins-base0.10-0.10.36/debian/patches/series gst-plugins-base0.10-0.10.36/debian/patches/series --- gst-plugins-base0.10-0.10.36/debian/patches/series 2014-08-28 20:40:34.000000000 +0200 +++ gst-plugins-base0.10-0.10.36/debian/patches/series 2014-08-28 23:37:52.000000000 +0200 @@ -1,2 +1,3 @@ 10_gnome-vfs-dav-url.patch +20_fix-speex-sse-gcc-4.9.patch 98_fix-ogg-flac-transition.patch
_______________________________________________ pkg-gstreamer-maintainers mailing list pkg-gstreamer-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-gstreamer-maintainers
