Introduce libav 0.8.1 and minor updates

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

6 files changed, 329 insertions, 14 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 7c88faec8d51..852fcd2db88c 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.59 2012/03/13 23:52:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.60 2012/03/16 20:18:03 lu_zero Exp $
+
+*libav-0.8.1 (16 Mar 2012)
+
+  16 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libav-0.8.ebuild,
+  +libav-0.8.1.ebuild, libav-0.8.9999.ebuild, libav-9999.ebuild:
+  Introduce libav 0.8.1 and minor updates
 
   13 Mar 2012; Luca Barbato <lu_zero@gentoo.org> libav-9999.ebuild:
   iwmmxt removed upstream
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index 8dedb18a388b..c6dc3342ee80 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -3,19 +3,21 @@ Hash: SHA256
 
 DIST libav-0.6.5.tar.xz 3193172 RMD160 5a796c6cc6bf2b26bfda93800c010a54a5934851 SHA1 bab032f699cbac063e77030a0a2eddcc04f64888 SHA256 439491a93f3c85d6fcafb50758be5ad312f3d0795852c52c33157ea11005df7e
 DIST libav-0.7.4.tar.xz 3613872 RMD160 d6f07bb8889f69fdd282fbeb689bee9e3b7463d5 SHA1 9000cb3ec3e37bd442b9049a57b923187818a5ce SHA256 bd98dc5dc3621d6d028334233c63e44928e1453a6e03c5a8165537f11baed59a
+DIST libav-0.8.1.tar.xz 3806536 RMD160 eb81841dc5845d4ba74006980e9fac4edbb23a19 SHA1 318b1fa68366b6074a70a39c485b61327539da92 SHA256 96325bb5c54c59968cb0f7498e542806836ea4e310eb9099c68dc0b0d72b5e75
 DIST libav-0.8.tar.xz 3802608 RMD160 3a37ade904fea59f1e28fe1d51f09d37f4dde50f SHA1 be662d222dd7e53243257165a6aff2274d603072 SHA256 293e8b8037d5c7cc32478f57e4b81f733b9431d538a7d48c4ba91cb8b9c9c930
 EBUILD libav-0.6.5.ebuild 7540 RMD160 a44cf312424486cfed22c19db6248c8ca095ffc1 SHA1 5f9d6e9a6aba4a01d460a39139be875ba9c6f824 SHA256 ba25e0441bc9ac01d16b5d038df4e42821417d388b09fe944e9c7ffb04c10aca
 EBUILD libav-0.7.4.ebuild 7945 RMD160 d11d4439bb4338e04d5e8c10583eba824db6270c SHA1 5552936ca2109a3462b07fe477d6672120802855 SHA256 502a23eebb04ad21fb6ce491d6423933d4dde265d6f7964558a718233ee7ba97
 EBUILD libav-0.7.9999.ebuild 7962 RMD160 56987c877505b2140922d66b84f9ab8a16e1dd0d SHA1 faeeb7828ad50832dea9000812496244aa0ca468 SHA256 ab4971d99252dea5fc4fb31b86e8a1281848e4186b49de49029386e1064bf56c
-EBUILD libav-0.8.9999.ebuild 8956 RMD160 3c2e41960f41f08c230f1d03624c3447d7d8cf0c SHA1 6bbb354f3f9daae125bf81b944dfa6886bd9ca24 SHA256 60aecd019e042c1f91fd3a799dd4c0950380f57a2f8db3b35b54d7d1704036c2
-EBUILD libav-0.8.ebuild 8951 RMD160 bbf00090099b1ceacf4c245c835b05161f72ef00 SHA1 7f2f0ccbf637f2b6470271852dcb97025a33f834 SHA256 5c836a889f7cecd2849e0502d9d93e95819eb5cd0352d5d60b947909484949d6
-EBUILD libav-9999.ebuild 8926 RMD160 92b17a88fb8dc01564d105a61f5c685a0364ab50 SHA1 a17f7a875caba330861c596f6efb0965015e22b9 SHA256 0fa635a55531a49ff7b17f88972eb4862f0955d728d87c64aa1880958159bce3
-MISC ChangeLog 9144 RMD160 cb8af7b3f9f0452dbe60c3da2cf70b7fce7f7458 SHA1 7e39d5a874f83633cba6bb43ef1668dcdcfc93ad SHA256 a37017cf36d3f783cb7bb1e83fe7a10db6d28ed18cf758f30724d1df32e8a920
+EBUILD libav-0.8.1.ebuild 8964 RMD160 67c726ace2e7a3078bcbb0c902e4faa61f395e60 SHA1 37fb9fcff9e9619377cc9836cadaeef81e5cbf5b SHA256 84e90ba4fbd5d5fd9f9ad1631f8a3c2fc33e81570008e3e98520698f24328b04
+EBUILD libav-0.8.9999.ebuild 8967 RMD160 8f5804aa3102e7e81608f7a1ca41ccdebf7381cc SHA1 493d9be482c69e9802222936fa54686fdcac172f SHA256 364d13e74a7457b8b193e3c712c9a0612f07b2c27a983b2e83588d4428720423
+EBUILD libav-0.8.ebuild 8962 RMD160 ee9374b13f9af1d807cb22baaf47657817bbe823 SHA1 76d3597a0a4a5af063873ab39d8b22ee150b6c48 SHA256 fad8f0af438d54157e535198e831e5e22deb656656012e8f5b08ad74470ddc3d
+EBUILD libav-9999.ebuild 8937 RMD160 fdeacabf114609466df62425ed306ac36916eb24 SHA1 82a12e1c534004fb359acc6042d0edfdb486ead4 SHA256 1acbe0c458749e0db62c45c04eb68d531e603db340074d92db9a28f0fa3a2db5
+MISC ChangeLog 9347 RMD160 019d94253cf5d09744a94a39153c663ab377ddad SHA1 5a30cf1280c70acf849e1711526bbb0c92247c1d SHA256 4fc359f05f7133ba0f1601d3c873672ab0f550918cf898e161b196292791d4db
 MISC metadata.xml 2901 RMD160 a803fd4d095dede8d2e8d1e1150dd4dbdc593772 SHA1 b963c57764c3464383eb61decdbfad757f553101 SHA256 246c0b2f532a0514d458eb166855abb1809740d037ed76ab41a5f107c83a9b1f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9f3bQACgkQYpJnKVbCxcyEgwEAlf0eZ3nvO3e4ZSUjy7bpArGn
-jT6pHL48ZUavQWzin+0A/3HrTjIOaNRLDgrE4O+rrTCwHs1Ict3ZiJp7JXaCqrFv
-=L26G
+iF4EAREIAAYFAk9joAcACgkQYpJnKVbCxcxw/AD8DdWPC/lifzDsXk7y6rIe+rB5
+m85sqc94/laX4dvpBKUA/2jbOo1ft769UFh3QF+IXVkTq+N1Qr90v0aSuHqqi4Vf
+=mXxe
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.8.1.ebuild b/media-video/libav/libav-0.8.1.ebuild
new file mode 100644
index 000000000000..6a766bb10db5
--- /dev/null
+++ b/media-video/libav/libav-0.8.1.ebuild
@@ -0,0 +1,307 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.1.ebuild,v 1.1 2012/03/16 20:18:03 lu_zero Exp $
+
+EAPI=4
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.libav.org/libav.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video."
+HOMEPAGE="http://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
+fi
+
+LICENSE="LGPL-2 gpl? ( GPL-3 )"
+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 cdio cpudetection
+	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
+	  +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"
+
+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 )
+		amr? ( media-libs/vo-amrwbenc )
+		faac? ( media-libs/faac )
+		mp3? ( >=media-sound/lame-3.98.3 )
+		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
+		vorbis? ( media-libs/libvorbis media-libs/libogg )
+		x264? ( >=media-libs/x264-0.0.20111017 )
+		xvid? ( >=media-libs/xvid-1.1.0 )
+	)
+	truetype? ( media-libs/freetype )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+	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 )
+	vaapi? ( x11-libs/libva )
+	vdpau? ( x11-libs/libvdpau )
+	vpx? ( >=media-libs/libvpx-0.9.6 )
+	X? ( x11-libs/libX11 x11-libs/libXext )
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	dirac? ( dev-util/pkgconfig )
+	doc? ( app-text/texi2html )
+	mmx? ( dev-lang/yasm )
+	rtmp? ( dev-util/pkgconfig )
+	schroedinger? ( dev-util/pkgconfig )
+	test? ( net-misc/wget )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="bindist? ( !faac !openssl )
+			  rtmp? ( network )
+			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
+
+RESTRICT="test"
+
+src_prepare() {
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+}
+
+src_configure() {
+	local myconf="${EXTRA_FFMPEG_CONF}"
+	local uses i
+
+	myconf="
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-postproc
+		--enable-avfilter
+	"
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	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"
+
+	#for i in h264_vdpau mpeg1_vdpau mpeg_vdpau vc1_vdpau wmv3_vdpau; do
+	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
+	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
+	#done
+	use vdpau || myconf+=" --disable-vdpau"
+
+	use vaapi && myconf+=" --enable-vaapi"
+
+	# Encoders
+	if use encode; then
+		use mp3 && myconf+=" --enable-libmp3lame"
+		use amr && myconf+=" --enable-libvo-amrwbenc"
+		use faac && myconf+=" --enable-libfaac --enable-nonfree"
+		use aac && myconf+=" --enable-libvo-aacenc"
+		uses="theora vorbis x264 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=" --enable-lib${i}"
+		done
+	else
+		myconf+=" --disable-encoders"
+	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"
+	use v4l || myconf+=" --disable-indev=v4l2"
+	for i in alsa oss jack; do
+		use ${i} || myconf+=" --disable-indev=${i}"
+	done
+	use X && myconf+=" --enable-x11grab"
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=" --disable-outdev=${i}"
+	done
+	# libavfilter options
+	use frei0r && myconf+=" --enable-frei0r"
+	use truetype &&  myconf+=" --enable-libfreetype"
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	use threads && myconf+=" --enable-pthreads"
+
+	# Decoders
+	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
+	uses="gsm dirac rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=" --enable-lib${i}"
+	done
+	use jpeg2k && myconf+=" --enable-libopenjpeg"
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=" --disable-${i#*:}"
+	done
+
+	# pass the right -mfpu as extra
+	use neon && myconf+=" --extra-cflags=-mfpu=neon"
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && use x86 ; then
+		myconf+=" --disable-mmx --disable-mmx2"
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=" --enable-pic"
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host" # bug #273421
+		[[ ${i} = *-sse3 ]] && i="${i%-sse3}" # bug 283968
+		myconf+=" --cpu=${i}"
+		break
+	done
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=" --target-os=freebsd"
+				;;
+			mingw32*)
+				myconf+=" --target-os=mingw32"
+				;;
+			*linux*)
+				myconf+=" --target-os=linux"
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=" --enable-hardcoded-tables"
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ $(tc-arch) == "x86" ]]; then
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	cd "${S}"
+	./configure \
+		--prefix="$EPREFIX"/usr \
+		--libdir="$EPREFIX"/usr/$(get_libdir) \
+		--shlibdir="$EPREFIX"/usr/$(get_libdir) \
+		--mandir="$EPREFIX"/usr/share/man \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		$(use_enable static-libs static) \
+		${myconf} || die
+}
+
+src_compile() {
+	emake
+
+	if use qt-faststart; then
+		tc-export CC
+		emake tools/qt-faststart
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man
+
+	dodoc Changelog README INSTALL
+	dodoc doc/*.txt
+	use doc && dodoc doc/*.html
+
+	if use qt-faststart; then
+		dobin tools/qt-faststart
+	fi
+
+	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
+		dosym  ${i} /usr/bin/${i/av/ff}
+	done
+}
+
+pkg_postinst() {
+	elog "Please note that the programs formerly known as ffplay, ffserver"
+	elog "and ffprobe are now called avplay, avserver and avprobe."
+	elog
+	elog "ffmpeg had been replaced by the feature incompatible avconv thus"
+	elog "the legacy ffmpeg is provided for compatibility with older scripts"
+}
+
+src_test() {
+	local i tests
+	if use encode; then
+		tests="codectest lavftest seektest"
+		for i in ${tests}; do
+			LD_LIBRARY_PATH="${S}/libavcore:${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+				emake ${i}
+		done
+	else
+		ewarn "Tests fail without USE=encode, skipping"
+	fi
+}
diff --git a/media-video/libav/libav-0.8.9999.ebuild b/media-video/libav/libav-0.8.9999.ebuild
index 2862e6a5078f..b52eef75db6c 100644
--- a/media-video/libav/libav-0.8.9999.ebuild
+++ b/media-video/libav/libav-0.8.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.5 2012/03/07 21:37:11 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.6 2012/03/16 20:18:03 lu_zero Exp $
 
 EAPI=4
 
@@ -94,7 +94,7 @@ DEPEND="${RDEPEND}
 # x264 requires gpl2
 REQUIRED_USE="bindist? ( !faac !openssl )
 			  rtmp? ( network )
-			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl )"
+			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
 
 RESTRICT="test"
 
diff --git a/media-video/libav/libav-0.8.ebuild b/media-video/libav/libav-0.8.ebuild
index f4649839debc..397768b297f7 100644
--- a/media-video/libav/libav-0.8.ebuild
+++ b/media-video/libav/libav-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.7 2012/03/07 21:37:11 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.8 2012/03/16 20:18:03 lu_zero Exp $
 
 EAPI=4
 
@@ -94,7 +94,7 @@ DEPEND="${RDEPEND}
 # x264 requires gpl2
 REQUIRED_USE="bindist? ( !faac !openssl )
 			  rtmp? ( network )
-			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl )"
+			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
 
 RESTRICT="test"
 
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index a89880b75c89..da52c3e17d97 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.33 2012/03/13 23:52:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.34 2012/03/16 20:18:03 lu_zero Exp $
 
 EAPI=4
 
@@ -94,7 +94,7 @@ DEPEND="${RDEPEND}
 # x264 requires gpl2
 REQUIRED_USE="bindist? ( !faac !openssl )
 			  rtmp? ( network )
-			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl )"
+			  amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl )"
 
 RESTRICT="test"