[gstreamer-plugins-base: 183/216] Improve conditional SSE and SSE2 compilation. Fixes #1106735

commit e1631bea24201a00d1fc8000a2fe30ac333b0133 Author: Wim Taymans <wtaymans(a)redhat.com&gt; Date: Tue Jun 10 13:49:26 2014 +0200 Improve conditional SSE and SSE2 compilation. Fixes #1106735 ...le-Fix-build-on-x86-if-emmintrin.h-is-ava.patch | 37 ++++++++++++++++++++++ ...le-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch | 26 +++++++++++++++ gstreamer-plugins-base.spec | 9 +++++- 3 files changed, 71 insertions(+), 1 deletion(-) --- diff --git a/0001-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch b/0001-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch new file mode 100644 index 0000000..0364c2f --- /dev/null +++ b/0001-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch @@ -0,0 +1,37 @@ +From bde72c7bebaa9d10cd49ae5542d361bda7aa7bd0 Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot <ajacoutot(a)gnome.org&gt; +Date: Mon, 20 Jan 2014 15:44:09 +0100 +Subject: [PATCH 1/2] 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 +--- + 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..481fa01 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_XMMINTRIN_H) + #undef _USE_SSE2 + #endif + #endif +-- +1.9.0 + diff --git a/0002-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch b/0002-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch new file mode 100644 index 0000000..ee7e333 --- /dev/null +++ b/0002-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch @@ -0,0 +1,26 @@ +From e9746600b409db9a5c63dc7a22b21f80c8c5328c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian(a)centricular.com&gt; +Date: Mon, 20 Jan 2014 16:11:04 +0100 +Subject: [PATCH 2/2] audioresample: It's HAVE_EMMINTRIN_H, not + HAVE_XMMINTRIN_H for SSE2 + +--- + gst/audioresample/resample.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c +index 481fa01..4410bdd 100644 +--- a/gst/audioresample/resample.c ++++ b/gst/audioresample/resample.c +@@ -83,7 +83,7 @@ + #endif + + #ifdef _USE_SSE2 +-#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H) ++#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H) + #undef _USE_SSE2 + #endif + #endif +-- +1.9.0 + diff --git a/gstreamer-plugins-base.spec b/gstreamer-plugins-base.spec index 31263ef..baf69ad 100644 --- a/gstreamer-plugins-base.spec +++ b/gstreamer-plugins-base.spec @@ -4,7 +4,7 @@ Name: %{gstreamer}-plugins-base Version: %{gstreamer_version} -Release: 8%{?dist} +Release: 9%{?dist} Summary: GStreamer streaming media framework base plug-ins Group: Applications/Multimedia @@ -42,6 +42,8 @@ Obsoletes: gstreamer-plugins BuildRequires: gtk-doc >= 1.3 Patch0: 0001-missing-plugins-Remove-the-mpegaudioversion-field.patch +Patch1: 0001-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch +Patch2: 0002-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch %description GStreamer is a streaming media framework, based on graphs of filters which @@ -56,6 +58,8 @@ This package contains a set of well-maintained base plug-ins. %prep %setup -q -n gst-plugins-base-%{version} %patch0 -p1 -b .mpegaudioversion +%patch1 -p1 -b .0001 +%patch2 -p1 -b .0002 %build %configure \ @@ -326,6 +330,9 @@ library. %doc %{_datadir}/gtk-doc/html/gst-plugins-base-plugins-%{majorminor} %changelog +* Tue Jun 10 2014 Wim Taymans <wtaymans(a)redhat.com&gt; - 0.10.36-9 +- Improve conditional SSE and SSE2 compilation. Fixes #1106735 + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; - 0.10.36-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild