version bump

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

3 files changed, 299 insertions, 19 deletions

diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest
index cc491b2c39f3..adfdde1df278 100644
--- a/media-video/avidemux/Manifest
+++ b/media-video/avidemux/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX avidemux-2.5.4-build-plugins-fix.patch 497 RMD160 5099949dfb00bfcda59cfc00d9bd25c0ecd60807 SHA1 df33b52bedcce4db40b4f85f2238e2dfd3e973a6 SHA256 a470bfa50d86082f4e9ad31c5be630efe9a237f8dd504058278968770635ecef
 AUX avidemux-2.5.4-dummy-sound-fix.patch 476 RMD160 6c784197aa444a1722f0b540d1da02bd4b5d7aa3 SHA1 1ac354248a653d42f87820a1911a4f35888ec7ca SHA256 652c5403b93fa2b4f400d2790dbe75c36b8f98ce1a7d4d0647307e67888683d3
@@ -11,25 +11,19 @@ AUX avidemux-2.5.4-xvid.patch 1250 RMD160 8be1d4553a02a20a1ab14471adb46ebe4c5bf3
 DIST avidemux_2.5.4.tar.gz 18154965 RMD160 e20454a558210d5f7ab1418ae4013b618d1001d9 SHA1 83d6f6d87442ce4fc4e4806735ec27ef5e90364c SHA256 355bd3d235f6b3d0af65cbed535f51a1a7213c8abf8794af8b8d2cf88c1d720d
 DIST avidemux_2.5.5.tar.gz 15738941 RMD160 0303642d97dcbc165f27273d451b92804227a5a5 SHA1 bb4271390f2fad4eaf212b620622a11c084f0dd9 SHA256 c5bf45298911e00b06cf48ae4a936525d28cc2dddd4f41ee22e689b023b4923a
 DIST avidemux_2.5.6.tar.gz 14914123 RMD160 c09f1018ed4ded7f7a89ba0cc2a7a056314cc785 SHA1 47205c236bf6a4435b9d4dd944493c7b7e2752f5 SHA256 d6da7f2c4304368bd9c367a74a464b47d42fee9cada2960e70053d61c1ef9b8b
-EBUILD avidemux-2.5.4-r2.ebuild 4573 RMD160 476437402af4f5197d3e535de5423c58a181893e SHA1 f7e65945685fa3cd833f4db2d244ddeb57f6406a SHA256 d22be01176cf95574715a88437896d739416aa61ae14fcbd0687984d532a3a1b
-EBUILD avidemux-2.5.5.ebuild 4261 RMD160 1bae29c6ef5e642a47c8be819fca336aff8aa5f1 SHA1 ee6df02ffb1e875099bd4a6db17ef6fb62a72bb0 SHA256 156e82f0309f1d9ef316204b60f64f1cde991df2f7e0f5f5000494cafbe522f1
-EBUILD avidemux-2.5.6.ebuild 4279 RMD160 a2117b65c16bf45cf21df2c6f5ad4d88c0cb55eb SHA1 7ae06bb7b3bfb308e294b4db6ce0c8662e38786f SHA256 fa36b3c544418dfbdee8e9a908cc1aec46290e4b636ad38af5c1a855941d2c2e
-MISC ChangeLog 34707 RMD160 d2ae748c5749173344ad784b6f412d4940e54dc5 SHA1 3503b61e47772e3ca5f01b0bb389b21f16d82f68 SHA256 58dcbb1c7be80c9e9d3e0749e0c33c7797feffdcf23f5a801bddfdddca7d7e9d
+EBUILD avidemux-2.5.4-r2.ebuild 4532 RMD160 efaeec4be4b3cc1ecadab5ad5e51cddf3e3d4bc6 SHA1 895d62ed9ab262182d787fae1f7c311cd6cdd51b SHA256 9e773c7da913026d287cc4332c0ba6eabb63fa85f99ba4b58cff255f3c13ae46
+EBUILD avidemux-2.5.5.ebuild 4219 RMD160 615a0c58362e51ada0116932db9074cccc8a277d SHA1 7bf9aba9391b1c980bb0538395b92c7a7306ac20 SHA256 f02d72559ac47f50392353e653dd0380589452367634e79ce3da537a0517b083
+EBUILD avidemux-2.5.6.ebuild 4238 RMD160 4f470e9ce5fb1c000ccf5e5f9102c53c8462a6ac SHA1 5ca08ea8d3e39ef88fe7e2c224735be495cbe016 SHA256 c5fa484829336a300bab90226e7272099fd743d6b6f5bd24ef69a1b2b416eec9
+MISC ChangeLog 34906 RMD160 60552dcd3be8da41cf46ae62b6d447efc65242c9 SHA1 43389f93c5d567f4e3fa6dad25b4e561692d396c SHA256 1d0b195e1a716e1faa36c3776c97c1547f1532d43a67941fbd8981b88d18acad
 MISC metadata.xml 385 RMD160 c434ac5525d87786bfb7109a81bee4a5eb36f24a SHA1 473eae98f7fc44b8a373e15e18a86ea63c47d1bc SHA256 827ca0bd67c11039bbd1beb06b5219771b37e617319b83db46be716e40b6f7b7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPXH95AAoJEPqDWhW0r/LCuoYP/R+equ/xKppYsBxFygmSM8xG
-K97g0UA4EonVPnLYY+lTMLWfMCpB7w11Y0PUWYdjilW2D+u9VwqJnubJl7CVzSZP
-KKOTSzKKYdtOkJHCKAnhdgRZRUcS0ad/dg33q69u6kii9ejsu6AEr8ysjmWKvVbM
-f1TE0ONwicDD1HrJEslsiNxEAidSTUPeFDURNDHw5GjB7BdR41THutrXbIyG93rC
-dvrGnGml1Z6zcHnawYNj5Mksj4QxNW355EfGL96dUKwy27CAtEa6pBNOcDqS0Zfo
-v5E3G4YThlGk5uG77IyD///44oLDgX8Yvthzj3I3uHvyBN+FbzylQ5nck4IKPlia
-hsH4jGuD8SpFodLT5m7D13stZYzoMYG8sjMkRT8A2O7bsD5HTYtUX70S6opiW35f
-ZaUpms9BVMXfVLa8IQbomJsZwRW+f/N5fuyYYyWmTFkDnTkBKgrRvsEQMf5VTG74
-ursZ9GE0Dfzw2NrzeRVWQjxgnJ7hLS+beMEzxcfYgngfs/3KAm2zghquqbgMfocR
-bDJt3ub7mdMyhZqcAoIttIOt8EprgZXCEpUKvGkv9TsCiPFCIo4nyuNzUjgg7u5y
-5IsZMa8jY9x0SdesXqfyoFE4yuMPvnehlAuglG0Gq5DExqPDuIMtwL6IM3FDxtfW
-GtX3f92/Lknuja+h4zNd
-=TNk4
+iQEcBAEBAgAGBQJPZenYAAoJEEdUh39IaPFNEtEH/028DBxOaFXfMM6eNLUD7Obi
+itGJShoCU+iyNGdOQwdVvqUOjDVKvPTJr8IIBrHNlpduDNtSjuzb3UAL6W3ztGJY
+o7vylWyXfZc3FymBRAIA9Pm/uKo2C0hGywnA13LozR6U9GZeMGJOSHE9o0b3r7+w
+oNoc1m7nOiG/dcpM6H6mQ2IKHi/bXhno62ONNoxY3ZnlLheWXO4tva7yzoQuofmz
+3XteevRClj0/2W6Dig30uD8UO9IdDxwtPa7ZvKkcI4jIa1D3Yfi6KtVQq+mkE+r8
+oblo4wsTgTirwHScQR+e0ODCAUMoJoXsCJRMXIqUohNUmdsi3Zg7VEgE9/P9jH4=
+=dDNq
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 6cdcd206e380..77afd4a84dbd 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.528 2012/03/13 23:17:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.529 2012/03/18 13:54:03 aballier Exp $
+
+*ffmpeg-0.10.2 (18 Mar 2012)
+
+  18 Mar 2012; Alexis Ballier <aballier@gentoo.org> +ffmpeg-0.10.2.ebuild:
+  version bump
 
   14 Mar 2012; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   drop iwmmxt useflag as it has been removed upstream
diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.ebuild b/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
new file mode 100644
index 000000000000..3118a3818e30
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.10.2.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.10.2.ebuild,v 1.1 2012/03/18 13:54:03 aballier Exp $
+
+EAPI="4"
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
+SLOT="0"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+fi
+IUSE="
+	aac aacplus alsa amr ass bindist +bzip2 cdio celt cpudetection debug
+	dirac doc +encode faac frei0r gnutls gsm +hardcoded-tables ieee1394 jack
+	jpeg2k libv4l modplug mp3 network openal openssl oss pic pulseaudio
+	rtmp schroedinger sdl speex static-libs test theora threads
+	truetype v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
+	"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3 vis neon"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+FFTOOLS="aviocat cws2fws ffeval graph2dot ismindex pktdumper qt-faststart trasher"
+
+for i in ${FFTOOLS}; do
+	IUSE="${IUSE} +$i"
+done
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	ass? ( media-libs/libass )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio )
+	celt? ( >=media-libs/celt-0.11.1 )
+	dirac? ( media-video/dirac )
+	encode? (
+		aac? ( media-libs/vo-aacenc )
+		aacplus? ( media-libs/libaacplus )
+		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 )
+	)
+	frei0r? ( media-plugins/frei0r-plugins )
+	gnutls? ( net-libs/gnutls )
+	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 )
+	libv4l? ( media-libs/libv4l )
+	modplug? ( media-libs/libmodplug )
+	openal? ( >=media-libs/openal-1.1 )
+	pulseaudio? ( media-sound/pulseaudio )
+	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 )
+	truetype? ( media-libs/freetype:2 )
+	vaapi? ( >=x11-libs/libva-0.32 )
+	vdpau? ( x11-libs/libvdpau )
+	vpx? ( >=media-libs/libvpx-0.9.6 )
+	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
+	zlib? ( sys-libs/zlib )
+	!media-video/qt-faststart
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	dirac? ( dev-util/pkgconfig )
+	doc? ( app-text/texi2html )
+	gnutls? ( dev-util/pkgconfig )
+	ieee1394? ( dev-util/pkgconfig )
+	libv4l? ( dev-util/pkgconfig )
+	mmx? ( dev-lang/yasm )
+	rtmp? ( dev-util/pkgconfig )
+	schroedinger? ( dev-util/pkgconfig )
+	test? ( net-misc/wget )
+	truetype? ( dev-util/pkgconfig )
+	v4l? ( sys-kernel/linux-headers )
+"
+# faac is license-incompatible with ffmpeg
+REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+	libv4l? ( v4l )
+	test? ( encode zlib )"
+
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+}
+
+src_configure() {
+	local myconf="${EXTRA_FFMPEG_CONF}"
+	# Set to --enable-version3 if (L)GPL-3 is required
+	local version3=""
+
+	# enabled by default
+	for i in debug doc network vaapi vdpau zlib; do
+		use ${i} || myconf="${myconf} --disable-${i}"
+	done
+	use bzip2 || myconf="${myconf} --disable-bzlib"
+	use sdl || myconf="${myconf} --disable-ffplay"
+
+	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
+	use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
+	for i in gnutls ; do
+		use $i && myconf="${myconf} --enable-$i"
+	done
+
+	# Encoders
+	if use encode
+	then
+		use mp3 && myconf="${myconf} --enable-libmp3lame"
+		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
+		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
+		for i in theora vorbis x264 xvid; do
+			use ${i} && myconf="${myconf} --enable-lib${i}"
+		done
+		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
+		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+	else
+		myconf="${myconf} --disable-encoders"
+	fi
+
+	# libavdevice options
+	use cdio && myconf="${myconf} --enable-libcdio"
+	use ieee1394 && myconf="${myconf} --enable-libdc1394"
+	use openal && myconf="${myconf} --enable-openal"
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf="${myconf} --disable-indev=v4l"
+	use v4l || myconf="${myconf} --disable-indev=v4l2"
+	for i in alsa oss jack ; do
+		use ${i} || myconf="${myconf} --disable-indev=${i}"
+	done
+	use X && myconf="${myconf} --enable-x11grab"
+	use pulseaudio && myconf="${myconf} --enable-libpulse"
+	use libv4l && myconf="${myconf} --enable-libv4l2"
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf="${myconf} --disable-outdev=${i}"
+	done
+	# libavfilter options
+	use frei0r && myconf="${myconf} --enable-frei0r"
+	use truetype && myconf="${myconf} --enable-libfreetype"
+	use ass && myconf="${myconf} --enable-libass"
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	use threads && myconf="${myconf} --enable-pthreads"
+
+	# Decoders
+	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
+	for i in celt gsm dirac modplug rtmp schroedinger speex vpx; do
+		use ${i} && myconf="${myconf} --enable-lib${i}"
+	done
+	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
+	done
+	if use pic ; then
+		myconf="${myconf} --enable-pic"
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		use x86 && myconf="${myconf} --disable-asm"
+	fi
+
+	# 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
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	# Mandatory configuration
+	myconf="
+		--enable-gpl
+		${version3}
+		--enable-postproc
+		--enable-avfilter
+		--disable-stripping
+		${myconf}"
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+		case ${CHOST} in
+			*freebsd*)
+				myconf="${myconf} --target-os=freebsd"
+				;;
+			mingw32*)
+				myconf="${myconf} --target-os=mingw32"
+				;;
+			*linux*)
+				myconf="${myconf} --target-os=linux"
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
+
+	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)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		$(use_enable static-libs static) \
+		${myconf} || die
+}
+
+src_compile() {
+	emake
+
+	for i in ${FFTOOLS} ; do
+		if use $i ; then
+			emake tools/$i
+		fi
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man
+
+	dodoc Changelog README INSTALL
+	dodoc -r doc/*
+
+	for i in ${FFTOOLS} ; do
+		if use $i ; then
+			dobin tools/$i
+		fi
+	done
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+		emake fate
+}