| 1 |
commit: 36e878ee7e983945a26092328ac0487e43abde6a |
| 2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 1 23:18:32 2018 +0000 |
| 4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 2 21:41:31 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36e878ee |
| 7 |
|
| 8 |
media-video/ffmpeg: Fix chromium-r1.patch to not link every time |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
| 12 |
|
| 13 |
media-video/ffmpeg/files/chromium-r1.patch | 18 ++++++++++++------ |
| 14 |
1 file changed, 12 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/ffmpeg/files/chromium-r1.patch b/media-video/ffmpeg/files/chromium-r1.patch |
| 17 |
index cfe06a7aec8..514780035bc 100644 |
| 18 |
--- a/media-video/ffmpeg/files/chromium-r1.patch |
| 19 |
+++ b/media-video/ffmpeg/files/chromium-r1.patch |
| 20 |
@@ -9,17 +9,23 @@ new file mode 100644 |
| 21 |
index 0000000..992cf3c |
| 22 |
--- /dev/null |
| 23 |
+++ b/ffbuild/libffmpeg.mak |
| 24 |
-@@ -0,0 +1,21 @@ |
| 25 |
+@@ -0,0 +1,27 @@ |
| 26 |
+LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF) |
| 27 |
+LIBFFMPEG_LINK = $(LD) -shared -Wl,-soname,$(LIBFFMPEG) -Wl,-Bsymbolic -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--gc-sections $(LDFLAGS) $(LDLIBFLAGS) -o $(LIBFFMPEG) |
| 28 |
+ |
| 29 |
-+libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF) |
| 30 |
-+ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample) |
| 31 |
++ifeq ($(CONFIG_SHARED),yes) |
| 32 |
++LIBFFMPEG_DEPS = libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF) |
| 33 |
++else |
| 34 |
++LIBFFMPEG_DEPS = libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF) |
| 35 |
++endif |
| 36 |
+ |
| 37 |
-+libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF) |
| 38 |
++$(LIBFFMPEG): $(LIBFFMPEG_DEPS) |
| 39 |
++ifeq ($(CONFIG_SHARED),yes) |
| 40 |
+ $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil |
| 41 |
++else |
| 42 |
++ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample) |
| 43 |
++endif |
| 44 |
+ |
| 45 |
-+$(LIBFFMPEG): libffmpeg-$(CONFIG_SHARED) |
| 46 |
+libffmpeg: $(LIBFFMPEG) |
| 47 |
+ |
| 48 |
+install-libffmpeg: $(LIBFFMPEG) |
| 49 |
@@ -30,7 +36,7 @@ index 0000000..992cf3c |
| 50 |
+uninstall-libffmpeg: |
| 51 |
+ $(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)" |
| 52 |
+ |
| 53 |
-+.PHONY: libffmpeg libffmpeg-* install-libffmpeg |
| 54 |
++.PHONY: libffmpeg install-libffmpeg uninstall-libffmpeg |
| 55 |
-- |
| 56 |
2.13.1 |
Archives