Update useflags to expose new features

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 55 insertions, 30 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index ac295364807f..f1acc8523ab3 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.34 2011/11/12 15:05:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.35 2011/11/14 02:05:00 lu_zero Exp $
+
+  13 Nov 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild,
+  metadata.xml:
+  Update useflags to expose new features
 
   12 Nov 2011; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild:
   Remove typo
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index da08b0eab8a1..119a1cb04748 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -8,6 +8,6 @@ EBUILD libav-0.6.9999.ebuild 7551 RMD160 b939f2a68e9bd9a7da4811c56432fba92c8e415
 EBUILD libav-0.7.2.ebuild 7997 RMD160 ffe4f995d2effccc27489b94589429684dab461f SHA1 a10ee4c1597be2f21715bda28718adf7bfa58118 SHA256 6f55a7e9e5e49767ff25740b29a5f61ced41f0eb518096e5dae9644bf02250db
 EBUILD libav-0.7.9999.ebuild 7947 RMD160 a67ea8d26ccffe866e4a3edc11076da4ad53d5e6 SHA1 d297581ec2cbb9e1a71199164f6107582d765686 SHA256 cb3fe767d8a836d758355daab4a20865d21cde3f8efd7480025d3b638ee5c9bd
 EBUILD libav-0.8_pre20110818.ebuild 8363 RMD160 819a6683c1a974e05423e90bc7b673c0efe69300 SHA1 d9d54bcf788aff84b612346d8061b729031cad1d SHA256 6592548fd9b633acfcae1686da5377743730c200b414fbb95574c6dd5ca5cd97
-EBUILD libav-9999.ebuild 8495 RMD160 6a32c7bffaf70824ff8bebde3a288bd7c05bfb20 SHA1 c93cd53fb2d203745e783127aae5e0d2f28aaeaf SHA256 5bbb2e15b685519466cfca3ee49c778377373d2e1c3a41c9dcb6db4f593ce1f0
-MISC ChangeLog 5436 RMD160 0799f8f509cbbb3e5f1ad892db73d361f1f3969d SHA1 97f8e54800181c82d4aa0abab12ba32ec6302758 SHA256 cf21f29c9bd24c4dd61bf7a8af355f6df72455613bae91bc30a9ff9b961e1add
-MISC metadata.xml 2343 RMD160 beadccfc0b455869a2810504ee185f622de04961 SHA1 421b87ca6c05fbde61a429dee1c90dcb88e7751a SHA256 daf4da36c94dbd7dd4e44dc643dda9420bafcec1824014ecdcb5c9067d5096b7
+EBUILD libav-9999.ebuild 8888 RMD160 5c37ee92d524538b492e89b13e9d5c44d5f6e26c SHA1 2a196fcedffd18e9c5da459bda2771b7b1102981 SHA256 1b4d7c34c592be7daad185032c8e63128996b5c27229ea4b16953877fa043444
+MISC ChangeLog 5562 RMD160 48a5cd0a2c3dddf7c8d6f17ba77fed0bd0787380 SHA1 f0712ee3f3b957c9aa4757adc973efe50d821a63 SHA256 fbb8716d8f01ac3c9e68c277a58418d8d1d549637f57ff16b1938e35c218ac94
+MISC metadata.xml 2980 RMD160 683fbf9c4aa2498dba7bd011423967eeff4448a7 SHA1 d15e5b733ee26eb4a31494546f0e602275b0d5d3 SHA256 9c246d686175ea1cb7fc11668298c374408f6f5ef16d0a858e3fa3f8989c7630
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index ed075b04cc59..33721d9830b0 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.20 2011/11/12 15:05:15 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.21 2011/11/14 02:05:00 lu_zero Exp $
 
 EAPI=4
 
@@ -27,22 +27,30 @@ SLOT="0"
 [[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64
 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~x64-solaris ~x86-solaris"
-IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cpudetection
+IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
 	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
-      +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss
-	  pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test
-	  theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib"
+      +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
+	  oss pic pulseaudio qt-faststart rtmp schroedinger sdl speex ssl +ssse3
+	  static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid
+	  +zlib"
 
 VIDEO_CARDS="nvidia"
 for x in ${VIDEO_CARDS}; do
 	IUSE="${IUSE} video_cards_${x}"
 done
 
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon iwmmxt"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
 RDEPEND="
 	!media-video/ffmpeg
 	alsa? ( media-libs/alsa-lib )
 	amr? ( media-libs/opencore-amr )
 	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio )
 	dirac? ( media-video/dirac )
 	encode? (
 		aac? ( media-libs/vo-aacenc )
@@ -61,6 +69,8 @@ RDEPEND="
 	jack? ( media-sound/jack-audio-connection-kit )
 	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
+	ssl? ( openssl? ( dev-libs/openssl )
+		   !openssl? ( net-libs/gnutls ) )
 	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
 	schroedinger? ( media-libs/schroedinger )
 	speex? ( >=media-libs/speex-1.2_beta3 )
@@ -83,9 +93,10 @@ DEPEND="${RDEPEND}
 "
 
 # faac can't be binary distributed
+# openssl support marked as nonfree
 # faac and aac are concurent implementations
 # amr and aac require at least lgpl3
-REQUIRED_USE="bindist? ( !faac )
+REQUIRED_USE="bindist? ( !faac !openssl )
 	amr? ( gpl ) aac? ( gpl )"
 
 RESTRICT="test"
@@ -116,6 +127,11 @@ src_configure() {
 	use bzip2 || myconf+=" --disable-bzlib"
 	use sdl || myconf+=" --disable-avplay"
 
+	if use ssl; then
+		use openssl && myconf+=" --enable-openssl --enable-nonfree" \
+					|| myconf+=" --enable-gnutls"
+	fi
+
 	use custom-cflags && myconf+=" --disable-optimizations"
 	use cpudetection && myconf+=" --enable-runtime-cpudetect"
 
@@ -142,7 +158,9 @@ src_configure() {
 	fi
 
 	# libavdevice options
+	use cdio && myconf+=" --enable-libcdio"
 	use ieee1394 && myconf+=" --enable-libdc1394"
+	use pulseaudio && myconf+=" --enable-libpulse"
 	# Indevs
 	# v4l1 is gone since linux-headers-2.6.38
 	myconf+=" --disable-indev=v4l"
@@ -171,13 +189,10 @@ src_configure() {
 	use jpeg2k && myconf+=" --enable-libopenjpeg"
 
 	# CPU features
-	uses="mmx ssse3 altivec"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
 	done
-	use mmxext || myconf+=" --disable-mmx2"
-	use 3dnow || myconf+=" --disable-amd3dnow"
-	use 3dnowext || myconf+=" --disable-amd3dnowext"
+
 	# disable mmx accelerated code if PIC is required
 	# as the provided asm decidedly is not PIC for x86.
 	if use pic && use x86 ; then
@@ -246,12 +261,11 @@ src_configure() {
 }
 
 src_compile() {
-	emake version.h
 	emake
 
 	if use qt-faststart; then
 		tc-export CC
-		emake -C tools qt-faststart
+		emake tools/qt-faststart
 	fi
 }
 
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index a51b55f7bebc..1cf523b36074 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/metadata.xml
@@ -11,25 +11,32 @@
 		instruction set, present in modern AMD CPUs.  (Check for
 		3dnowext in /proc/cpuinfo to know whether your CPU supports it).
 	</flag>
-	<flag name="amr">Enables Adaptive Multi-Rate Audio support</flag>
-	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs)</flag>
+	<flag name="amr">Enable Adaptive Multi-Rate Audio support</flag>
+    <flag name="avx">Adds support for Advanced Vector Extensions instructions (Intel Sandy Bridge, AMD Bulldozer and later chips)</flag>
+	<flag name="cdio">Enable audio CD grabbing with <pkg>dev-libs/libcdio</pkg>.</flag>
+	<flag name="cpudetection">Enables runtime CPU detection (useful for bindist, compatibility on other CPUs).</flag>
 	<flag name="dirac">Enable Dirac video support (an advanced royalty-free video compression format) via the reference library: dirac.</flag>
 	<flag name="faac">Use external faac library for AAC encoding
-		(notice: the resulting binaries are unredistributable)</flag>
+		(notice: the resulting binaries are unredistributable).</flag>
 	<flag name="aac">Use external vo-aacenc library for AAC encoding</flag>
 	<flag name="frei0r">Enable frei0r wrapping in libavfilter</flag>
 	<flag name="gpl">Build all GPL licensed code. Without this flag set the
 		package is build under LGPL license.</flag>
+	<flag name="openssl">Prefer <pkg>dev-libs/openssl</pkg> over <pkg>net-libs/gnutls</pkg> to provide SSL/TLS support (notice: the resulting binaries are unredistributable).</flag>
 	<flag name="hardcoded-tables">Use pre-calculated tables rather than calculating them on the fly.</flag>
-	<flag name="mmxext">Enables mmx2 support</flag>
-	<flag name="network">Enables network streaming support</flag>
-	<flag name="pic">Force shared libraries to be built as PIC (this is slower)</flag>
-	<flag name="qt-faststart">Build and install qt-faststart application</flag>
-	<flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
+	<flag name="mmxext">Enable mmx2 support.</flag>
+    <flag name="neon">Enable NEON optimizations for arm processors.</flag>	
+	<flag name="network">Enable network streaming support.</flag>
+	<flag name="pulseaudio">Enable pulseaudio input support.</flag>
+	<flag name="pic">Force shared libraries to be built as PIC (this is slower).</flag>
+	<flag name="qt-faststart">Build and install qt-faststart application.</flag>
+	<flag name="rtmp">Enable Real Time Messaging Protocol using librtmp instead the native implementation.</flag>
 	<flag name="schroedinger">Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).</flag>
-	<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)</flag>
-	<flag name="vaapi">Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
-	<flag name="vdpau">Enables VDPAU decoders (requires nVidia video cards to offload CPU processing to video card</flag>
-	<flag name="vpx">Enables vp8 codec support using libvpx: Decoding vp8 does not require this to be enabled but libvpx can also be used for decoding; encoding vp8 requires this useflag to be enabled though.</flag>
+	<flag name="ssl">Enable SSL/TLS support using <pkg>dev-libs/openssl</pkg> or <pkg>dev-libs/gnutls</pkg>.</flag>
+	<flag name="ssse3">faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips).</flag>
+	<flag name="vaapi">Enable VAAPI (Video Acceleration API) for hardware decoding.</flag>
+	<flag name="vdpau">Enable VDPAU decoders (requires nVidia video cards to offload CPU processing to video card.</flag>
+	<flag name="vis"> Adds support for SIMD optimizations for UltraSPARC processors.</flag>
+	<flag name="vpx">Enable vp8 encoding support using libvpx.</flag>
 </use>
 </pkgmetadata>