Bump to 0.10.0, without x265 support for now

Package-Manager: portage-2.2.15/cvs/Linux x86_64
RepoMan-Options: --force

5 files changed, 56 insertions, 101 deletions

diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index ec3857c0d1c2..ceadcad4ddad 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/handbrake
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.25 2014/11/14 01:48:20 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.26 2014/12/12 11:10:32 thev00d00 Exp $
+
+*handbrake-0.10.0 (12 Dec 2014)
+
+  12 Dec 2014; Ian Whyman <thev00d00@gentoo.org> +handbrake-0.10.0.ebuild,
+  -handbrake-0.9.9.ebuild, handbrake-9999.ebuild, metadata.xml:
+  Bump to 0.10.0, without x265 support for now
 
   14 Nov 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Remove myself.
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 1388b1f45d0a..510223344fe8 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -7,9 +7,10 @@ AUX handbrake-9999-remove-dvdnav-dup.patch 879 SHA256 cdfa247f00ad5b75af115618b7
 AUX handbrake-9999-remove-faac-dependency.patch 3697 SHA256 05af966252b8b6e50d3c79c5dc258d8db95574335ca10d31b9f87af9a23b049b SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc WHIRLPOOL 64fe289dbe9128b108e5d00b50f15ca9770c52e7f0fd5a384bdce1d66903ec264222360ffa25038c622c2dfbcbb4676648445da9dc5c39e5c1bf600945da8446
 AUX handbrake-9999-use-older-libmkv.patch 583 SHA256 17e15eccc630bf5dfcd66609d19bdcf57c731fba6c314af3a5a6d083de80ba7c SHA512 6ebcf55ffaab20301da1ceb2d993580a6b875676b65ee2d61d3fcaedf9e5a3b7e52128dae30363923218ba2e6f4510232c0e7738343e35c4c95048d35ff3933b WHIRLPOOL 075f604ec3c48345f435b3b2cd39b7d175c7df69600e5ca9438cd6d6a380673ff8848a2bf111cfe8fb3dff21ad33e822fbf7b45a3e547da8a0d9170a933e78d3
 AUX handbrake-9999-use-unpatched-a52.patch 944 SHA256 b8ccdecb0a70650af162fa649a323dd1c31268efe7c9ace58a89d70eab984c80 SHA512 aff9da64a434946600d1683f101bea1024319a418c57b0dbe9a8c287c72edf91d18102d51b817d9cea6e825d3a945741893956c55df16bf8f61b415a50dbeab4 WHIRLPOOL 97cf18bb453b435f88a60ed6417811eb8ce5c7af68f4e3d12316a72ac1594637f288511b54aee2b50fc04c356a0dba23dcf71b5712e9520371ab112f99b4f90f
+DIST handbrake-0.10.0.tar.bz2 10370718 SHA256 a91042da3cc08454844f7c171ee2fde4f0ed08176407fc0328d5118227ed4114 SHA512 e1793bf11aae384a63bdbb055b7b8998e13053d4519890ef6b6eb73988c5fb88c18e394e6c8f0af92cf7ba62a19ee83d908701a1f376adc2804c31192584d590 WHIRLPOOL 04379fd65000282c7472539aa6621ac668970529c3349f55c1ce5d60a6d96047a3a7e2d5d0d97ec002970769c7b8228ae67ac5623e814c3b2b27192351d8546b
 DIST handbrake-0.9.9.tar.bz2 9315199 SHA256 a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3 SHA512 c891e78f5fbc62fd46055bf6cd62e631bc181a2a21167dcf3fe18cbc4b57bb36c11d52dcf39b3c923b807160e79fb2b1f3c36d60f3024149206a86e7bd6d5b68 WHIRLPOOL edcb7758ba68e35b70700bbf484ac7794739a14302d205c080ad4fdf3151b460ee54b0c8dfffd68bca2ccb1a7d4379c9bbb7c3a9939c6bd6a06e1be95f09169e
+EBUILD handbrake-0.10.0.ebuild 3452 SHA256 82008ea0ce5589ae5fbd017a8f0914e35756fa011673f406097c24a1345792af SHA512 41156a28fbbb8d686978405c8aa45d8ee01bd0e169d43fd64789780cd9a84e3b3abbfea2ab276103495374fa581121813cfc7e084d549d097b552946e0716f16 WHIRLPOOL db39df7dd5571b4f30b576383eba4f5f4a2dbac94c3bb6ccea2abaa362568310c0d42a47325845d14d6934d2e66d46688bf18f7617c3702c589d2c7179ccfc26
 EBUILD handbrake-0.9.9-r1.ebuild 4518 SHA256 024380ce825648de94df184e8929ec6fa6e4ef50a5d8fa8163396f8b11b732aa SHA512 bfb8c19a94b988c14644f2b6e88fdc43c1afdf93c019005357682a3001e246d463233c513bb13a30242c59f05f322b47ab6654f5f96f49db9fc3877b15cc07db WHIRLPOOL d6f472b54e52b4ed05c70920111500c3632953e0d11df0598fbb26ad4d6ab05e6e383d005dc920a6e144560638691becbbcf7600878d0b4e2eb0959542fdb488
-EBUILD handbrake-0.9.9.ebuild 4301 SHA256 3f55334c74bb7a8d79dba45da90c869c91b5a9bb9eae0479a102958584abefe6 SHA512 12cde78f67a03ec27e876284a622076bd7d2be88b6920db2bda6d09ea33d15478881f5f881109c48f43dbe16f0e78e7a1dde3c942c6a4fbc022f8f5ddbb0ec92 WHIRLPOOL e5938f6c28882941af71f5287ad0e3b989dda1396f873f3b6b8c7eb71493505ad17c90feedd00e618e05a6389f67f5c98762cd04aad9d0e29f7fe4247ee1d9e5
-EBUILD handbrake-9999.ebuild 4959 SHA256 43efc61e66049df85bdd4684cc78abc4fdc7041e18f05177ef484f5262f9fb19 SHA512 cddd9f1d1692d0bef666596a8614f0e8439fd2dfcb344bbee41e390fc6391c0796dcab87ee8b2568e582875089b187bc9a19a2f96328348172b083bef95003f4 WHIRLPOOL 2a15e6cc2737834a7944844728aa9733345fca0b41bdf33bd6c72d76d77dbcd6447818fce16a22c299070d53481ddf5fb5d06d1ae826b48573c7a32d67d8feb2
-MISC ChangeLog 6773 SHA256 ae22a7ba218fb40e9f8777e34d0f15b06afa3373a5d88be2328cd9cb332a520d SHA512 4d017fdb1a2cb31e362906a0d81e3f91e11ff5d268da48c4f47e38f46b8551b8f8823d569ebfd289860fe7e4ffac1d66d961747ab34e7fa021f4088eb57b982c WHIRLPOOL 17a8d4394b4bbb5c3f8c4c1227f926a7efb6c9d5f2af5e4a370139110aad243b6214da8a39415acfecf0ae730c8ff59e7749d2304c484f9d38b82bf27081064b
-MISC metadata.xml 852 SHA256 78bf095abb2857d579ac02254fb6151e36892f6dcb964f57a9babc31dda7098e SHA512 78cc0e03a688e2dec50634d52b39816e1afce7069f4faee29cf38dc4dd7314e00296d0b9b9741261323774bc8517b3ca277be15b45792043ecd7b5aeb2155bd8 WHIRLPOOL 8713d1236e60302b3a9e84ebcfefc86fdb056c589b309399dfcab288418cd4d087e311f7427fea71f192814551eaa551a3e8f9d9b511811bfe96af0ba4e16980
+EBUILD handbrake-9999.ebuild 3451 SHA256 a72c4bddb18c785923c03e9625fd4591b302bc8655881d20a500e6bd7147ccc3 SHA512 f2db8a673dce8e16e01030cbe1b3f6caf0d03f257ce709e613815451232b358807c456746e10b7f2b09d0bae47dd958eccc0ff8c31896b327b588a920cab91b1 WHIRLPOOL 135e21ef7006c5d4c4795e76e0a5c6015e309131e72887a6bfc772a9c6f4e262c2af3445b547dfb9bceb515c340c4580969ee1589139c148a76bab2a37cbd017
+MISC ChangeLog 6996 SHA256 7c5e1d09a3c35dc628f08086090e4de92342fd00aa1ca2cf003a8bb92eb761ee SHA512 9abd478b898cf1ac5b2825db97ee8eb07cffb3202b9a67fb99529e9c0eafe32796fcaf858fdd6158b969f46b7a694091cea02e86128a963c918c02b1e781603b WHIRLPOOL a1c180958d63be53bad5c26f54d90772f7aeae7981c735e4fc51ce38c5121eb0fc6f732314c41ec17167e7184671338320e56ef599ffeb2a5a9ca3fb2ba5c1ca
+MISC metadata.xml 965 SHA256 b7b2e56e2f6d33e2f70a1e600f25234e8d6898314f486bac32cf1a1edade629a SHA512 a73fbd72a03eae58f9135d246e50db1e5785e36d3c03ad16d7105e81d5588917d0f3da32e9da0ae24981b5476c974ed3f2231793e166a03f618ad54032f40d6c WHIRLPOOL 716a2afc323ca728d4b3adb5e0a7ce70e7ca62c8b1daac9ce0a7d1438a7b1f604a5d0eb095fae551a2789358608464f8b91de4b15389bae6257563841faa51f4
diff --git a/media-video/handbrake/handbrake-0.9.9.ebuild b/media-video/handbrake/handbrake-0.10.0.ebuild
index e096f5d18b57..54fed9ffba5a 100644
--- a/media-video/handbrake/handbrake-0.9.9.ebuild
+++ b/media-video/handbrake/handbrake-0.10.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.16 2014/09/01 16:47:50 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.10.0.ebuild,v 1.1 2014/12/12 11:10:32 thev00d00 Exp $
 
 EAPI="5"
 
@@ -23,34 +23,37 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="fdk ffmpeg gstreamer gtk"
+IUSE="+fdk gstreamer gtk libav-aac"
 
-# Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
-REQUIRED_USE="!ffmpeg? ( gstreamer )"
+REQUIRED_USE="^^ ( fdk libav-aac )"
 
 RDEPEND="
+	dev-libs/jansson
 	media-libs/a52dec
 	media-libs/libass
 	media-libs/libbluray
 	media-libs/libdvdnav
 	media-libs/libdvdread
-	media-libs/libmpeg2
-	media-libs/libmp4v2:0
-	media-libs/libmkv
 	media-libs/libsamplerate
 	media-libs/libtheora
 	media-libs/libvorbis
+	media-libs/libvpx
 	media-libs/x264:=
 	media-sound/lame
-	ffmpeg? ( || ( >=media-video/libav-9 >=media-video/ffmpeg-1.2.1:0 ) )
+	|| ( >=media-video/libav-10.1 >=media-video/ffmpeg-2.3:0 )
 	sys-libs/zlib
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
-		!ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
+		media-libs/gst-plugins-good:1.0
+		media-libs/gst-plugins-bad:1.0
+		media-libs/gst-plugins-ugly:1.0
+		media-plugins/gst-plugins-a52dec:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-x264:1.0
 	)
 	gtk? (
-		x11-libs/gtk+:3
+		>=x11-libs/gtk+-3.10
 		dev-libs/dbus-glib
 		dev-libs/glib:2
 		x11-libs/cairo
@@ -61,6 +64,7 @@ RDEPEND="
 	)
 	fdk? ( media-libs/fdk-aac )
 	"
+	#x265? ( =media-libs/x265-1.4 )
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -74,77 +78,44 @@ pkg_setup() {
 
 src_prepare() {
 	# Get rid of leftover bundled library build definitions,
-	# the version 0.9.9 supports the use of system libraries.
 	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
 		"${S}"/make/include/main.defs \
 		|| die "Contrib removal failed."
 
-	# Instead of adding a #define to libmkv, we expand it in place. 
-	epatch "${FILESDIR}"/${PN}-9999-expand-MK_SUBTITLE_PGS.patch
-
-	# Fix compilation against the released 1.9.1 version of mp4v2.
-	epatch "${FILESDIR}"/${P}-fix-compilation-with-mp4v2-v1.9.1.patch
-
 	# Remove libdvdnav duplication and call it on the original instead.
 	# It may work this way; if not, we should try to mimic the duplication.
 	epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch
 
-	# Remove faac dependency until its compilation errors can be resolved.
-	epatch "${FILESDIR}"/${P}-remove-faac-dependency.patch
-	sed -i 's/-lfaac//' gtk/configure.ac || die
-
-	# Make use of an older version of libmkv.
-	epatch "${FILESDIR}"/${PN}-9999-use-older-libmkv.patch
-
-	# Make use of an unpatched version of a52 that does not make a private field public.
-	epatch "${FILESDIR}"/${PN}-9999-use-unpatched-a52.patch
+	# Remove faac dependency; TODO: figure out if we need to do this at all.
+	epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
 
-	# Add gmodule to the linker command line for bug #482674.
-	epatch "${FILESDIR}"/${P}-add-gmodule-to-gtk-configure.patch
-
-	# Fixup configure.ac with newer automake
 	cd "${S}/gtk"
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:g' \
-		-e 's:am_cv_prog_cc_stdc:ac_cv_prog_cc_stdc:g' \
-		configure.ac || die "Fixing up configure.ac failed"
-
-	# Don't run autogen.sh
+	# Don't run autogen.sh.
 	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
 	eautoreconf
 }
 
 src_configure() {
-	local myconf=""
-
-	if ! use gtk ; then
-		myconf+=" --disable-gtk"
-	fi
-
-	if ! use gstreamer ; then
-		myconf+=" --disable-gst"
-	fi
-
-	if use ffmpeg ; then
-		myconf+=" --enable-ff-mpeg2"
-	fi
-
-	if use fdk ; then
-		myconf+=" --enable-fdk-aac"
-	fi
-
 	./configure \
 		--force \
+		--verbose \
 		--prefix="${EPREFIX}/usr" \
+		--enable-local-autotools \
+		--enable-local-cmake \
+		--enable-local-yasm \
 		--disable-gtk-update-checks \
-		${myconf} || die "Configure failed."
+		$(use_enable libav-aac) \
+		$(use_enable fdk fdk-aac) \
+		$(use_enable gtk) \
+		$(usex !gstreamer --disable-gst) \
+		--disable-x265 || die "Configure failed."
+	#	$(use_enable x265) \
 }
 
 src_compile() {
 	emake -C build
 
-	# Documentation building is currently broken.
+	# TODO: Documentation building is currently broken, try to fix it.
 	#
 	# if use doc ; then
 	# 	emake -C build doc
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 1959d15be995..a6ffdfba0173 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.21 2014/09/17 00:29:29 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.22 2014/12/12 11:10:32 thev00d00 Exp $
 
 EAPI="5"
 
@@ -8,9 +8,6 @@ PYTHON_COMPAT=( python2_{6,7} )
 
 inherit autotools eutils gnome2-utils python-any-r1
 
-# TODO: Are KEYWORDS like these stabilization script friendly?
-#       We can opt to move the KEYWORDS from the else before the if;
-#       that way, it is listed first and the 9999 version will set it to "".
 if [[ ${PV} = *9999* ]]; then
 	ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
 	inherit subversion
@@ -26,30 +23,24 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="fdk ffmpeg gstreamer gtk"
+IUSE="+fdk gstreamer gtk libav-aac"
 
-# Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
-REQUIRED_USE="!ffmpeg? ( gstreamer )"
+REQUIRED_USE="^^ ( fdk libav-aac )"
 
-# TODO: As we improve src_configure with more flags we can make more optional here.
-#       Besides that, we should list slots for all the dependencies as well as
-#       support sub slot rebuilds where they are still missing; lets avoid running
-#       into more problems while we can.
 RDEPEND="
+	dev-libs/jansson
 	media-libs/a52dec
-	media-libs/faac
 	media-libs/libass
 	media-libs/libbluray
 	media-libs/libdvdnav
 	media-libs/libdvdread
-	media-libs/libmp4v2:0
-	media-libs/libmkv
 	media-libs/libsamplerate
 	media-libs/libtheora
 	media-libs/libvorbis
+	media-libs/libvpx
 	media-libs/x264:=
 	media-sound/lame
-	ffmpeg? ( || ( >=media-video/libav-11 >=media-video/ffmpeg-2.3:0 ) )
+	|| ( >=media-video/libav-10.1 >=media-video/ffmpeg-2.3:0 )
 	sys-libs/zlib
 	gstreamer? (
 		media-libs/gstreamer:1.0
@@ -60,7 +51,6 @@ RDEPEND="
 		media-plugins/gst-plugins-a52dec:1.0
 		media-plugins/gst-plugins-libav:1.0
 		media-plugins/gst-plugins-x264:1.0
-		!ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
 	)
 	gtk? (
 		>=x11-libs/gtk+-3.10
@@ -74,6 +64,7 @@ RDEPEND="
 	)
 	fdk? ( media-libs/fdk-aac )
 	"
+	#x265? ( =media-libs/x265-1.4 )
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -87,9 +78,6 @@ pkg_setup() {
 
 src_prepare() {
 	# Get rid of leftover bundled library build definitions,
-	# the version 0.9.9 supports the use of system libraries.
-	# TODO: Is this still needed, does this sed still do something?
-	#       If it does; we should convert this into a patch, such that we know it fails.
 	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
 		"${S}"/make/include/main.defs \
 		|| die "Contrib removal failed."
@@ -101,39 +89,27 @@ src_prepare() {
 	# Remove faac dependency; TODO: figure out if we need to do this at all.
 	epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
 
-	# Fixup configure.ac with newer automake.
-	# TODO: Would like to see this shorten towards the future;
-	#       see which are still needed, put those in a patch instead of 6 lines here.
 	cd "${S}/gtk"
-	sed -i \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:g' \
-		-e 's:am_cv_prog_cc_stdc:ac_cv_prog_cc_stdc:g' \
-		configure.ac || die "Fixing up configure.ac failed"
-
 	# Don't run autogen.sh.
-	# TODO: Document why we're not running this.
 	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
 	eautoreconf
 }
 
 src_configure() {
-	# TODO: Try to make parameters avformat, libav-aac, libmkv, mp4v2 optional
-	#       as for making faac optional, see the above TODO first.
-	#
-	#       Just to be sure, check the ./configure --help before each release;
-	#       they are still in the progress of unbundling / making things optional.
-	#
-	#       Check if the Python-ish implementation supports econf style.
 	./configure \
 		--force \
+		--verbose \
 		--prefix="${EPREFIX}/usr" \
+		--enable-local-autotools \
+		--enable-local-cmake \
+		--enable-local-yasm \
 		--disable-gtk-update-checks \
-		--disable-libav-aac \
-		--disable-x265 \
+		$(use_enable libav-aac) \
 		$(use_enable fdk fdk-aac) \
 		$(use_enable gtk) \
-		$(usex !gstreamer --disable-gst) || die "Configure failed."
+		$(usex !gstreamer --disable-gst) \
+		--disable-x265 || die "Configure failed."
+	#	$(use_enable x265) \
 }
 
 src_compile() {
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index 5a92f0557ad6..dd004ba8b99c 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -13,5 +13,6 @@
     <flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
     <flag name="gtk">Support for Gimp ToolKit + from <pkg>x11-libs/gtk+</pkg>, requirement for a GUI-based HandBrake.</flag>
     <flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
+    <flag name="libav-aac">Support for encoding AAC using <pkg>media-libs/libav</pkg>'s internal encoder.</flag>
   </use>
 </pkgmetadata>