bug #23563 - this patch addresses a compile problem on alpha

4 files changed, 40 insertions, 9 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 076af103f3bb..2ad1079921a4 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.16 2003/06/26 18:29:12 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.17 2003/07/02 18:13:25 raker Exp $
+
+  02 Jul 2003; Nick Hadaway <raker@gentoo.org> ffmpeg-0.4.7_pre20030624.ebuild,
+  files/alpha-idct.patch:
+  Addresses bug #23563.  This problem was fixed upstream in cvs.
+  Added a small patch.  
 
 *ffmpeg-0.4.7_pre20030624 (26 Jun 2003)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index e7c4931fd14e..3006aea6ea60 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -1,10 +1,11 @@
-MD5 57e0978ef4a4ff1662572740a8d94ed7 files/digest-ffmpeg-0.4.5 64
-MD5 566133b90b840d9da9452facbfef0d6e files/digest-ffmpeg-0.4.6 64
-MD5 566133b90b840d9da9452facbfef0d6e files/digest-ffmpeg-0.4.6-r1 64
-MD5 30ba42e8d259ef5fe8c439670f685c1f files/ffmpeg-0.4.6-Makefiles.diff 3429
-MD5 f139809ab74138dbf8f24bc4f89edbd8 files/digest-ffmpeg-0.4.7_pre20030624 74
+MD5 76048ad437a33265cf5c20efed9d6d5b ffmpeg-0.4.7_pre20030624.ebuild 2010
 MD5 2d75291c4685dc1a93c5e91901df57c0 ffmpeg-0.4.5.ebuild 693
 MD5 6c484228a17602440a3c7967e3eabd33 ffmpeg-0.4.6-r1.ebuild 1561
+MD5 7048dc3f1854ac5820697d883a10e275 ChangeLog 3180
 MD5 f25e86f18c90204cd2da37a3c131b829 ffmpeg-0.4.6.ebuild 1526
-MD5 653d55cb4641234a2eb00511ba7221a5 ChangeLog 2983
-MD5 96860f3c42d7c34aad7b36d895adfe05 ffmpeg-0.4.7_pre20030624.ebuild 1718
+MD5 566133b90b840d9da9452facbfef0d6e files/digest-ffmpeg-0.4.6-r1 64
+MD5 6f1d9c82b5e8c3b7c46b80bc3c1bb443 files/alpha-idct.patch 777
+MD5 f139809ab74138dbf8f24bc4f89edbd8 files/digest-ffmpeg-0.4.7_pre20030624 74
+MD5 30ba42e8d259ef5fe8c439670f685c1f files/ffmpeg-0.4.6-Makefiles.diff 3429
+MD5 57e0978ef4a4ff1662572740a8d94ed7 files/digest-ffmpeg-0.4.5 64
+MD5 566133b90b840d9da9452facbfef0d6e files/digest-ffmpeg-0.4.6 64
diff --git a/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild b/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild
index f22862d5dc98..78bb403ceb2e 100644
--- a/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild
+++ b/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild,v 1.1 2003/06/26 18:29:12 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.4.7_pre20030624.ebuild,v 1.2 2003/07/02 18:13:25 raker Exp $
+
+inherit eutils
 
 DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
 SRC_URI="mirror://gentoo/ffmpeg-cvs-2003-06-24.tar.gz"
@@ -28,6 +30,11 @@ S=${WORKDIR}/ffmpeg-cvs-2003-06-24
 src_unpack() {
 	unpack ${A} || die
 	cd ${S}
+
+	# fixes a compile on alpha.  This is fixed in upstream cvs
+	# http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/ffmpeg/ffmpeg/libavcodec/alpha/dsputil_alpha.c.diff?r1=1.19&r2=1.20
+	# so this patch should be removed with the next _pre build
+	epatch ${FILESDIR}/alpha-idct.patch
 }
 
 src_compile() {
diff --git a/media-video/ffmpeg/files/alpha-idct.patch b/media-video/ffmpeg/files/alpha-idct.patch
new file mode 100644
index 000000000000..120c9d780f80
--- /dev/null
+++ b/media-video/ffmpeg/files/alpha-idct.patch
@@ -0,0 +1,18 @@
+diff -urN ffmpeg-cvs-2003-06-24/libavcodec/alpha/dsputil_alpha.c ffmpeg-cvs-2003-06-24-modified/libavcodec/alpha/dsputil_alpha.c
+--- ffmpeg-cvs-2003-06-24/libavcodec/alpha/dsputil_alpha.c	2003-06-20 20:11:30.000000000 -0500
++++ ffmpeg-cvs-2003-06-24-modified/libavcodec/alpha/dsputil_alpha.c	2003-07-02 12:58:06.000000000 -0500
+@@ -20,6 +20,7 @@
+ #include "asm.h"
+ #include "../dsputil.h"
+ 
++extern void simple_idct_axp(DCTELEM *block);
+ extern void simple_idct_put_axp(uint8_t *dest, int line_size, DCTELEM *block);
+ extern void simple_idct_add_axp(uint8_t *dest, int line_size, DCTELEM *block);
+ 
+@@ -363,5 +364,5 @@
+     
+     c->idct_put = simple_idct_put_axp;
+     c->idct_add = simple_idct_add_axp;
+-    c->idct_idct = simple_idct_axp;
++    c->idct = simple_idct_axp;
+ }