| 1 |
commit: 836efa98efe86a14eb8d82e19f3d2814dc09f749 |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 27 19:17:32 2017 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 27 19:17:32 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836efa98 |
| 7 |
|
| 8 |
media-video/ffmpeg: Add chromium include manually for easier patching |
| 9 |
|
| 10 |
This makes the patch apply against any version. The include line will |
| 11 |
work just as well at the end of the Makefile. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.8, Repoman-2.3.2 |
| 14 |
|
| 15 |
media-video/ffmpeg/ffmpeg-9999.ebuild | 1 + |
| 16 |
media-video/ffmpeg/files/chromium.patch | 15 +++------------ |
| 17 |
2 files changed, 4 insertions(+), 12 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 20 |
index 55572458a50..ac3d4666a00 100644 |
| 21 |
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 22 |
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild |
| 23 |
@@ -302,6 +302,7 @@ src_prepare() { |
| 24 |
export revision=git-N-${FFMPEG_REVISION} |
| 25 |
fi |
| 26 |
default |
| 27 |
+ echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die |
| 28 |
} |
| 29 |
|
| 30 |
multilib_src_configure() { |
| 31 |
|
| 32 |
diff --git a/media-video/ffmpeg/files/chromium.patch b/media-video/ffmpeg/files/chromium.patch |
| 33 |
index bc8b8d38698..60a3e5d6cb9 100644 |
| 34 |
--- a/media-video/ffmpeg/files/chromium.patch |
| 35 |
+++ b/media-video/ffmpeg/files/chromium.patch |
| 36 |
@@ -1,18 +1,9 @@ |
| 37 |
Allow libffmpeg to be built for Chromium-based browsers |
| 38 |
https://patchwork.ffmpeg.org/patch/4500/ |
| 39 |
|
| 40 |
-diff --git a/Makefile b/Makefile |
| 41 |
-index 29870d7..1e267e7 100644 |
| 42 |
---- a/Makefile |
| 43 |
-+++ b/Makefile |
| 44 |
-@@ -65,6 +65,7 @@ all: all-yes |
| 45 |
- |
| 46 |
- include $(SRC_PATH)/tools/Makefile |
| 47 |
- include $(SRC_PATH)/ffbuild/common.mak |
| 48 |
-+include $(SRC_PATH)/ffbuild/libffmpeg.mak |
| 49 |
- |
| 50 |
- FF_EXTRALIBS := $(FFEXTRALIBS) |
| 51 |
- FF_DEP_LIBS := $(DEP_LIBS) |
| 52 |
+NOTE: This patch lacks the Makefile include line. We append it |
| 53 |
+manually instead to make patching across different versions easier. |
| 54 |
+ |
| 55 |
diff --git a/ffbuild/libffmpeg.mak b/ffbuild/libffmpeg.mak |
| 56 |
new file mode 100644 |
| 57 |
index 0000000..992cf3c |
Archives