Recreated sparc patch. Readded to ~amd64 and ~sparc. Closes bug #66422.

5 files changed, 59 insertions, 18 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 1fa52a6bd787..72792e5246bb 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.75 2004/10/06 19:57:31 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.76 2004/10/06 22:04:33 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/avifile-0.7.41.20041001-sparc.patch,
+  avifile-0.7.41.20041001.ebuild:
+  Recreated sparc patch.  Readded to ~amd64 and ~sparc.  Closes bug #66422.
 
   06 Oct 2004; Patrick Kursawe <phosphan@gentoo.org> files/throw.patch:
   Patch was broken (bug #64893)
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index f0642917eaf0..aadddec3cf51 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,20 +1,31 @@
-MD5 6d85afc659f23bb2adcebd144400833d avifile-0.7.38.20030710.ebuild 4488
-MD5 b80546f1e5f52f38abec15e91478e999 avifile-0.7.38.20030710-r1.ebuild 4008
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 8ce46fee9d0777836c4094372d1f089f ChangeLog 13307
 MD5 ab24ec7446ec73e983a093e98b7f99df avifile-0.7.32.20030219.ebuild 4062
-MD5 fec7c1e27e580aa686cb628011d0dc67 avifile-0.7.41.20041001.ebuild 3732
-MD5 12a9c52bb1140a0292fa29449350b66a ChangeLog 13091
-MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
 MD5 f003a1fc700f9a79cf12c06d2ac3bedd avifile-0.7.37.20030522-r2.ebuild 4432
+MD5 6d85afc659f23bb2adcebd144400833d avifile-0.7.38.20030710.ebuild 4488
+MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
+MD5 b80546f1e5f52f38abec15e91478e999 avifile-0.7.38.20030710-r1.ebuild 4008
+MD5 406caaf7f06fce66335fcc20cb259181 avifile-0.7.41.20041001.ebuild 3798
 MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
-MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73
-MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
 MD5 7a55e6cb72df715c9b822505d5b4b8b0 files/avifile-0.7.38.20030710-2.6.patch 2038
 MD5 624ac61f6a4fb9ed9700a7496f2827cb files/avifile-0.7.38.20030710-amd64.patch 466
-MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
-MD5 cfc5acc6aea0cf9e0572338125204b1f files/throw.patch 6925
-MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
-MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
 MD5 769b5c63369a3c1bc5b74abe591731fd files/avifile-0.7.38.20030710-sparc.patch 998
-MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001 71
-MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71
 MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
+MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
+MD5 88eda2a3289907201d524c557bd8a753 files/digest-avifile-0.7.32.20030219 73
+MD5 c1a25bfd2234206e97e7b744c39c0d06 files/digest-avifile-0.7.37.20030522-r2 73
+MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710 71
+MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
+MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
+MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001 71
+MD5 cfc5acc6aea0cf9e0572338125204b1f files/throw.patch 6925
+MD5 d0f665d4394d9d9a59c9a5dadeb09882 files/avifile-0.7.41.20041001-sparc.patch 1262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBZGv8ArHZZzCEUG0RArkFAJ9zyR8NRE+JF39zYrU5PYUcsX7j0gCeOQTb
+ukc4LUSSjnMih8t8d/EUUAI=
+=K46O
+-----END PGP SIGNATURE-----
diff --git a/media-video/avifile/avifile-0.7.41.20041001.ebuild b/media-video/avifile/avifile-0.7.41.20041001.ebuild
index edfdc6af64a6..eadfd1b27ce7 100644
--- a/media-video/avifile/avifile-0.7.41.20041001.ebuild
+++ b/media-video/avifile/avifile-0.7.41.20041001.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001.ebuild,v 1.3 2004/10/06 09:53:12 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.41.20041001.ebuild,v 1.4 2004/10/06 22:04:33 eradicator Exp $
 
 inherit eutils flag-o-matic
 
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~x86 ~alpha ~ia64"
+KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
 IUSE="3dnow X alsa avi debug dvd esd mmx oggvorbis qt sdl sse static truetype xv zlib"
 
 DEPEND=">=media-libs/jpeg-6b
@@ -46,6 +46,7 @@ src_unpack() {
 	# make sure pkgconfig file is correct #53183
 	cd ${S}
 	epatch ${FILESDIR}/throw.patch
+	use sparc && epatch ${FILESDIR}/${P}-sparc.patch
 	rm -f avifile.pc
 	sed -i "/^includedir=/s:avifile$:avifile-${PV:0:3}:" avifile.pc.in
 }
diff --git a/media-video/avifile/files/avifile-0.7.41.20041001-sparc.patch b/media-video/avifile/files/avifile-0.7.41.20041001-sparc.patch
new file mode 100644
index 000000000000..1fae0b0016b2
--- /dev/null
+++ b/media-video/avifile/files/avifile-0.7.41.20041001-sparc.patch
@@ -0,0 +1,24 @@
+diff -Naur avifile-0.7-0.7.41.orig/ffmpeg/libavcodec/libpostproc/Makefile.am avifile-0.7-0.7.41/ffmpeg/libavcodec/libpostproc/Makefile.am
+--- avifile-0.7-0.7.41.orig/ffmpeg/libavcodec/libpostproc/Makefile.am	2004-05-27 01:30:28.000000000 -0700
++++ avifile-0.7-0.7.41/ffmpeg/libavcodec/libpostproc/Makefile.am	2004-10-06 14:42:28.060324512 -0700
+@@ -11,7 +11,7 @@
+ libpostproc_la_SOURCES = postprocess.c
+ 
+ AM_CPPFLAGS = $(LTNOPIC) -DHAVE_AV_CONFIG_H $(FFMPEG_CFLAGS) -I$(srcdir)/..
+-AM_CFLAGS = -O2 -fomit-frame-pointer -mno-omit-leaf-frame-pointer
++AM_CFLAGS = -O2
+ 
+ CLEANFILES = .depend *.a
+ MAINTAINERCLEANFILES = Makefile.in
+diff -Naur avifile-0.7-0.7.41.orig/ffmpeg/libavcodec/libpostproc/Makefile.in avifile-0.7-0.7.41/ffmpeg/libavcodec/libpostproc/Makefile.in
+--- avifile-0.7-0.7.41.orig/ffmpeg/libavcodec/libpostproc/Makefile.in	2004-10-01 06:45:42.000000000 -0700
++++ avifile-0.7-0.7.41/ffmpeg/libavcodec/libpostproc/Makefile.in	2004-10-06 14:42:42.201985818 -0700
+@@ -152,7 +152,7 @@
+ libpostproc_la_SOURCES = postprocess.c
+ 
+ AM_CPPFLAGS = $(LTNOPIC) -DHAVE_AV_CONFIG_H $(FFMPEG_CFLAGS) -I$(srcdir)/..
+-AM_CFLAGS = -O2 -fomit-frame-pointer -mno-omit-leaf-frame-pointer
++AM_CFLAGS = -O2
+ 
+ CLEANFILES = .depend *.a
+ MAINTAINERCLEANFILES = Makefile.in
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 636d77709b49..54079604b13d 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,8 +1,8 @@
 MD5 0a8041245341c3be58375818d48f55ee mplayer-1.0_pre5-r4.ebuild 15157
-MD5 da79cc683aed4f6a967d7f894813b38b ChangeLog 39210
+MD5 cd8e59cc7cfbf5fcd4371765cad1109d ChangeLog 39311
 MD5 31018765c8c65a239dba78a98c405543 metadata.xml 224
 MD5 a85740a291e190516009abeccd91c6f7 mplayer-1.0_pre4-r7.ebuild 12611
-MD5 ae8197c15642912b462bb9184975bc42 mplayer-1.0_pre5-r3.ebuild 15472
+MD5 5a98ea58b1403ec6475c6eddf4d0a390 mplayer-1.0_pre5-r3.ebuild 15459
 MD5 42e71d724dca61a5ebe33d0c347f4e4f mplayer-1.0_pre5-r2.ebuild 14285
 MD5 e614f6546020b77ced4ba12c36e5b51e files/strl.c 950
 MD5 5c931dfafbd010eab985c7f427e2cb8b files/mplayer-1.0_pre5-configure.patch 1281