gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

media-video/cinelerra: Fix build with gcc 5.2 by disabling old useless code. Bug #562208.

Browse Source 
Package-Manager: portage-2.2.23
This commit is contained in:
Alexis Ballier
2015-10-10 11:04:52 +02:00
parent fe73ea3337
commit cc1aa656e0
3 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-video/cinelerra/cinelerra-20140710.ebuild
View File

@@ -62,7 +62,9 @@ src_prepare() {
"${FILESDIR}"/${P}-ffmpeg-0.11.patch \
"${FILESDIR}"/${PN}-libav9.patch \
"${FILESDIR}"/${PN}-pngtoh.patch \
"${FILESDIR}"/${PN}-nofindobject.patch
"${FILESDIR}"/${PN}-nofindobject.patch \
"${FILESDIR}"/${PN}-asm-gcc52.patch \
"${FILESDIR}"/${PN}-putbits-gcc52.patch
if has_version '>=media-video/ffmpeg-2' ; then
epatch "${FILESDIR}"/${PN}-ffmpeg2.patch

15
media-video/cinelerra/files/cinelerra-asm-gcc52.patch Normal file
View File

@@ -0,0 +1,15 @@
https://bugs.gentoo.org/show_bug.cgi?id=562208
Index: cinelerra-20140710/quicktime/mmx.h
===================================================================
--- cinelerra-20140710.orig/quicktime/mmx.h
+++ cinelerra-20140710/quicktime/mmx.h
@@ -102,7 +102,7 @@ typedef union {
* are unused by Cinelerra CV. Inspired by change found in
* <URL: http://hg.libsdl.org/SDL/file/32f0f603a0c8/src/video/mmx.h >
*/
-#if !defined(__clang__)
+#if 0
/* Function to test if multimedia instructions are supported...
*/
inline extern int

29
media-video/cinelerra/files/cinelerra-putbits-gcc52.patch Normal file
View File

@@ -0,0 +1,29 @@
https://bugs.gentoo.org/show_bug.cgi?id=562208
Index: cinelerra-20140710/toolame-02l/bitstream.c
===================================================================
--- cinelerra-20140710.orig/toolame-02l/bitstream.c
+++ cinelerra-20140710/toolame-02l/bitstream.c
@@ -198,9 +198,6 @@ void put1bit (Bit_stream_struc * bs, int
}
/*write N bits into the bit stream */
-#if !defined(__clang__)
-INLINE
-#endif /* not __clang__ */
void putbits (Bit_stream_struc * bs, unsigned int val, int N)
{
register int j = N;
Index: cinelerra-20140710/toolame-02l/bitstream.h
===================================================================
--- cinelerra-20140710.orig/toolame-02l/bitstream.h
+++ cinelerra-20140710/toolame-02l/bitstream.h
@@ -9,7 +9,7 @@ unsigned int get1bit (Bit_stream_struc *
void put1bit (Bit_stream_struc *, int);
unsigned long look_ahead (Bit_stream_struc *, int);
unsigned long getbits (Bit_stream_struc *, int);
-INLINE void putbits (Bit_stream_struc *, unsigned int, int);
+void putbits (Bit_stream_struc *, unsigned int, int);
void byte_ali_putbits (Bit_stream_struc *, unsigned int, int);
unsigned long byte_ali_getbits (Bit_stream_struc *, int);
unsigned long sstell (Bit_stream_struc *);