[Pkg-gstreamer-commits] [gst-plugins-base0.10] 02/04: Imported Debian patch 0.10.36-1.3

[Iain Lane]

This is an automated email from the git hooks/post-receive script.

laney pushed a commit to branch master
in repository gst-plugins-base0.10.

commit 8bb64246f896c8eeafc0e0626fb6e732061c3a94
Author: Aurelien Jarno <aurel32 at debian.org>
Date:   Thu Aug 28 21:39:29 2014 +0000

    Imported Debian patch 0.10.36-1.3
---
 debian/changelog                              |  8 ++++++
 debian/patches/20_fix-speex-sse-gcc-4.9.patch | 35 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 44 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e55609f..fdbe035 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <aurel32 at 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 --git a/debian/patches/20_fix-speex-sse-gcc-4.9.patch b/debian/patches/20_fix-speex-sse-gcc-4.9.patch
new file mode 100644
index 0000000..cb846f7
--- /dev/null
+++ b/debian/patches/20_fix-speex-sse-gcc-4.9.patch
@@ -0,0 +1,35 @@
+commit 4e3d101aa854cfee633a9689efeb75e5001baa5e
+Author: Sebastian Dröge <sebastian at 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 <ajacoutot at 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 --git a/debian/patches/series b/debian/patches/series
index 6022448..63135c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 10_gnome-vfs-dav-url.patch
+20_fix-speex-sse-gcc-4.9.patch
 98_fix-ogg-flac-transition.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-base0.10.git