summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-09-16 04:58:34 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-29 12:12:43 +0100
commit59482878dbe04f1e941bcc07ed7c795f49bc80e7 (patch)
treeaf2f0dea732453e77b3bbc96531064ed0db6985f /meta/recipes-multimedia
parenta876a2bf78deb4607b3b59366bda6e35755ea868 (diff)
downloadpoky-59482878dbe04f1e941bcc07ed7c795f49bc80e7.tar.gz
gst-plugins-base: fix build failure for x86
On x86, EMMINTRIN is defined but not usable without SSE so check for __SSE__ and __SSE2__ as well. (From OE-Core rev: 556a19423d15c7c13f60d57528a3b880f95750b9) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch37
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb4
2 files changed, 40 insertions, 1 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
new file mode 100644
index 0000000000..52142562ab
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch
@@ -0,0 +1,37 @@
1audioresample: Fix build on x86 if emmintrin.h is available but can't be used
2
3On x86, EMMINTRIN is defined but not usable without SSE so check for
4__SSE__ and __SSE2__ as well.
5
6https://bugzilla.gnome.org/show_bug.cgi?id=670690
7
8Upstream-Status: Backport
9
10Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
11---
12 gst/audioresample/resample.c | 4 ++--
13 1 files changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
16index 98d006c..481fa01 100644
17--- a/gst/audioresample/resample.c
18+++ b/gst/audioresample/resample.c
19@@ -77,13 +77,13 @@
20 #define EXPORT G_GNUC_INTERNAL
21
22 #ifdef _USE_SSE
23-#ifndef HAVE_XMMINTRIN_H
24+#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H)
25 #undef _USE_SSE
26 #endif
27 #endif
28
29 #ifdef _USE_SSE2
30-#ifndef HAVE_EMMINTRIN_H
31+#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H)
32 #undef _USE_SSE2
33 #endif
34 #endif
35--
361.7.1
37
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
index 4a8a9947a7..c8a949973d 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
@@ -9,7 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
9DEPENDS += "alsa-lib liboil libogg libvorbis libtheora util-linux tremor glib-2.0-native" 9DEPENDS += "alsa-lib liboil libogg libvorbis libtheora util-linux tremor glib-2.0-native"
10 10
11SRC_URI += "file://gst-plugins-base-tremor.patch \ 11SRC_URI += "file://gst-plugins-base-tremor.patch \
12 file://configure.ac-fix-subparse-plugin.patch" 12 file://configure.ac-fix-subparse-plugin.patch \
13 file://audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch \
14"
13 15
14SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a" 16SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a"
15SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976" 17SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976"