Changed to allow compilation with gcc 3.4

5 files changed, 45 insertions, 7 deletions

diff --git a/media-video/lve/ChangeLog b/media-video/lve/ChangeLog
index b37780f4b1e2..4cfb3e240c9a 100644
--- a/media-video/lve/ChangeLog
+++ b/media-video/lve/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/lve
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lve/ChangeLog,v 1.5 2004/06/25 00:44:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lve/ChangeLog,v 1.6 2004/07/11 07:33:28 morfic Exp $
+
+  11 Jul 2004; Daniel Goller <morfic@gentoo.org> lve-040322.ebuild:
+  made a couple changes to the ebuild to allow compilation with gcc-3.4
 
   04 May 2004; Marc Hildebrand <zypher@gentoo.org> lve-040322.ebuild :
   Changed xfree dependency to virtual/x11
diff --git a/media-video/lve/Manifest b/media-video/lve/Manifest
index 3a71ac4f3ee3..700815209b07 100644
--- a/media-video/lve/Manifest
+++ b/media-video/lve/Manifest
@@ -1,6 +1,7 @@
-MD5 ad523b9fe811940bd008fad3875bb630 lve-040322.ebuild 1183
+MD5 677099c948032b6c986317d030bcf41d lve-040322.ebuild 1464
 MD5 4c5c80a9332cc0cb54faf9cbe92b1a26 ChangeLog 666
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 1fe99652576bdf83ed189fdf976d85ab files/digest-lve-040322 132
+MD5 f6a56b9b5742f37d30acfe66fe559962 files/digest-lve-040322 136
+MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 645ad6f9362f014e0574e74743244039 files/040322-qtlib.patch 262
 MD5 6ac2650d872e299e257254f743e18744 files/040322-lve.patch 405
diff --git a/media-video/lve/files/0.4.8-gcc3.4-magicF2W.patch b/media-video/lve/files/0.4.8-gcc3.4-magicF2W.patch
new file mode 100644
index 000000000000..d227610656c5
--- /dev/null
+++ b/media-video/lve/files/0.4.8-gcc3.4-magicF2W.patch
@@ -0,0 +1,18 @@
+--- libavcodec/liba52/resample_mmx.c	2004/05/01 14:38:45	1.1
++++ libavcodec/liba52/resample_mmx.c	2004/05/01 14:58:39
+@@ -7,10 +7,10 @@
+ 	and it would mean (C / MMX2 / MMX / 3DNOW) versions 
+ */
+ 
+-static uint64_t __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
+-static uint64_t __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
+-static uint64_t __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
+-static uint64_t __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
++static uint64_t __attribute__((used)) __attribute__((aligned(8))) magicF2W= 0x43c0000043c00000LL;
++static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1010= 0xFFFF0000FFFF0000LL;
++static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm0101= 0x0000FFFF0000FFFFLL;
++static uint64_t __attribute__((used)) __attribute__((aligned(8))) wm1100= 0xFFFFFFFF00000000LL;
+ 
+ static int a52_resample_MONO_to_5_MMX(float * _f, int16_t * s16){
+     int32_t * f = (int32_t *) _f;
+
diff --git a/media-video/lve/files/digest-lve-040322 b/media-video/lve/files/digest-lve-040322
index 37700b256c43..494a5bf75524 100644
--- a/media-video/lve/files/digest-lve-040322
+++ b/media-video/lve/files/digest-lve-040322
@@ -1,2 +1,2 @@
 MD5 079f976cee2b26a96caf3e4428c6456d lve-040322.src.tar.bz2 736414
-MD5 e00d47614ba1afd99ad2ea387e782dd9 ffmpeg-0.4.8.tar.gz 1352874
+MD5 24c6e9073699ccdb8119b2fcfd476bd2 ffmpeg-20040322.tar.bz2 1301977
diff --git a/media-video/lve/lve-040322.ebuild b/media-video/lve/lve-040322.ebuild
index 51c7007ac114..d1ca5b191b64 100644
--- a/media-video/lve/lve-040322.ebuild
+++ b/media-video/lve/lve-040322.ebuild
@@ -1,19 +1,21 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/lve/lve-040322.ebuild,v 1.5 2004/06/25 00:44:15 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/lve/lve-040322.ebuild,v 1.6 2004/07/11 07:33:28 morfic Exp $
 
-inherit eutils
+inherit eutils gcc
 
 # This is the version of ffmpeg lve must currently be compiled against
 FFMPEG="ffmpeg-0.4.8"
+PDATE=20${PV##*.}
 
 DESCRIPTION="Linux Video Editor"
 HOMEPAGE="http://lvempeg.sourceforge.net"
 SRC_URI="http://heanet.dl.sourceforge.net/sourceforge/lvempeg/lve-040322.src.tar.bz2
-http://heanet.dl.sourceforge.net/sourceforge/ffmpeg/ffmpeg-0.4.8.tar.gz"
+http://download.videolan.org/pub/videolan/vlc/0.7.1/contrib/ffmpeg-${PDATE}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
+IUSE=""
 KEYWORDS="~x86 ~ppc"
 DEPEND="virtual/x11
 	>=media-libs/libsdl-1.2.6-r3
@@ -28,6 +30,20 @@ src_unpack() {
 
 	# Patch to change LIB and BIN paths
 	epatch ${FILESDIR}/${PV}-lve.patch
+
+	cd ${WORKDIR}/lve
+
+	rm ffmpeg
+	ln -s ../ffmpeg-20040322 ffmpeg
+
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+	then
+		einfo "Compiler used: gcc-3.4.x Applying patch conditionally."
+		sed -i "s:(T_REGION \*):T_REGION \*:" src/region.c || die "Source couldnt be fixed"
+		cd ffmpeg
+		epatch ${FILESDIR}/0.4.8-gcc3.4-magicF2W.patch
+		cd ${WORKDIR}/lve
+	fi
 }
 
 src_compile() {