Revision bump, add more gstreamer dependencies to unbreak parts of the application; fixes bug #505396, reported by Abigail.

(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)

3 files changed, 200 insertions, 2 deletions

diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index 6af0e1c3e2bd..c43c527f9fd0 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,13 @@
 # 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.19 2014/03/19 15:19:44 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.20 2014/03/26 15:39:57 tomwij Exp $
+
+*handbrake-0.9.9-r1 (26 Mar 2014)
+
+  26 Mar 2014; Tom Wijsman <TomWij@gentoo.org> +handbrake-0.9.9-r1.ebuild,
+  handbrake-9999.ebuild:
+  Revision bump, add more gstreamer dependencies to unbreak parts of the
+  application; fixes bug #505396, reported by Abigail.
 
   19 Mar 2014; Tom Wijsman <TomWij@gentoo.org>
   files/handbrake-9999-remove-faac-dependency.patch, handbrake-9999.ebuild:
diff --git a/media-video/handbrake/handbrake-0.9.9-r1.ebuild b/media-video/handbrake/handbrake-0.9.9-r1.ebuild
new file mode 100644
index 000000000000..71c3653638f3
--- /dev/null
+++ b/media-video/handbrake/handbrake-0.9.9-r1.ebuild
@@ -0,0 +1,185 @@
+# 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-r1.ebuild,v 1.1 2014/03/26 15:39:57 tomwij Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit autotools eutils gnome2-utils python-any-r1
+
+if [[ ${PV} = *9999* ]]; then
+	ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
+	inherit subversion
+	KEYWORDS=""
+else
+	SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/HandBrake-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder."
+HOMEPAGE="http://handbrake.fr/"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="fdk ffmpeg gstreamer gtk"
+
+# Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
+REQUIRED_USE="!ffmpeg? ( gstreamer )"
+
+RDEPEND="
+	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/x264:=
+	media-sound/lame
+	ffmpeg? ( || ( >=media-video/libav-9:= >=media-video/ffmpeg-1.2.1:0= ) )
+	sys-libs/zlib
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base: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
+		!ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/libnotify
+		x11-libs/pango
+		>=virtual/udev-171[gudev]
+	)
+	fdk? ( media-libs/fdk-aac )
+	"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/yasm
+	dev-util/intltool
+	sys-devel/automake"
+
+pkg_setup() {
+	python-any-r1_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
+
+	# 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
+	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 \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		${myconf} || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# Documentation building is currently broken.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc AUTHORS CREDITS NEWS THANKS TRANSLATIONS
+}
+
+pkg_postinst() {
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+
+	if use gtk ; then
+		einfo ""
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 6726b1629ad3..c5cefcc78ac6 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.16 2014/03/19 15:19:44 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.17 2014/03/26 15:39:56 tomwij Exp $
 
 EAPI="5"
 
@@ -54,6 +54,12 @@ RDEPEND="
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base: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
 		!ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
 	)
 	gtk? (