[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     836efa98efe86a14eb8d82e19f3d2814dc09f749
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 27 19:17:32 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Aug 27 19:17:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836efa98

media-video/ffmpeg: Add chromium include manually for easier patching

This makes the patch apply against any version. The include line will
work just as well at the end of the Makefile.

Package-Manager: Portage-2.3.8, Repoman-2.3.2

 media-video/ffmpeg/ffmpeg-9999.ebuild   |  1 +
 media-video/ffmpeg/files/chromium.patch | 15 +++------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 55572458a50..ac3d4666a00 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -302,6 +302,7 @@ src_prepare() {
 		export revision=git-N-${FFMPEG_REVISION}
 	fi
 	default
+	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
 }
 
 multilib_src_configure() {

diff --git a/media-video/ffmpeg/files/chromium.patch b/media-video/ffmpeg/files/chromium.patch
index bc8b8d38698..60a3e5d6cb9 100644
--- a/media-video/ffmpeg/files/chromium.patch
+++ b/media-video/ffmpeg/files/chromium.patch
@@ -1,18 +1,9 @@
 Allow libffmpeg to be built for Chromium-based browsers
 https://patchwork.ffmpeg.org/patch/4500/
 
-diff --git a/Makefile b/Makefile
-index 29870d7..1e267e7 100644
---- a/Makefile
-+++ b/Makefile
-@@ -65,6 +65,7 @@ all: all-yes
- 
- include $(SRC_PATH)/tools/Makefile
- include $(SRC_PATH)/ffbuild/common.mak
-+include $(SRC_PATH)/ffbuild/libffmpeg.mak
- 
- FF_EXTRALIBS := $(FFEXTRALIBS)
- FF_DEP_LIBS  := $(DEP_LIBS)
+NOTE: This patch lacks the Makefile include line. We append it
+manually instead to make patching across different versions easier.
+
 diff --git a/ffbuild/libffmpeg.mak b/ffbuild/libffmpeg.mak
 new file mode 100644
 index 0000000..992cf3c