gcc-3.4 fixes...

4 files changed, 130 insertions, 4 deletions

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 3cb01bebe936..7aff48fc94f6 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.20 2004/06/09 16:55:38 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.21 2004/06/11 13:26:57 kugelfang Exp $
+
+  11 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
+  +files/cinelerra-1.2.0-gcc34.patch, cinelerra-1.2.0.ebuild:
+  Added gcc-3.4 compatibility patch as well as a global #undef HAVE_V4L2 to
+  avoid a linker error. This is a workaround until upstream fixes.
 
   09 Jun 2004; Aron Griffis <agriffis@gentoo.org> cinelerra-1.0.0.ebuild,
   cinelerra-1.1.5.ebuild, cinelerra-1.1.7.ebuild, cinelerra-1.1.9.ebuild,
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index 3f6afd55dc02..e2df3ecad51f 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -1,9 +1,9 @@
-MD5 f41d5b9be2a70b0e15862829da9e1faa ChangeLog 3042
+MD5 a61c372fc699f970ac7e6715eb5a57e3 ChangeLog 3301
 MD5 8369ad84b6a17eae9455bdced201f1bc cinelerra-1.0.0.ebuild 1057
 MD5 32f1cb0662c5efbb0748d8ab2808bf05 cinelerra-1.1.5.ebuild 1261
 MD5 81ee0ee3b0b3efe4049e8c8cf746016a cinelerra-1.1.7.ebuild 1633
 MD5 b318944f1e74b51addc6d15dc82d4c12 cinelerra-1.1.9.ebuild 1616
-MD5 fa899a42efda473bf65c2255529d07f3 cinelerra-1.2.0.ebuild 1716
+MD5 8d80f93f6bda230a65d2dfc6a340ad68 cinelerra-1.2.0.ebuild 1805
 MD5 8abbf62fe482bf492386df7f1e562270 metadata.xml 227
 MD5 6a0e5d7afc5e123e9c6a059b38351548 files/compile-1.1.6.diff 7517
 MD5 bb1b390c6a20a9240f1100c3a3974b0d files/digest-cinelerra-1.0.0 73
@@ -13,3 +13,4 @@ MD5 bffe8c026a4ffdf9220cbc62a75deb8e files/digest-cinelerra-1.1.9 74
 MD5 12c40f831322db75d68c5449efaa4ac6 files/gcc-3.3.1-collate.patch 539
 MD5 3d915d40f23c642ed22fa5a627519aec files/pthread_t_not_int.patch 880
 MD5 6f63e3977c7e50e2cf783311d7dda0aa files/digest-cinelerra-1.2.0 74
+MD5 b2ee9332ec581ccf59714537ef55fc4b files/cinelerra-1.2.0-gcc34.patch 4523
diff --git a/media-video/cinelerra/cinelerra-1.2.0.ebuild b/media-video/cinelerra/cinelerra-1.2.0.ebuild
index 00d5ab40852d..880d882564e1 100644
--- a/media-video/cinelerra/cinelerra-1.2.0.ebuild
+++ b/media-video/cinelerra/cinelerra-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.2.0.ebuild,v 1.4 2004/06/10 12:26:09 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-1.2.0.ebuild,v 1.5 2004/06/11 13:26:57 kugelfang Exp $
 
 inherit gcc eutils flag-o-matic
 export WANT_GCC_3="yes"
@@ -29,6 +29,7 @@ src_unpack() {
 	unpack ${A}
 #	epatch ${FILESDIR}/gcc-3.3.1-collate.patch
 #	epatch ${FILESDIR}/pthread_t_not_int.patch
+	epatch ${FILESDIR}/${P}-gcc34.patch
 	touch ${S}/hvirtual_config.h
 }
 
@@ -39,6 +40,8 @@ src_compile() {
 	cd ${S}/quicktime/ffmpeg-0.4.8
 	econf ||die
 
+	echo "#undef HAVE_V4L2" >> ${S}/hvirtual_config.h
+
 	cd ${S}
 	make || die "make failed"
 }
diff --git a/media-video/cinelerra/files/cinelerra-1.2.0-gcc34.patch b/media-video/cinelerra/files/cinelerra-1.2.0-gcc34.patch
new file mode 100644
index 000000000000..2f20199fff5f
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-1.2.0-gcc34.patch
@@ -0,0 +1,117 @@
+--- cinelerra-1.2.0/guicast/arraylist.h.orig	2004-06-10 14:49:01.139700744 +0200
++++ cinelerra-1.2.0/guicast/arraylist.h	2004-06-10 14:47:51.215330864 +0200
+@@ -1,6 +1,8 @@
+ #ifndef ARRAYLIST_H
+ #define ARRAYLIST_H
+ 
++#include <stdio.h>
++
+ // designed for lists of track numbers
+ 
+ template<class TYPE>
+--- cinelerra-1.2.0/cinelerra/floatautos.C.orig	2004-06-10 15:29:51.105249368 +0200
++++ cinelerra-1.2.0/cinelerra/floatautos.C	2004-06-10 15:30:08.127661568 +0200
+@@ -249,8 +249,8 @@
+ 	float y0, y1, y2, y3;
+  	float t;
+ 
+-	previous = (FloatAuto*)get_prev_auto(position, direction, (Auto*)previous, 0);
+-	next = (FloatAuto*)get_next_auto(position, direction, (Auto*)next, 0);
++	previous = (FloatAuto*)get_prev_auto(position, direction, (Auto*&)previous, 0);
++	next = (FloatAuto*)get_next_auto(position, direction, (Auto*&)next, 0);
+ 
+ // Constant
+ 	if(!next && !previous)
+--- cinelerra-1.2.0/cinelerra/recordmonitor.C.orig	2004-06-10 15:38:34.777639064 +0200
++++ cinelerra-1.2.0/cinelerra/recordmonitor.C	2004-06-10 15:43:29.064900600 +0200
+@@ -1004,7 +1004,7 @@
+ 
+ int RecVideoDVThread::start_rendering()
+ {
+-	((dv_t*)dv) = dv_new();
++	dv = (void*)dv_new();
+ 	return 0;
+ }
+ 
+--- cinelerra-1.2.0/cinelerra/panautos.C.orig	2004-06-10 16:01:26.943038216 +0200
++++ cinelerra-1.2.0/cinelerra/panautos.C	2004-06-10 16:02:04.583316024 +0200
+@@ -24,8 +24,8 @@
+ 		PanAuto* &previous,
+ 		PanAuto* &next)
+ {
+-	previous = (PanAuto*)get_prev_auto(position, direction, (Auto*)previous);
+-	next = (PanAuto*)get_next_auto(position, direction, (Auto*)next);
++	previous = (PanAuto*)get_prev_auto(position, direction, (Auto*&)previous);
++	next = (PanAuto*)get_next_auto(position, direction, (Auto*&)next);
+ 
+ // Constant
+ 	if(previous->handle_x == next->handle_x &&
+--- cinelerra-1.2.0/cinelerra/tracks.C.orig	2004-06-10 23:00:14.882010848 +0200
++++ cinelerra-1.2.0/cinelerra/tracks.C	2004-06-10 23:00:32.904271048 +0200
+@@ -295,7 +295,7 @@
+ 		mute_keyframe = (IntAuto*)current->automation->mute_autos->get_prev_auto(
+ 			unit_start, 
+ 			PLAY_FORWARD,
+-			(Auto*)mute_keyframe);
++			(Auto*&)mute_keyframe);
+ 
+ 		result += 
+ 			(current->play && type == PLAY) ||
+--- cinelerra-1.2.0/cinelerra/virtualnode.C.orig	2004-06-10 23:01:42.411704312 +0200
++++ cinelerra-1.2.0/cinelerra/virtualnode.C	2004-06-10 23:02:07.916826944 +0200
+@@ -472,8 +472,8 @@
+ 
+ 	IntAuto *prev_keyframe = 0;
+ 	IntAuto *next_keyframe = 0;
+-	prev_keyframe = (IntAuto*)autos->get_prev_auto(input_position, direction, (Auto*)prev_keyframe);
+-	next_keyframe = (IntAuto*)autos->get_next_auto(input_position, direction, (Auto*)next_keyframe);
++	prev_keyframe = (IntAuto*)autos->get_prev_auto(input_position, direction, (Auto*&)prev_keyframe);
++	next_keyframe = (IntAuto*)autos->get_next_auto(input_position, direction, (Auto*&)next_keyframe);
+ 
+ 	if(direction == PLAY_FORWARD)
+ 	{
+--- cinelerra-1.2.0/cinelerra/virtualanode.C.orig	2004-06-10 23:03:35.860457480 +0200
++++ cinelerra-1.2.0/cinelerra/virtualanode.C	2004-06-10 23:03:54.723589848 +0200
+@@ -492,8 +492,8 @@
+ 
+ 	PanAuto *prev_keyframe = 0;
+ 	PanAuto *next_keyframe = 0;
+-	prev_keyframe = (PanAuto*)autos->get_prev_auto(input_position, direction, (Auto*)prev_keyframe);
+-	next_keyframe = (PanAuto*)autos->get_next_auto(input_position, direction, (Auto*)next_keyframe);
++	prev_keyframe = (PanAuto*)autos->get_prev_auto(input_position, direction, (Auto*&)prev_keyframe);
++	next_keyframe = (PanAuto*)autos->get_next_auto(input_position, direction, (Auto*&)next_keyframe);
+ 	
+ 	if(direction == PLAY_FORWARD)
+ 	{
+--- cinelerra-1.2.0/cinelerra/virtualvnode.C.orig	2004-06-10 23:04:43.955105520 +0200
++++ cinelerra-1.2.0/cinelerra/virtualvnode.C	2004-06-10 23:05:20.700519368 +0200
+@@ -315,7 +315,7 @@
+ 					(IntAuto*)track->automation->mode_autos->get_prev_auto(
+ 						start_position_project, 
+ 						direction,
+-						(Auto*)mode_keyframe);
++						(Auto*&)mode_keyframe);
+ 
+ 				int mode = mode_keyframe->value;
+ 
+--- cinelerra-1.2.0/cinelerra/videodevice.h.orig	2004-06-10 23:57:01.857071912 +0200
++++ cinelerra-1.2.0/cinelerra/videodevice.h	2004-06-10 23:54:45.938734640 +0200
+@@ -1,6 +1,7 @@
+ #ifndef VIDEODEVICE_H
+ #define VIDEODEVICE_H
+ 
++#include "../hvirtual_config.h"
+ #include "asset.inc"
+ #include "assets.inc"
+ #include "audio1394.inc"
+--- cinelerra-1.2.0/mplexhi/multplex.c.orig	2003-10-14 09:54:14.000000000 +0200
++++ cinelerra-1.2.0/mplexhi/multplex.c	2004-06-11 00:30:56.083822440 +0200
+@@ -340,7 +340,7 @@
+ 		bytepos_timecode ( bytes_output, current_SCR);
+ 		break;
+ 
+-		default:
++		default: ;
+ 	}
+ 
+ }