added conditional patch to allow compiling with gcc-3.4.0, closes bug 49383

4 files changed, 34 insertions, 4 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 10f46f82ec81..4897aad7e510 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.40 2004/06/25 00:40:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.41 2004/06/25 22:52:45 morfic Exp $
+
+  25 Jun 2004; Daniel Goller <morfic@gentoo.org> ffmpeg-0.4.8.20040322-r1.ebuild:
+    ffmpeg-0.4.8.20040322-r1.ebuild adding patch for gcc 3.4.x 
+    closes 49383
 
   24 Jun 2004; Martin Holzer <mholzer@gentoo.org>
   ffmpeg-0.4.8.20040322-r1.ebuild, ffmpeg-0.4.8.20040322.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 48fdde3e5a68..9c4460e64e6d 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,12 +1,13 @@
 MD5 6821f7a108f666b3ca90e0da116d6da9 ffmpeg-0.4.8.20040222.ebuild 3293
 MD5 97a64650fe712f4d1c08f0431e6722d7 ffmpeg-0.4.8.ebuild 2378
 MD5 289b32c48688b68cd6c1f3d4207fa277 ffmpeg-0.4.8.20040322.ebuild 3252
-MD5 5cc74329bc03dbd01a6fe2b704a38aa5 ffmpeg-0.4.8.20040322-r1.ebuild 3440
+MD5 499dfaf8d8b4ed4e3cc0713d4c36f71a ffmpeg-0.4.8.20040322-r1.ebuild 3719
 MD5 e6a8d208e04cf15aad1ad5935fb859e7 ffmpeg-0.4.7.ebuild 2172
 MD5 cc78a084922ad2ceead109dd29dfb3af ChangeLog 5976
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
 MD5 77014ea836fa26b88ebae7c85c912059 files/ffmpeg-0.4.7-2.6.patch 491
+MD5 003b0062185efcb0ea5a6115fa8a646a files/0.4.8-gcc3.4-magicF2W.patch 994
 MD5 d96905e9b38176623d31ad3cffbc63fd files/digest-ffmpeg-0.4.8.20040322-r1 69
 MD5 7eca667f050b6c515830ff9be05bacc6 files/digest-ffmpeg-0.4.7 65
 MD5 0a76b7a4442aea90d56ac85508b2eff5 files/digest-ffmpeg-0.4.8 65
diff --git a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
index 3b8e2ca6ddc6..68210b6c4de8 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild,v 1.6 2004/06/25 00:40:23 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.8.20040322-r1.ebuild,v 1.7 2004/06/25 22:52:45 morfic Exp $
 
-inherit eutils flag-o-matic
+inherit eutils flag-o-matic gcc
 
 # TODO: --enablea52bin breaks compile
 
@@ -36,6 +36,13 @@ src_unpack() {
 	# for some reason it tries to #include <X11/Xlib.h>,b ut doesn't use it
 	cd ${S}
 	sed -i s:\#define\ HAVE_X11:\#define\ HAVE_LINUX: ffplay.c
+
+    #this will allow ffmpeg to be compiled with gcc-3.4.x fixing bug #49383
+	if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]
+    then
+		einfo "Compiler used: gcc-3.4.x Applying patch conditionally."
+		epatch ${FILESDIR}/0.4.8-gcc3.4-magicF2W.patch
+	fi
 }
 
 src_compile() {
diff --git a/media-video/ffmpeg/files/0.4.8-gcc3.4-magicF2W.patch b/media-video/ffmpeg/files/0.4.8-gcc3.4-magicF2W.patch
new file mode 100644
index 000000000000..d227610656c5
--- /dev/null
+++ b/media-video/ffmpeg/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;
+