Version bump to latest version. Punt older with security issues.

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 67 insertions, 300 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 0b305561077c..f9574e61690f 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.67 2012/05/05 11:54:25 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.68 2012/05/05 19:02:29 scarabeus Exp $
+
+*libav-0.8.2 (05 May 2012)
+
+  05 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> +libav-0.8.2.ebuild,
+  -libav-0.7.5.ebuild, -libav-0.7.9999.ebuild:
+  Version bump to latest version. Punt older with security issues.
 
   05 May 2012; Markus Meier <maekke@gentoo.org> libav-0.8.1.ebuild:
   x86 stable, bug #408555
diff --git a/media-video/libav/libav-0.7.9999.ebuild b/media-video/libav/libav-0.7.9999.ebuild
deleted file mode 100644
index 0ed8bf1f39a9..000000000000
--- a/media-video/libav/libav-0.7.9999.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# 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.7.9999.ebuild,v 1.8 2012/05/05 08:58:53 jdhore 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="mirror://gentoo/${P}.tar.xz"
-else # Official release
-	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
-fi
-
-LICENSE="LGPL-2.1 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 cpudetection
-custom-cflags debug dirac doc +encode faac 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"
-
-VIDEO_CARDS="nvidia"
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
-done
-
-RDEPEND="
-	!media-video/ffmpeg
-	alsa? ( media-libs/alsa-lib )
-	amr? ( media-libs/opencore-amr )
-	bzip2? ( app-arch/bzip2 )
-	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.20110426 )
-		xvid? ( >=media-libs/xvid-1.1.0 )
-	)
-	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 )
-	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 )
-	video_cards_nvidia? ( 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? ( virtual/pkgconfig )
-	doc? ( app-text/texi2html )
-	mmx? ( dev-lang/yasm )
-	rtmp? ( virtual/pkgconfig )
-	schroedinger? ( virtual/pkgconfig )
-	test? ( net-misc/wget )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-# faac can't be binary distributed
-# faac and aac are concurent implementations
-# amr and aac require gpl
-REQUIRED_USE="bindist? ( !faac )
-	faac? ( !aac ) aac? ( !faac )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl )"
-
-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_LIBAV_CONF}"
-	local uses i
-
-	myconf+="
-		$(use_enable gpl)
-		$(use_enable gpl version3)
-		--enable-postproc
-		--enable-avfilter
-	"
-
-	# enabled by default
-	uses="debug doc network vaapi zlib"
-	for i in ${uses}; do
-		use ${i} || myconf+=" --disable-${i}"
-	done
-	use bzip2 || myconf+=" --disable-bzlib"
-	use sdl || myconf+=" --disable-ffplay"
-
-	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 video_cards_nvidia && use vdpau || myconf+=" --disable-vdpau"
-
-	# 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 ieee1394 && myconf+=" --enable-libdc1394"
-	# 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"
-
-	# 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
-	uses="mmx ssse3 altivec"
-	for i in ${uses}; do
-		use ${i} || 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
-		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 version.h
-	emake
-
-	if use qt-faststart; then
-		tc-export CC
-		emake -C tools qt-faststart
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install install-man
-
-	dodoc Changelog README INSTALL
-	dodoc doc/*
-
-	if use qt-faststart; then
-		dobin tools/qt-faststart
-	fi
-}
-
-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.7.5.ebuild b/media-video/libav/libav-0.8.2.ebuild
index 371964cfa88b..ff2bb3ac1ed5 100644
--- a/media-video/libav/libav-0.7.5.ebuild
+++ b/media-video/libav/libav-0.8.2.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.7.5.ebuild,v 1.2 2012/05/05 08:58:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.2.ebuild,v 1.1 2012/05/05 19:02:29 scarabeus Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ HOMEPAGE="http://libav.org/"
 if [[ ${PV} == *9999 ]] ; then
 	SRC_URI=""
 elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	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
@@ -27,13 +27,17 @@ 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
-custom-cflags debug dirac doc +encode faac 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"
+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"
 
-VIDEO_CARDS="nvidia"
-for x in ${VIDEO_CARDS}; do
-	IUSE="${IUSE} video_cards_${x}"
+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="
@@ -41,6 +45,7 @@ RDEPEND="
 	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 )
@@ -49,20 +54,23 @@ RDEPEND="
 		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.20110426 )
+		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 )
-	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
+	vdpau? ( x11-libs/libvdpau )
 	vpx? ( >=media-libs/libvpx-0.9.6 )
 	X? ( x11-libs/libX11 x11-libs/libXext )
 	zlib? ( sys-libs/zlib )
@@ -80,11 +88,15 @@ DEPEND="${RDEPEND}
 "
 
 # faac can't be binary distributed
+# openssl support marked as nonfree
 # faac and aac are concurent implementations
-# amr and aac require gpl
-REQUIRED_USE="bindist? ( !faac )
-	faac? ( !aac ) aac? ( !faac )
-	amr? ( gpl ) aac? ( gpl ) x264? ( gpl )"
+# 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
@@ -105,12 +117,17 @@ src_configure() {
 	"
 
 	# enabled by default
-	uses="debug doc network vaapi zlib"
+	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-ffplay"
+	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"
@@ -119,7 +136,9 @@ src_configure() {
 	#	use video_cards_nvidia || myconf="${myconf} --disable-decoder=${i}"
 	#	use vdpau || myconf="${myconf} --disable-decoder=${i}"
 	#done
-	use video_cards_nvidia && use vdpau || myconf+=" --disable-vdpau"
+	use vdpau || myconf+=" --disable-vdpau"
+
+	use vaapi && myconf+=" --enable-vaapi"
 
 	# Encoders
 	if use encode; then
@@ -136,7 +155,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"
@@ -151,6 +172,7 @@ src_configure() {
 	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"
@@ -164,13 +186,13 @@ 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+=" --disable-${i#*:}"
 	done
-	use mmxext || myconf+=" --disable-mmx2"
-	use 3dnow || myconf+=" --disable-amd3dnow"
-	use 3dnowext || myconf+=" --disable-amd3dnowext"
+
+	# 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
@@ -239,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
 }
 
@@ -252,11 +273,24 @@ src_install() {
 	emake DESTDIR="${D}" install install-man
 
 	dodoc Changelog README INSTALL
-	dodoc doc/*
+	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() {