Minor changes

Package-Manager: portage-2.0.53_rc7

3 files changed, 40 insertions, 30 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index dc197dd86cf9..19d3e4a47c7b 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.331 2005/11/06 23:23:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.332 2005/12/03 09:30:02 lu_zero Exp $
+
+  03 Dec 2005; Luca Barbato <lu_zero@gentoo.org> mplayer-1.0_pre7-r1.ebuild:
+  livecd and bindist support, minor changes overall
 
   01 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
   -files/mplayer-1.0_pre6-codecs.patch,
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index 42448636dd49..2039bceda93e 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -1,12 +1,12 @@
-MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
-MD5 b4ae569a508d2078007f8eb2e0f8fea9 mplayer-1.0_pre7-r1.ebuild 16018
-MD5 07a692e8625d9a1cb9b70bab429d6e6a ChangeLog 61518
-MD5 c08980a7e7ffcb5793e929cf25cf349e files/mplayer-1.0_pre7-gcc_detection.patch 788
-MD5 3d94fd5886df3b60fe2606c4dee9d1dd files/mplayer-1.0_pre7-gcc4.patch 6412
-MD5 995f560631c6874f08bf6cc9ae01fb08 files/mplayer.desktop 794
-MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
-MD5 9c52b8b6d2256cc936201aad760823c6 files/mplayer-1.0_pre7-gcc4-amd64.patch 2521
+MD5 23c0691ef4e618e913bf0dbfa552f109 ChangeLog 61648
 MD5 bdc2a05b83ca16773f288d75afe99b33 files/digest-mplayer-1.0_pre7-r1 432
 MD5 2328e907ec169e2fa3f930e2bb38dc21 files/mmst_fix_20050415.diff 630
-MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634
+MD5 9c52b8b6d2256cc936201aad760823c6 files/mplayer-1.0_pre7-gcc4-amd64.patch 2521
+MD5 3d94fd5886df3b60fe2606c4dee9d1dd files/mplayer-1.0_pre7-gcc4.patch 6412
+MD5 c08980a7e7ffcb5793e929cf25cf349e files/mplayer-1.0_pre7-gcc_detection.patch 788
 MD5 0ea2e07703fc2105a7f3d265106e9b1f files/mplayer-1.0_pre7-ppc64.patch 353
+MD5 38c7908ce49f7f6a272993ba5bc9dd09 files/mplayer-mythtv.patch 13755
+MD5 995f560631c6874f08bf6cc9ae01fb08 files/mplayer.desktop 794
+MD5 1dc7b4b16903461c2ea8663d5dfc5795 files/rtsp_fix_20050415.diff 634
+MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
+MD5 21d599fe76890a54d926d1f08ee54ed9 mplayer-1.0_pre7-r1.ebuild 16099
diff --git a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
index be7ce92e1a69..2e3011b3ab5f 100644
--- a/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
+++ b/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.12 2005/11/06 23:23:32 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_pre7-r1.ebuild,v 1.13 2005/12/03 09:30:02 lu_zero Exp $
 
 inherit eutils flag-o-matic
 
 RESTRICT="nostrip"
-IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl cpudetection
-custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv
+IUSE="3dfx 3dnow 3dnowext aac aalib alsa altivec arts bidi bl bindist
+cpudetection custom-cflags debug dga doc dts dvb cdparanoia directfb dvd dv
 dvdread edl encode esd fbcon gif ggi gtk i8x0 ipv6 jack joystick jpeg libcaca
-lirc live lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia vorbis opengl
-oss png real rtc samba sdl sse sse2 svga tga theora truetype v4l v4l2
-win32codecs X xanim xinerama xmms xv xvid xvmc"
+lirc live livecd lzo mad matroska matrox mmx mmxext mythtv nas nls nvidia
+vorbis opengl oss png real rtc samba sdl sse sse2 svga tga theora truetype
+v4l v4l2 win32codecs X xanim xinerama xmms xv xvid xvmc"
 
 BLUV=1.4
 SVGV=1.9.17
@@ -198,25 +198,18 @@ src_compile() {
 		export LINGUAS="en ${LINGUAS}"
 	fi
 
-	if use custom-cflags ; then
-	# let's play the filtration game!  MPlayer hates on all!
-	strip-flags
 
-	# ugly optimizations cause MPlayer to cry on x86 systems!
-	if use x86 ; then
-		replace-flags -O0 -O2
-		replace-flags -O3 -O2
-		filter-flags -fPIC -fPIE
-	fi
-	else
-	unset CFLAGS CXXFLAGS
-	fi
+
 	#FIXME make it work in the snapshot
 	local myconf="--disable-x264"
 	################
 	#Optional features#
 	###############
-	myconf="${myconf} $(use_enable cpudetection runtime-cpudetection)"
+	if use cpudetection || use livecd || use bindist
+	then
+	myconf="${myconf} --enable-runtime-cpudetection"
+	fi
+
 	myconf="${myconf} $(use_enable bidi fribidi)"
 	myconf="${myconf} $(use_enable cdparanoia)"
 	if use dvd; then
@@ -414,7 +407,21 @@ src_compile() {
 	# it *will* be removed asap; in the meantime, doesn't hurt anything.
 	echo "${myconf}" > ${T}/configure-options
 
-	./configure \
+	if use custom-cflags
+	then
+	# let's play the filtration game!  MPlayer hates on all!
+	strip-flags
+	# ugly optimizations cause MPlayer to cry on x86 systems!
+		if use x86 ; then
+			replace-flags -O0 -O2
+			replace-flags -O3 -O2
+			filter-flags -fPIC -fPIE
+		fi
+	else
+	unset CFLAGS CXXFLAGS
+	fi
+
+	CFLAGS="$CFLAGS" ./configure \
 		--prefix=/usr \
 		--confdir=/usr/share/mplayer \
 		--datadir=/usr/share/mplayer \