diff options
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/handbrake/ChangeLog | 9 | ||||
| -rw-r--r-- | media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild (renamed from media-video/handbrake/handbrake-0.9.9_pre5441.ebuild) | 12 | ||||
| -rw-r--r-- | media-video/handbrake/handbrake-9999.ebuild | 30 | ||||
| -rw-r--r-- | media-video/handbrake/metadata.xml | 1 |
4 files changed, 42 insertions, 10 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/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> |