summaryrefslogtreecommitdiffstats
path: root/multimedia
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2012-12-17 09:47:55 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2012-12-17 09:47:55 +0800
commit6e3b29d7c4bc09abb6fc6e2bb57f4e77da0ca593 (patch)
treeaca71f1b270c68c46cb2b6d02480abcba7e0e87f /multimedia
parenta9ffbd64dd2417bc2ed2f442e6973036a7209609 (diff)
downloadmarcuscom-ports-6e3b29d7c4bc09abb6fc6e2bb57f4e77da0ca593.tar
marcuscom-ports-6e3b29d7c4bc09abb6fc6e2bb57f4e77da0ca593.tar.gz
marcuscom-ports-6e3b29d7c4bc09abb6fc6e2bb57f4e77da0ca593.tar.bz2
marcuscom-ports-6e3b29d7c4bc09abb6fc6e2bb57f4e77da0ca593.tar.lz
marcuscom-ports-6e3b29d7c4bc09abb6fc6e2bb57f4e77da0ca593.tar.xz
marcuscom-ports-6e3b29d7c4bc09abb6fc6e2bb57f4e77da0ca593.tar.zst
marcuscom-ports-6e3b29d7c4bc09abb6fc6e2bb57f4e77da0ca593.zip
Lift patches from gstreamer-plugins to fix build on i386 due to a bug in the
mmx/sse headers of base gcc. (fixed in later versions). git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17172 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/gstreamer1-plugins/files/patch-gst_audioresample_float.c23
-rw-r--r--multimedia/gstreamer1-plugins/files/patch-gst_audioresample_resample.c12
-rw-r--r--multimedia/gstreamer1-plugins/files/patch-gst_audioresample_speex-resampler-double.c21
3 files changed, 56 insertions, 0 deletions
diff --git a/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_float.c b/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_float.c
new file mode 100644
index 000000000..b08886910
--- /dev/null
+++ b/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_float.c
@@ -0,0 +1,23 @@
+--- gst/audioresample/speex_resampler_float.c.orig 2012-07-17 09:48:45.000000000 +0200
++++ gst/audioresample/speex_resampler_float.c 2012-07-17 09:49:38.000000000 +0200
+@@ -17,8 +17,20 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#ifdef _USE_SSE
++#ifndef HAVE_XMMINTRIN_H
++#undef _USE_SSE
++#undef _USE_SSE2
++#else
+ #define _USE_SSE
+ #define _USE_SSE2
++#endif
++#endif
++
+ #define FLOATING_POINT
+ #define OUTSIDE_SPEEX
+ #define RANDOM_PREFIX resample_float
diff --git a/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_resample.c b/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_resample.c
new file mode 100644
index 000000000..aa5c15195
--- /dev/null
+++ b/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_resample.c
@@ -0,0 +1,12 @@
+--- gst/audioresample/resample.c.orig 2012-06-28 10:15:58.000000000 +0200
++++ gst/audioresample/resample.c 2012-06-28 10:22:41.000000000 +0200
+@@ -79,6 +79,9 @@
+ #ifdef _USE_SSE
+ #ifndef HAVE_XMMINTRIN_H
+ #undef _USE_SSE
++/* this is a hack to build on i386, there the configure check for emmintrin.h
++ doesn't fail but the xmmintrin.h does. */
++#undef _USE_SSE2
+ #endif
+ #endif
+
diff --git a/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_speex-resampler-double.c b/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_speex-resampler-double.c
new file mode 100644
index 000000000..97d8e785a
--- /dev/null
+++ b/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_speex-resampler-double.c
@@ -0,0 +1,21 @@
+--- gst/audioresample/speex_resampler_double.c.orig 2012-06-28 10:31:31.000000000 +0200
++++ gst/audioresample/speex_resampler_double.c 2012-06-28 10:33:01.000000000 +0200
+@@ -17,7 +17,18 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#ifdef _USE_SSE
++#ifndef HAVE_XMMINTRIN_H
++#undef _USE_SSE
++#undef _USE_SSE2
++#else
+ #define _USE_SSE2
++#endif
++#endif
+ #define FLOATING_POINT
+ #define DOUBLE_PRECISION
+ #define OUTSIDE_SPEEX