Cleaned up useflags and sdl compilation on amd64.

Package-Manager: portage-2.0.51.19

4 files changed, 54 insertions, 27 deletions

diff --git a/media-video/avifile/ChangeLog b/media-video/avifile/ChangeLog
index 9d3cc9a318a1..dd2a64a577ae 100644
--- a/media-video/avifile/ChangeLog
+++ b/media-video/avifile/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/avifile
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.98 2005/04/15 03:37:46 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/ChangeLog,v 1.99 2005/04/18 00:15:15 flameeyes Exp $
+
+  18 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/avifile-0.7.43.20050224-sdllibs.patch,
+  avifile-0.7.43.20050224-r1.ebuild:
+  Added win32codecs useflag (which allows to disable win32codecs support
+  instead of harddepend it on x86 systems). Renamed oggvorbis flag into
+  vorbis. Renamed dvd flag into a52 (it enables a52 support in avi files, not
+  in dvds, anyway). Used mad useflag in use_enable libmad. Remove dependency
+  on sed-4 (in system now). Added a patch to fix compilation of sdl support on
+  amd64 (at least). Fixed disabling of sdl with useflag. Removed x86
+  conditional on divx4linux as it's usemasked out of x86.
 
   15 Apr 2005; Stephen P. Becker <geoman@gentoo.org>
   avifile-0.7.41.20041001-r1.ebuild:
diff --git a/media-video/avifile/Manifest b/media-video/avifile/Manifest
index 9464140fe081..4dd4f2c69e0c 100644
--- a/media-video/avifile/Manifest
+++ b/media-video/avifile/Manifest
@@ -1,21 +1,22 @@
-MD5 85bae951b6afcb791e94c005ea0ca85e avifile-0.7.41.20041001-r2.ebuild 4601
-MD5 50a12239d67a181d5a81b478e6445a66 avifile-0.7.43.20050224-r1.ebuild 4465
+MD5 6f1226028e046693cbb64a2e505c21f9 ChangeLog 18969
 MD5 ead70f1fd6fc60afbc07ad1ea49576a7 avifile-0.7.38.20030710-r1.ebuild 4005
 MD5 87aed7721dcd888c80b219218c704004 avifile-0.7.41.20041001-r1.ebuild 4620
-MD5 4428678b3dd76bdde4910ecd31f82c54 ChangeLog 18321
+MD5 85bae951b6afcb791e94c005ea0ca85e avifile-0.7.41.20041001-r2.ebuild 4601
+MD5 c20f2f5fc6bbd34392f37342fa77a39d avifile-0.7.43.20050224-r1.ebuild 4493
 MD5 76b95bd390c69f39e5e7b028b3ff69a5 metadata.xml 272
 MD5 8390bf9de24635d667a5724c2cc0cbe9 files/avifile-0.7.37.20030522-divx.patch 11943
-MD5 6eb792de0d30abfb680655dcdec8b15c files/avifile-0.7.43.20050224-sysffmpeg.patch 14435
 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 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
-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 37a0170a523a26fd8a8c576c498b3641 files/avifile-0.7.41.20041001-gcc2.patch 1006
+MD5 6eb792de0d30abfb680655dcdec8b15c files/avifile-0.7.43.20050224-sysffmpeg.patch 14435
 MD5 69d7c84947a5ea083f25e43fdacc126e files/avifile-gcc34.patch 5795
-MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r1 72
+MD5 7eacd7dae7ab4a551b208173ec54215e files/avifile-mad.patch 1582
+MD5 f2e5938361909893d37d1ce0b80fdbfc files/avifile-x86-gcc34.patch 5247
+MD5 21e60c1838b04fa1990fe5538569ac4b files/digest-avifile-0.7.38.20030710-r1 71
 MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r1 71
 MD5 f19f862b147fa314ed83d4b78e661a5d files/digest-avifile-0.7.41.20041001-r2 71
-MD5 7eacd7dae7ab4a551b208173ec54215e files/avifile-mad.patch 1582
+MD5 3eca07dd543790b26539e1c1755d4fde files/digest-avifile-0.7.43.20050224-r1 72
+MD5 5c7a3ea4957036aa1da3db9880a3ed34 files/flvenc-patch 558
+MD5 c5840e80e1a70f6b5ce25679e53f2dcb files/throw.patch 7396
+MD5 6cab3d2acc1d30f101f100f9549613d8 files/avifile-0.7.43.20050224-sdllibs.patch 569
diff --git a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
index 1bfbdceec091..fe0a9ef53192 100644
--- a/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
+++ b/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.1 2005/03/26 04:27:13 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/avifile/avifile-0.7.43.20050224-r1.ebuild,v 1.2 2005/04/18 00:15:15 flameeyes Exp $
 
 inherit eutils flag-o-matic
 
@@ -17,19 +17,19 @@ LICENSE="GPL-2"
 SLOT="0.7"
 
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~sparc ~x86"
-IUSE="3dnow X alsa debug divx4linux dmalloc dpms dvd encode esd mad matrox
-mmx oggvorbis oss qt sblive sdl sse truetype v4l vidix xinerama xv xvid zlib"
+IUSE="3dnow X alsa debug divx4linux dmalloc dpms a52 encode esd mad matrox
+mmx vorbis oss qt sblive sdl sse truetype v4l vidix win32codecs xinerama xv xvid
+zlib"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
-	x86? ( >=media-libs/win32codecs-0.90 )
-	alsa? ( virtual/alsa )
-	divx4linux? ( x86? ( >=media-libs/divx4linux-20030428 ) )
+	win32codecs? ( >=media-libs/win32codecs-0.90 )
+	divx4linux? ( >=media-libs/divx4linux-20030428 )
 	dmalloc? ( !amd64? ( !arm? ( !mips? ( dev-libs/dmalloc ) ) ) )
-	dvd? ( >=media-libs/a52dec-0.7 )
+	a52? ( >=media-libs/a52dec-0.7 )
 	encode? ( >=media-sound/lame-3.90 )
 	esd? ( >=media-sound/esound-0.2.28 )
 	mad? ( media-libs/libmad )
-	oggvorbis? ( >=media-libs/libvorbis-1.0 )
+	vorbis? ( >=media-libs/libvorbis-1.0 )
 	qt? ( >=x11-libs/qt-3.0.3 )
 	sdl? ( >=media-libs/libsdl-1.2.2 )
 	truetype? ( >=media-libs/freetype-2.1 )
@@ -41,10 +41,11 @@ RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9.0_rc2 )
 	>=media-libs/jpeg-6b"
 
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
 	>=sys-devel/autoconf-2.59
 	>=sys-devel/automake-1.4_p6
 	sys-devel/libtool"
+#	v4l needs linux headers
+#	v4l? ( virtual/os-headers )
 
 src_unpack() {
 	unpack ${A}
@@ -53,8 +54,10 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-mad.patch
 
 	epatch ${FILESDIR}/avifile-0.7.43.20050224-sysffmpeg.patch
+	# removes sed-out of -L/usr/lib(64?) on sdl libs flags
+	epatch ${FILESDIR}/avifile-0.7.43.20050224-sdllibs.patch
 
-	if use !qt ; then
+	if ! use qt ; then
 		sed -i -e 's/qtvidcap\ qtrecompress//g' \
 		${S}/samples/Makefile.am || die "qt based sample test removal failed"
 	fi
@@ -107,17 +110,17 @@ src_compile() {
 	export FFMPEG_CFLAGS="${CFLAGS}"
 
 	econf \
-		$(use_enable x86 win32) \
+		$(use_enable win32codecs win32) \
 		$(use_with dmalloc dmallocth) \
-		$(use_enable dvd a52) $(use_enable dvd ffmpeg-a52) \
+		$(use_enable a52) $(use_enable a52 ffmpeg-a52) \
 		$(use_enable dpms) \
-		$(use_enable mad) $(use_enable libmad) \
+		$(use_enable mad) $(use_enable mad libmad) \
 		$(use_enable matrox mga) \
-		$(use_enable oggvorbis vorbis) $(use_enable oggvorbis oggtest) $(use_enable oggvorbis vorbistest) \
+		$(use_enable vorbis) \
 		$(use_enable oss) \
 		$(use_with qt) \
 		$(use_enable sblive ac3passthrough) \
-		$(use_enable sdl) $(use_enable sdl sdltest) \
+		$(use_with sdl) \
 		$(use_enable truetype freetype2) \
 		$(use_enable v4l) \
 		$(use_enable vidix) \
@@ -133,7 +136,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install || die
 
-	dodoc README INSTALL
+	dodoc README
 	cd doc
 	dodoc CREDITS EXCEPTIONS TODO VIDEO-PERFORMANCE WARNINGS KNOWN_BUGS
 }
diff --git a/media-video/avifile/files/avifile-0.7.43.20050224-sdllibs.patch b/media-video/avifile/files/avifile-0.7.43.20050224-sdllibs.patch
new file mode 100644
index 000000000000..56d2b4a107c3
--- /dev/null
+++ b/media-video/avifile/files/avifile-0.7.43.20050224-sdllibs.patch
@@ -0,0 +1,12 @@
+diff -ur avifile-0.7-0.7.43/m4/sdl.m4 avifile-0.7-0.7.43-fixed/m4/sdl.m4
+--- avifile-0.7-0.7.43/m4/sdl.m4	2004-02-18 21:54:39.000000000 +0100
++++ avifile-0.7-0.7.43-fixed/m4/sdl.m4	2005-04-18 01:04:22.831940176 +0200
+@@ -50,7 +50,7 @@
+     no_sdl=yes
+   else
+     SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags`
+-    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs | sed -e 's!-L/usr/lib[[^/]]!!g'`
++    SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs`
+ 
+     sdl_major_version=`$SDL_CONFIG $sdl_args --version | \
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`