adding cc2 fix

4 files changed, 46 insertions, 11 deletions

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index 75a18e82174a..84afc40f4c35 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,13 +1,12 @@
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 df275a0189f9c36f2c9cbcf90788187e avidemux-2.0.14.ebuild 2045
 MD5 7c65ce7f366fbee86def6c81706adec0 avidemux-0.9-r1.ebuild 2003
-MD5 d3b45f0b1bb824a42d817e2ce5940cf9 ChangeLog 6533
-MD5 b27f1b69ff66012a499976a554c9d905 avidemux-2.0.16.ebuild 2578
-MD5 4973215472281d2ec01528cc9e62a720 avidemux-2.0.18.ebuild 2369
+MD5 62238fc1cd6683eb2f532a960e6e7952 ChangeLog 6673
+MD5 b90e9852eb9a69bf98340e82d8525c92 avidemux-2.0.16.ebuild 2646
+MD5 936225b04bd4c92f8b2ab32c5d81afc1 avidemux-2.0.18.ebuild 2345
+MD5 bc99c120921cdbc84402a1ac014f0786 files/gcc2.patch 1044
 MD5 09aa754d6dec1bcd2694695ed63b45a4 files/avidemux-0.9-libxml2.5.7.patch 717
 MD5 e2ad26556058864a7ca0eb97a34b5471 files/avidemux-2.0.16-ppc-configure.patch 926
 MD5 6be6f74f2af672e3571d3a450af4aeb3 files/digest-avidemux-0.9-r1 62
-MD5 c2b50d20293e7d36d39cd277502b2cc8 files/digest-avidemux-2.0.14 68
 MD5 d3a15e32d4fc018661893e1f28337b1d files/digest-avidemux-2.0.16 68
 MD5 17fbb9e32a12d47d86a3f135c74da118 files/patch_jpeg.diff 1819
 MD5 7f9945862f4c68c59549897fe020eb2c files/digest-avidemux-2.0.18 68
diff --git a/media-video/avidemux/avidemux-2.0.16.ebuild b/media-video/avidemux/avidemux-2.0.16.ebuild
index 3859d1db04b4..aced1b544ea1 100644
--- a/media-video/avidemux/avidemux-2.0.16.ebuild
+++ b/media-video/avidemux/avidemux-2.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.16.ebuild,v 1.3 2003/11/02 17:21:40 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.16.ebuild,v 1.4 2003/11/02 18:28:22 mholzer Exp $
 
 IUSE="debug nls oggvorbis arts truetype alsa"
 filter-flags "-funroll-loops"
@@ -47,6 +47,8 @@ src_compile() {
 	# Fixes a save/jpeg - bug
 	cd ${S}/avidemux; epatch ${FILESDIR}/patch_jpeg.diff; cd ${S}
 
+	cd ${S}/avidemux/mpeg2enc; epatch ${FILESDIR}/gcc2.patch; cd ${S}
+
 	export WANT_AUTOCONF_2_5=1
 	autoconf
 
diff --git a/media-video/avidemux/avidemux-2.0.18.ebuild b/media-video/avidemux/avidemux-2.0.18.ebuild
index 93ca5b615f72..0080f34f81e8 100644
--- a/media-video/avidemux/avidemux-2.0.18.ebuild
+++ b/media-video/avidemux/avidemux-2.0.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.18.ebuild,v 1.2 2003/11/01 17:32:17 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avidemux/avidemux-2.0.18.ebuild,v 1.3 2003/11/02 18:28:22 mholzer Exp $
 
 IUSE="debug nls oggvorbis arts truetype alsa"
 filter-flags "-funroll-loops"
@@ -41,15 +41,14 @@ src_compile() {
 	# Fixes a possible automake error due to clock skew
 	touch -r *
 
+	cd ${S}/avidemux/mpeg2enc; epatch ${FILESDIR}/gcc2.patch; cd ${S}
+
 	export WANT_AUTOCONF_2_5=1
 	autoconf
 
 	# invalid cast
 	use ppc \
-		&& cd avidemux/ADM_video/ \
-		&& sed -e '188s/const//g' ADM_vidFont.cpp > ADM_vidFont.cpp.new \
-		&& mv ADM_vidFont.cpp.new ADM_vidFont.cpp \
-		&& cd ../..
+		&& sed -i -e '188s/const//g' avidemux/ADM_video/ADM_vidFont.cpp
 
 	local myconf
 	myconf="--with-gnu-ld --disable-warnings"
diff --git a/media-video/avidemux/files/gcc2.patch b/media-video/avidemux/files/gcc2.patch
new file mode 100644
index 000000000000..ca14dead659b
--- /dev/null
+++ b/media-video/avidemux/files/gcc2.patch
@@ -0,0 +1,35 @@
+? gcc2.patch
+? synchrolib.lo
+? xx.c
+Index: synchrolib.cc
+===================================================================
+RCS file: 
+/cvsroot/avidemux2/avidemux2/avidemux2/avidemux/mpeg2enc/synchrolib.cc,v
+retrieving revision 1.1.1.1
+diff -u -r1.1.1.1 synchrolib.cc
+--- synchrolib.cc	16 Sep 2003 18:02:26 -0000	1.1.1.1
++++ synchrolib.cc	2 Nov 2003 17:49:00 -0000
+@@ -34,7 +34,7 @@
+  *		  Synchronisation primitives
+  *
+  ********/
+-
++#if 0
+ void sync_guard_init( sync_guard_t *guard, int init )
+ {
+ #ifdef __linux__
+@@ -111,3 +111,12 @@
+ 	pthread_cond_broadcast( &sema->raised );
+ 	pthread_mutex_unlock( &sema->mutex );
+ }
++#else
++void mp_semaphore_wait( mp_semaphore_t *sema) {}
++void mp_semaphore_signal( mp_semaphore_t *sema, int count ) {}
++void mp_semaphore_set( mp_semaphore_t *sema ) {}
++void mp_semaphore_init( mp_semaphore_t *sema, int init_count ) {}
++void sync_guard_init( sync_guard_t *guard, int init ) {}
++void sync_guard_test( sync_guard_t *guard) {}
++void sync_guard_update( sync_guard_t *guard, int predicate ) {}
++#endif
+
+