gst-plugins-base-0.10: fix 32-bit build with gcc-4.9

This commit is contained in:
Vladimír Čunát 2015-06-04 16:15:35 +02:00
parent aaaa9f0041
commit 646ee283e8
2 changed files with 40 additions and 1 deletions

View File

@ -18,9 +18,10 @@ stdenv.mkDerivation rec {
}; };
patchPhase = '' patchPhase = ''
sed -i 's@/bin/echo@echo@g' configure sed -i 's@/bin/echo@echo@g' configure
sed -i -e 's/^ /\t/' docs/{libs,plugins}/Makefile.in sed -i -e 's/^ /\t/' docs/{libs,plugins}/Makefile.in
patch -p1 < ${./gcc-4.9.patch}
''; '';
# TODO : v4l, libvisual # TODO : v4l, libvisual

View File

@ -0,0 +1,38 @@
https://bugzilla.gnome.org/show_bug.cgi?id=670690
From 9bd5a7ae5435469c3557a3d70e762791cb3dc5c7 Mon Sep 17 00:00:00 2001
From: Antoine Jacoutot <ajacoutot@gnome.org>
Date: Mon, 20 Jan 2014 15:44:09 +0100
Subject: [PATCH] audioresample: fix build on BSD
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.8.5.3