From: Ian Whyman <thev00d00@gentoo.org>
Date: Sun, 22 May 2016 11:27:56 +0000 (+0100)
Subject: media-video/handbrake: Reintroduce nolibav patch to both versions
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8ce9a8aceb76a1946e913562bda238124d01279a;p=gentoo.git

media-video/handbrake: Reintroduce nolibav patch to both versions

Package-Manager: portage-2.2.28
---

diff --git a/media-video/handbrake/handbrake-0.10.5.ebuild b/media-video/handbrake/handbrake-0.10.5.ebuild
index fb77b015a986..0dc275601a4d 100644
--- a/media-video/handbrake/handbrake-0.10.5.ebuild
+++ b/media-video/handbrake/handbrake-0.10.5.ebuild
@@ -98,6 +98,9 @@ src_prepare() {
 
 	default
 
+	# Get rid of libav specific code when using ffmpeg
+	use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+
 	cd "${S}/gtk"
 	# Don't run autogen.sh.
 	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index fb77b015a986..0dc275601a4d 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -98,6 +98,9 @@ src_prepare() {
 
 	default
 
+	# Get rid of libav specific code when using ffmpeg
+	use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
+
 	cd "${S}/gtk"
 	# Don't run autogen.sh.
 	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"