tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
0
fork
atom
lol
0
fork
atom
overview
issues
pulls
pipelines
gst-plugins-base-0.10: fix 32-bit build with gcc-4.9
Vladimír Čunát
10 years ago
646ee283
aaaa9f00
+40
-1
2 changed files
expand all
collapse all
unified
split
pkgs
development
libraries
gstreamer
legacy
gst-plugins-base
default.nix
gcc-4.9.patch
+2
-1
pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/default.nix
···
18
18
};
19
19
20
20
patchPhase = ''
21
21
-
22
21
sed -i 's@/bin/echo@echo@g' configure
23
22
sed -i -e 's/^ /\t/' docs/{libs,plugins}/Makefile.in
23
23
+
24
24
+
patch -p1 < ${./gcc-4.9.patch}
24
25
'';
25
26
26
27
# TODO : v4l, libvisual
+38
pkgs/development/libraries/gstreamer/legacy/gst-plugins-base/gcc-4.9.patch
···
1
1
+
https://bugzilla.gnome.org/show_bug.cgi?id=670690
2
2
+
3
3
+
From 9bd5a7ae5435469c3557a3d70e762791cb3dc5c7 Mon Sep 17 00:00:00 2001
4
4
+
From: Antoine Jacoutot <ajacoutot@gnome.org>
5
5
+
Date: Mon, 20 Jan 2014 15:44:09 +0100
6
6
+
Subject: [PATCH] audioresample: fix build on BSD
7
7
+
8
8
+
On i386, EMMINTRIN is defined but not usable without sse so check for
9
9
+
__SSE__ and __SSE2__ as well.
10
10
+
11
11
+
https://bugzilla.gnome.org/show_bug.cgi?id=670690
12
12
+
---
13
13
+
gst/audioresample/resample.c | 4 ++--
14
14
+
1 file changed, 2 insertions(+), 2 deletions(-)
15
15
+
16
16
+
diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c
17
17
+
index 98d006c..481fa01 100644
18
18
+
--- a/gst/audioresample/resample.c
19
19
+
+++ b/gst/audioresample/resample.c
20
20
+
@@ -77,13 +77,13 @@
21
21
+
#define EXPORT G_GNUC_INTERNAL
22
22
+
23
23
+
#ifdef _USE_SSE
24
24
+
-#ifndef HAVE_XMMINTRIN_H
25
25
+
+#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H)
26
26
+
#undef _USE_SSE
27
27
+
#endif
28
28
+
#endif
29
29
+
30
30
+
#ifdef _USE_SSE2
31
31
+
-#ifndef HAVE_EMMINTRIN_H
32
32
+
+#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H)
33
33
+
#undef _USE_SSE2
34
34
+
#endif
35
35
+
#endif
36
36
+
--
37
37
+
1.8.5.3
38
38
+