Add support for fdk-aac, update 9999 ebuild

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

5 files changed, 46 insertions, 14 deletions

diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index d42ac6b2847e..bc59838b072e 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/handbrake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.3 2013/05/07 17:26:24 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.4 2013/05/07 18:40:04 thev00d00 Exp $
+
+*handbrake-0.9.9_pre5441-r1 (07 May 2013)
+
+  07 May 2013; Ian Whyman <thev00d00@gentoo.org>
+  +handbrake-0.9.9_pre5441-r1.ebuild, -handbrake-0.9.9_pre5441.ebuild,
+  handbrake-9999.ebuild, metadata.xml:
+  Add support for fdk-aac, update 9999 ebuild
 
   07 May 2013; Ian Whyman <thev00d00@gentoo.org> handbrake-0.9.9_pre5441.ebuild,
   metadata.xml:
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 21efdba6bd80..6f395bd75ced 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -5,7 +5,7 @@ AUX handbrake-9999-remove-faac-dependency.patch 7478 SHA256 dd8b096ee47dfdc2bb3d
 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.9.9_pre5441.tar.gz 5580422 SHA256 6a6b8348229c4ae820be329413418d2a50a023922f28119c5b6e5aa155e3ec22 SHA512 aa3faca48dc7fafa5e56c0388300c86b81084549228f20908351a878e737ed54609b98c557ded921e215e4f5ced84aa96a0d64c11a7e67a40ac7eba24f2701a4 WHIRLPOOL 6ad2c23b09414e6d5b15c8c8e0dfa9eac05040c0b1673549b94293c5c20f7f55b8a98d39920be9e6c980664fb861dbf23ee9704fe3bffb7b8facf9722a4e1cb3
-EBUILD handbrake-0.9.9_pre5441.ebuild 4019 SHA256 741210e3f372dd77d091d349f0558bce2929c60d530caf35547dfd0939d301d8 SHA512 ac795e424bbba67ed8b4e1daee2cf4fa0e9ecfa289035bdf0529a0820de2f96c2a35e9ae9190a49e0a1a8f78fd97ff0baff21f6ab709de68e115656af4ebbbc5 WHIRLPOOL 716f0ed81939c381112edd3a390a0e9579d96bbf0b2c4744f124d454e72f5ec453aabfd7be9ee359ab7ba58b07bc5e7472d43984540f095d2bfedf209a47577b
-EBUILD handbrake-9999.ebuild 3626 SHA256 cdd9e3d70279213d6b53f46474bd0e6067856e0f3b1e81403f1fa1dc1b51809b SHA512 e27a3f5816b19dc51f69fbda49379717183da68fac326d09ed8e0f03415c590468fe6fc623d010112e521fdc830cd28c3433329370e43fdb7b2b731ac02e233d WHIRLPOOL c30c1081ba0408e67655bb025aceaa9197cb4ae1d486146385f4ef1b56d2186a5248b9580408896d959e7ccde1ce6732c299e692c61034d4eb85304cf17ba5d5
-MISC ChangeLog 1828 SHA256 b54865acd70da7260b550dd702991a42765dd1b9f5131378d8ef24b36d6e6959 SHA512 fc19903be8a34f16481ef3e4b10950cf1f55c6da83a317f06073bd0f1afaf28d280693812a45387cad7a3c6b935ad2e6dde7f25249729e4949c61328d8f8ba87 WHIRLPOOL 7b6db1f291f1671f9669293824104339b35fa421e2dda70abe5168ff17f3c4e2b00e16a308c261d366f93660a9a9b18bc9d4c8fec5c27fbc6b9d9b9bd4929d35
-MISC metadata.xml 859 SHA256 42ff24441f7a976ebb18bb2b706725f219a79a8a9e87fc6aae0fc2b038b7e10d SHA512 c69d9cd2ab194d04a2a48a609dd17c7edf0dd572521324b0c6c718b476968f1f011c6f2e42f16881aa3defe367a049ed6edd3d334e99c9b2eec71caec093e52a WHIRLPOOL a386186a39e71f1decfec7182f1504a5a3566ee769ee6fa6c648893c74b53b27506eef4cc570bc9bd5b011a44ead017c64ea516659f38566137349d19de24fc1
+EBUILD handbrake-0.9.9_pre5441-r1.ebuild 4111 SHA256 382fc55b901722db1e12f42d8f8b2623146c365e005981cc5e8311bd107fa650 SHA512 822822450cbd5dd6674162b18742d24dc5fbf524ada11705c241798c20b9ffbf87169dbe78a240391886a57c343c6c839c7bd8829ffa2dde58c28918da8b62b5 WHIRLPOOL 508b3e136ce2c353aa4b592de68a9478c61704fa1a3b79491d76a1e444a63dcc94a6697e2b4cd8c181fbe625d16913f09fa5eac8224a8c294be845810a197f3c
+EBUILD handbrake-9999.ebuild 4099 SHA256 80c70f9e6972b10fb49d4d833712c000e61b66463914d612eb41df1b50164800 SHA512 e5e0fe0b9026edf1553b30baaa2a114c99fedc2b4b1f77b4038266b7cd42f0ecfae6ec1d0a6227d8baa69572375b870cd1db483d26871b5249b81dc56f55a6c6 WHIRLPOOL d9d6c57f56c4244a3ab89c49ef913fad7c9aedd95aae50390e31bd1ba999837f68e823ab07d22453c0d4706449c4ce845e2c9cbc0d8b70e75e3a2ec43168d847
+MISC ChangeLog 2077 SHA256 56b5248e47ee5ac4ee176a023314a23c1f230db9a224b84be46aea06ad76b5c8 SHA512 41a700cf45027199171f640e7c7990ddfe88d8133ba175a36837ee9b1e11c5036bddce1cab235f6608ca1372beaa3eab1f9039168d5b0e7105573a8d7a7df5e6 WHIRLPOOL 5dc6d50b57ec05d795539fb2a08e1632b5c25ef11abd488e855240097166ba142c76fe21c6ce20748125855e21fa04045394ada5c26770b8a07b6f5d0dac9b34
+MISC metadata.xml 949 SHA256 0c2dea9a78292e142a185934a0dd7652f713b4ee68935de6e03a73e43074acfc SHA512 ed66b0375be0c9c07f06222a9de970e60446f543de10fe24e6430c687bae088858d926b2121095bc42fe2e9e6c940d459ad4936285a3291982e01e6e4e71c8b2 WHIRLPOOL 6942dd6c1cab7dfd58a65d2c7ad56e1372a6a7b03e525c027de015ef5ebf1d3a7823d202afa16f867f413ff0255bcd0e13f2d4a3ec19d362ee40db8262a2bfeb
diff --git a/media-video/handbrake/handbrake-0.9.9_pre5441.ebuild b/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild
index 8fe75244ea5d..4c257dc8709c 100644
--- a/media-video/handbrake/handbrake-0.9.9_pre5441.ebuild
+++ b/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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_pre5441.ebuild,v 1.4 2013/05/07 17:30:59 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild,v 1.1 2013/05/07 18:40:04 thev00d00 Exp $
 
 EAPI="5"
 
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="gtk gstreamer ffmpeg"
+IUSE="fdk ffmpeg gstreamer gtk"
 
 # Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
 REQUIRED_USE="!ffmpeg? ( gstreamer )"
@@ -59,7 +59,9 @@ RDEPEND="
 		x11-libs/libnotify
 		x11-libs/pango
 		>=virtual/udev-171[gudev]
-	)"
+	)
+	fdk? ( media-libs/fdk-aac )
+	"
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -124,6 +126,10 @@ src_configure() {
 		myconf+=" --enable-ff-mpeg2"
 	fi
 
+	if use fdk ; then
+		myconf+=" --enable-fdk-aac"
+	fi
+
 	./configure \
 		--force \
 		--prefix="${EPREFIX}/usr" \
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 4fcea9e15b44..c99f5f9aec58 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 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.2 2013/05/05 20:59:23 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.3 2013/05/07 18:40:04 thev00d00 Exp $
 
 EAPI="5"
 
 PYTHON_COMPAT=( python2_{5,6,7} )
 
-inherit eutils gnome2-utils python-any-r1
+inherit autotools eutils gnome2-utils python-any-r1
 
 if [[ ${PV} = *9999* ]]; then
 	ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="gtk gstreamer ffmpeg"
+IUSE="fdk ffmpeg gstreamer gtk"
 
 # Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
 REQUIRED_USE="!ffmpeg? ( gstreamer )"
@@ -42,7 +42,7 @@ RDEPEND="
 	media-libs/libvorbis
 	media-libs/x264
 	media-sound/lame
-	ffmpeg? ( >=media-video/ffmpeg-1.2 )
+	ffmpeg? ( =virtual/ffmpeg-9 )
 	sys-libs/glibc:2.2
 	sys-libs/zlib
 	gstreamer? (
@@ -59,7 +59,9 @@ RDEPEND="
 		x11-libs/libnotify
 		x11-libs/pango
 		>=virtual/udev-171[gudev]
-	)"
+	)
+	fdk? ( media-libs/fdk-aac )
+	"
 
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
@@ -95,6 +97,18 @@ src_prepare() {
 
 	# Make use of an unpatched version of a52 that does not make a private field public.
 	epatch "${FILESDIR}"/handbrake-9999-use-unpatched-a52.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
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
 }
 
 src_configure() {
@@ -112,6 +126,10 @@ src_configure() {
 		myconf+=" --enable-ff-mpeg2"
 	fi
 
+	if use fdk ; then
+		myconf+=" --enable-fdk-aac"
+	fi
+
 	./configure \
 		--force \
 		--prefix="${EPREFIX}/usr" \
@@ -154,4 +172,4 @@ pkg_postinst() {
 
 pkg_postrm() {
 	gnome2_icon_cache_update
-}
\ No newline at end of file
+}
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index de0160fc4505..cfd7c017c626 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -16,5 +16,6 @@
     <flag name="ffmpeg">Use FFmpeg from <pkg>media-video/ffmpeg</pkg> to decode MPEG-2 instead of <pkg>media-plugins/gst-plugins-mpeg2dec</pkg>.</flag>
     <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>
   </use>
 </pkgmetadata>