1 |
commit: cc1aa656e022d809b2e9d2ef64c2c4360c75a9d3 |
2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 10 09:04:52 2015 +0000 |
4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 10 09:05:06 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc1aa656 |
7 |
|
8 |
media-video/cinelerra: Fix build with gcc 5.2 by disabling old useless code. Bug #562208. |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
|
12 |
media-video/cinelerra/cinelerra-20140710.ebuild | 4 ++- |
13 |
.../cinelerra/files/cinelerra-asm-gcc52.patch | 15 +++++++++++ |
14 |
.../cinelerra/files/cinelerra-putbits-gcc52.patch | 29 ++++++++++++++++++++++ |
15 |
3 files changed, 47 insertions(+), 1 deletion(-) |
16 |
|
17 |
diff --git a/media-video/cinelerra/cinelerra-20140710.ebuild b/media-video/cinelerra/cinelerra-20140710.ebuild |
18 |
index 0866be2..48f96ef 100644 |
19 |
--- a/media-video/cinelerra/cinelerra-20140710.ebuild |
20 |
+++ b/media-video/cinelerra/cinelerra-20140710.ebuild |
21 |
@@ -62,7 +62,9 @@ src_prepare() { |
22 |
"${FILESDIR}"/${P}-ffmpeg-0.11.patch \ |
23 |
"${FILESDIR}"/${PN}-libav9.patch \ |
24 |
"${FILESDIR}"/${PN}-pngtoh.patch \ |
25 |
- "${FILESDIR}"/${PN}-nofindobject.patch |
26 |
+ "${FILESDIR}"/${PN}-nofindobject.patch \ |
27 |
+ "${FILESDIR}"/${PN}-asm-gcc52.patch \ |
28 |
+ "${FILESDIR}"/${PN}-putbits-gcc52.patch |
29 |
|
30 |
if has_version '>=media-video/ffmpeg-2' ; then |
31 |
epatch "${FILESDIR}"/${PN}-ffmpeg2.patch |
32 |
|
33 |
diff --git a/media-video/cinelerra/files/cinelerra-asm-gcc52.patch b/media-video/cinelerra/files/cinelerra-asm-gcc52.patch |
34 |
new file mode 100644 |
35 |
index 0000000..1f46ad2 |
36 |
--- /dev/null |
37 |
+++ b/media-video/cinelerra/files/cinelerra-asm-gcc52.patch |
38 |
@@ -0,0 +1,15 @@ |
39 |
+https://bugs.gentoo.org/show_bug.cgi?id=562208 |
40 |
+ |
41 |
+Index: cinelerra-20140710/quicktime/mmx.h |
42 |
+=================================================================== |
43 |
+--- cinelerra-20140710.orig/quicktime/mmx.h |
44 |
++++ cinelerra-20140710/quicktime/mmx.h |
45 |
+@@ -102,7 +102,7 @@ typedef union { |
46 |
+ * are unused by Cinelerra CV. Inspired by change found in |
47 |
+ * <URL: http://hg.libsdl.org/SDL/file/32f0f603a0c8/src/video/mmx.h > |
48 |
+ */ |
49 |
+-#if !defined(__clang__) |
50 |
++#if 0 |
51 |
+ /* Function to test if multimedia instructions are supported... |
52 |
+ */ |
53 |
+ inline extern int |
54 |
|
55 |
diff --git a/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch b/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch |
56 |
new file mode 100644 |
57 |
index 0000000..646db9f |
58 |
--- /dev/null |
59 |
+++ b/media-video/cinelerra/files/cinelerra-putbits-gcc52.patch |
60 |
@@ -0,0 +1,29 @@ |
61 |
+https://bugs.gentoo.org/show_bug.cgi?id=562208 |
62 |
+ |
63 |
+Index: cinelerra-20140710/toolame-02l/bitstream.c |
64 |
+=================================================================== |
65 |
+--- cinelerra-20140710.orig/toolame-02l/bitstream.c |
66 |
++++ cinelerra-20140710/toolame-02l/bitstream.c |
67 |
+@@ -198,9 +198,6 @@ void put1bit (Bit_stream_struc * bs, int |
68 |
+ } |
69 |
+ |
70 |
+ /*write N bits into the bit stream */ |
71 |
+-#if !defined(__clang__) |
72 |
+-INLINE |
73 |
+-#endif /* not __clang__ */ |
74 |
+ void putbits (Bit_stream_struc * bs, unsigned int val, int N) |
75 |
+ { |
76 |
+ register int j = N; |
77 |
+Index: cinelerra-20140710/toolame-02l/bitstream.h |
78 |
+=================================================================== |
79 |
+--- cinelerra-20140710.orig/toolame-02l/bitstream.h |
80 |
++++ cinelerra-20140710/toolame-02l/bitstream.h |
81 |
+@@ -9,7 +9,7 @@ unsigned int get1bit (Bit_stream_struc * |
82 |
+ void put1bit (Bit_stream_struc *, int); |
83 |
+ unsigned long look_ahead (Bit_stream_struc *, int); |
84 |
+ unsigned long getbits (Bit_stream_struc *, int); |
85 |
+-INLINE void putbits (Bit_stream_struc *, unsigned int, int); |
86 |
++void putbits (Bit_stream_struc *, unsigned int, int); |
87 |
+ void byte_ali_putbits (Bit_stream_struc *, unsigned int, int); |
88 |
+ unsigned long byte_ali_getbits (Bit_stream_struc *, int); |
89 |
+ unsigned long sstell (Bit_stream_struc *); |