Change nvidia, i8x0 and cle266 useflags to VIDEO_CARDS values (nvidia, i810 and via), so that setting that variable is enough to get the right version of xvmc (or the wrapper if more than one value is present). Add warning about inability to play mp3s with -mad. Remove elibtoolize after eautoreconf, that is already took care by autotools.

Package-Manager: portage-2.1_pre4-r1

3 files changed, 46 insertions, 29 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 67a47a897785..8fb7431300bf 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.308 2006/01/29 13:45:34 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.309 2006/02/04 10:57:12 flameeyes Exp $
+
+  04 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xine-lib-1.1.1-r4.ebuild:
+  Change nvidia, i8x0 and cle266 useflags to VIDEO_CARDS values (nvidia, i810
+  and via), so that setting that variable is enough to get the right version
+  of xvmc (or the wrapper if more than one value is present). Add warning
+  about inability to play mp3s with -mad. Remove elibtoolize after
+  eautoreconf, that is already took care by autotools.
 
   29 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   -files/CVE-2005-4048.patch, -files/xine-lib-formatstring.patch,
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 9af15e5d1190..6d392c373271 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 65b5d955ff88c2a7a68e27b957dfffba ChangeLog 23265
-RMD160 c7b2f549405e6aa228bbcc7b8d21f18bb9dbf959 ChangeLog 23265
-SHA256 76b48750cfad6cad67f94922e118e2624f87aac66da7ed85672e2fec4fb4cb96 ChangeLog 23265
+MD5 c73320a1525a3c1de150966667552a1a ChangeLog 23698
+RMD160 9ce1231088553c80abe75c25b617473d913eff5c ChangeLog 23698
+SHA256 15510c99b588ae60920ad2a334171a4873370c9640572b0a605ba8d170f2c60a ChangeLog 23698
 MD5 4a70a1198dbbc1b64b20071aacdee503 files/digest-xine-lib-1.1.1-r3 138
 RMD160 58a9ed42c2a8800b52a54810e73472fad33f23d2 files/digest-xine-lib-1.1.1-r3 138
 SHA256 c7e3bb0f349b3ce5f05541400a85c74ad5c66107d357719146061c344ae98e88 files/digest-xine-lib-1.1.1-r3 138
@@ -16,13 +16,13 @@ SHA256 b36ce82ff9c321a5ed63eded0c3a191e78752cd38220b86bd8639a0d70ac9d92 metadata
 MD5 578712f99de216da48aefcc69567dcf1 xine-lib-1.1.1-r3.ebuild 7232
 RMD160 6a7024dedd3646e054cbe2731af58eed8013e9bd xine-lib-1.1.1-r3.ebuild 7232
 SHA256 1a281ed1ce771661ae909ecfe5de3e83e8fe5be6b93ed1ebc07b59227301cc25 xine-lib-1.1.1-r3.ebuild 7232
-MD5 b739528d44f50e3dcfedc2c0bc449517 xine-lib-1.1.1-r4.ebuild 7273
-RMD160 9f272897899b944d53fa276605234efc7ab8f409 xine-lib-1.1.1-r4.ebuild 7273
-SHA256 a6b0d300499895fa328193ffe1cb146030fda9d3789e1aa0739140a334cdff3b xine-lib-1.1.1-r4.ebuild 7273
+MD5 5676c1effc94217a683c48b6781b9d09 xine-lib-1.1.1-r4.ebuild 7643
+RMD160 1d382382bb6eb8a0cb631155247c474ace7a9513 xine-lib-1.1.1-r4.ebuild 7643
+SHA256 ae70559eb12fb6e7b926fafc2549030e657b36353073d13ffe904975e7e7ffb9 xine-lib-1.1.1-r4.ebuild 7643
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD3McNAiZjviIA2XgRAlabAJ9A5qJnDgz3VGvUMDNxBG9cXjg8rwCg2W/r
-b6r2boVFqTQdso8pZbLeLY0=
-=teke
+iD8DBQFD5IifAiZjviIA2XgRAvpgAKDeukgLUFCwkmyqFj5oPPapfBz8lQCg7kIM
+kXa5McR19Rwa5VuavMm5mx8=
+=GREo
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.1.1-r4.ebuild b/media-libs/xine-lib/xine-lib-1.1.1-r4.ebuild
index af0c3bfc14b2..3f612a419173 100644
--- a/media-libs/xine-lib/xine-lib-1.1.1-r4.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.1-r4.ebuild,v 1.7 2006/01/14 05:43:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.1-r4.ebuild,v 1.8 2006/02/04 10:57:12 flameeyes Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -18,10 +18,13 @@ SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="1"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="aalib libcaca arts cle266 esd win32codecs nls dvd X directfb vorbis alsa
-gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc nvidia i8x0
+
+IUSE_VIDEO_CARDS="video_cards_nvidia video_cards_via video_cards_i810"
+
+IUSE="aalib libcaca arts esd win32codecs nls dvd X directfb vorbis alsa
+gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc
 samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts asf
-ffmpeg debug modplug"
+ffmpeg debug modplug ${IUSE_VIDEO_CARDS}"
 
 RDEPEND="vorbis? ( media-libs/libvorbis )
 	X? ( || ( (
@@ -31,9 +34,10 @@ RDEPEND="vorbis? ( media-libs/libvorbis )
 	xv? ( || ( x11-libs/libXv virtual/x11 ) )
 	xvmc? (
 		|| ( x11-libs/libXvMC virtual/x11 )
-		nvidia? ( media-video/nvidia-glx )
-		cle266? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
-		i8x0? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) ) )
+		video_cards_nvidia? ( media-video/nvidia-glx )
+		video_cards_via? ( || ( x11-drivers/xf86-video-via virtual/x11 ) )
+		video_cards_i810? ( || ( x11-drivers/xf86-video-i810 virtual/x11 ) )
+	)
 	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
 	win32codecs? ( >=media-libs/win32codecs-0.50 )
 	esd? ( media-sound/esound )
@@ -75,9 +79,6 @@ DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	nls? ( sys-devel/gettext )"
 
-#	>=sys-devel/automake-1.7
-#	>=sys-devel/autoconf-2.59
-
 S=${WORKDIR}/${MY_P}
 
 src_unpack() {
@@ -87,7 +88,6 @@ src_unpack() {
 	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches
 
 	AT_M4DIR="m4" eautoreconf
-	elibtoolize
 }
 
 # check for the X11 path for a given library
@@ -137,28 +137,29 @@ src_compile() {
 		myconf="${myconf} --disable-xvmc"
 	else
 		count="0"
-		if use nvidia; then
+		if use video_cards_nvidia; then
 			count="`expr ${count} + 1`"
 			xvmclib="XvMCNVIDIA"
 		fi
 
-		if use i8x0; then
+		if use video_cards_i810; then
 			count="`expr ${count} + 1`"
 			xvmclib="I810XvMC"
 		fi
 
-		if use cle266; then
+		if use video_cards_via; then
 			count="`expr ${count} + 1`"
 			xvmclib="viaXvMC"
 		fi
 
 		if [[ "${count}" -gt "1" ]]; then
 			eerror "Invalid combination of USE flags"
-			eerror "When building support for xvmc, you may only include support for one video card:"
-			eerror "   nvidia, i8x0, cle266"
+			eerror "When building support for xvmc, you may only include support"
+			eerror "for none or one of the following VIDEO_CARDS:"
 			eerror ""
-			eerror "XvMC support will not be built."
-			myconf="${myconf} --disable-xvmc"
+			eerror "nvidia i810 via"
+			eerror ""
+			eerror "XvMC support will try to link against libXvMCW."
 		elif [[ -n "${xvmclib}" ]]; then
 			xvmcconf="--with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
 			xvmcdir=$(get_x11_dir libXvMC.so)
@@ -244,7 +245,15 @@ pkg_postinst() {
 		einfo "You choose to build win32codecs support but disabled ASF"
 		einfo "demuxer. This way you'll have support for win32codecs in"
 		einfo "formats like AVI or Matroska, but not in WMV/WMA files."
-		einfo
+		einfo ""
 		einfo "To be able to play WMV/WMA files, please add asf useflag."
 	fi
+
+	if ! use mad; then
+		einfo "MAD decoding library is disabled."
+		einfo "This mean that playing mp3 will not be possible with xine-lib"
+		einfo "based players. amaroK will crash trying to."
+		einfo ""
+		einfo "To be able to play mp3 files, please add mad useflag."
+	fi
 }