Fix building with gcc4.

(Portage version: 2.0.51.20-r4)

3 files changed, 133 insertions, 2 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index be2012135135..d51255b13d83 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.97 2005/04/25 18:14:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.98 2005/04/25 23:10:53 azarah Exp $
+
+  25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
+  +files/transcode-0.6.14-gcc4.patch, transcode-0.6.14-r1.ebuild:
+  Fix building with gcc4.
 
   25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
   transcode-0.6.14-r1.ebuild:
diff --git a/media-video/transcode/files/transcode-0.6.14-gcc4.patch b/media-video/transcode/files/transcode-0.6.14-gcc4.patch
new file mode 100644
index 000000000000..08a736a1b4bc
--- /dev/null
+++ b/media-video/transcode/files/transcode-0.6.14-gcc4.patch
@@ -0,0 +1,124 @@
+--- transcode-0.6.14/libac3/bitstream.c	2005-04-25 21:46:31.000000000 +0000
++++ transcode-0.6.14.az/libac3/bitstream.c	2005-04-25 21:47:25.000000000 +0000
+@@ -97,7 +97,7 @@
+ static inline void
+ bitstream_fill_current()
+ {
+-	current_word = *((uint_32*)buffer_start)++;
++	current_word = *buffer_start++;
+ 	current_word = swab32(current_word);
+ }
+ 
+--- transcode-0.6.14/import/extract_mpeg2.c
++++ transcode-0.6.14.az/import/extract_mpeg2.c
+@@ -38,7 +38,7 @@
+ static uint8_t buffer[BUFFER_SIZE];
+ static FILE *in_file, *out_file;
+ 
+-int verbose;
++static int verbose;
+ 
+ static void ps_loop (void)
+ {
+--- transcode-0.6.14/import/extract_mp3.c
++++ transcode-0.6.14.az/import/extract_mp3.c
+@@ -39,7 +39,7 @@
+ static uint8_t buffer[BUFFER_SIZE];
+ static FILE *in_file, *out_file;
+ 
+-int verbose;
++static int verbose;
+ 
+ static int demux_track=0xc0;
+ 
+--- transcode-0.6.14/import/extract_ogm.c
++++ transcode-0.6.14.az/import/extract_ogm.c
+@@ -45,7 +45,7 @@
+ int no[3];
+ int      xraw = 0;
+ 
+-int verbose = 0;
++static int verbose = 0;
+ 
+ #if (HAVE_OGG && HAVE_VORBIS) 
+ 
+--- transcode-0.6.14/import/demuxer.c
++++ transcode-0.6.14.az/import/demuxer.c
+@@ -37,7 +37,7 @@
+ #include "demuxer.h"
+ #include "packets.h"
+ 
+-int verbose=TC_QUIET;
++static int verbose=TC_QUIET;
+ static int demux_mode=TC_DEMUX_SEQ_ADJUST;
+ 
+ int gop, gop_pts, gop_cnt;
+--- transcode-0.6.14/src/transcode.h
++++ transcode-0.6.14.az/src/transcode.h
+@@ -579,7 +579,7 @@
+ 
+ #define pow2(b) (((b)==0) ? 1 : 1<<(b))
+ 
+-extern int verbose;
++static int verbose;
+ extern int pcmswap;
+ extern int rescale;
+ extern int im_clip;
+--- transcode-0.6.14/src/video_trans.h
++++ transcode-0.6.14.az/src/video_trans.h
+@@ -149,7 +149,7 @@
+ extern redtab_t hori_table_8[];
+ extern redtab_t hori_table_8_up[];
+ 
+-extern int gamma_table_flag;
++static int gamma_table_flag;
+ extern unsigned char gamma_table[];
+ 
+ extern unsigned long *aa_table_c;
+--- transcode-0.6.14/src/transcode.c
++++ transcode-0.6.14.az/src/transcode.c
+@@ -91,7 +91,7 @@
+ 
+ // global information structure
+ static vob_t *vob;
+-int verbose = TC_INFO;
++static int verbose = TC_INFO;
+ 
+ static int core_mode=TC_MODE_DEFAULT;
+ 
+--- transcode-0.6.14/filter/yuvdenoise/Makefile.am
++++ transcode-0.6.14.az/filter/yuvdenoise/Makefile.am
+@@ -14,8 +14,7 @@
+ 	-ffast-math \
+ 	-frerun-cse-after-loop \
+ 	-frerun-loop-opt \
+-	-fexpensive-optimizations \
+-	-fmove-all-movables
++	-fexpensive-optimizations
+ 
+ AM_CPPFLAGS = -D_REENTRANT
+ 
+--- transcode-0.6.14/filter/subtitler/color_processor.c
++++ transcode-0.6.14.az/filter/subtitler/color_processor.c
+@@ -70,8 +70,8 @@
+ dsaturation *= dsat;
+ 
+ /* demodulate :) our quadrature demodulator */
+-(int)*u = sin(dcolor) * dsaturation;
+-(int)*v = cos(dcolor) * dsaturation;
++*u = sin(dcolor) * dsaturation;
++*v = cos(dcolor) * dsaturation;
+ 
+ /* and do this for each pixel...... */
+ 
+--- transcode-0.6.14/tools/tcmodinfo.c
++++ transcode-0.6.14.az/tools/tcmodinfo.c
+@@ -83,7 +83,7 @@
+ // dependencies
+ // Yeah, this sucks
+ vob_t *tc_get_vob() {return(&vob);}
+-int verbose  = 1;
++static int verbose  = 1;
+ int rgbswap  = 0;
+ int tc_accel = -1;    //acceleration code
+ int flip = 0;
diff --git a/media-video/transcode/transcode-0.6.14-r1.ebuild b/media-video/transcode/transcode-0.6.14-r1.ebuild
index 8496e0223912..b051e1a8edf3 100644
--- a/media-video/transcode/transcode-0.6.14-r1.ebuild
+++ b/media-video/transcode/transcode-0.6.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.14-r1.ebuild,v 1.4 2005/04/25 18:14:16 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-0.6.14-r1.ebuild,v 1.5 2005/04/25 23:10:53 azarah Exp $
 
 inherit libtool flag-o-matic eutils multilib
 
@@ -66,6 +66,9 @@ src_unpack() {
 	# apply amd64 and mmx patches from upstream CVS
 	epatch ${FILESDIR}/${P}-amd64_mmx.patch
 
+	# fix building with gcc4
+	epatch ${FILESDIR}/${P}-gcc4.patch
+
 	libtoolize --copy --force || die "libtoolize failed"
 	autoreconf -i || die "autoreconf failed"