commit:     31be70b4de8dc1f3627765a4a35a4b5cf90a170f
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 19 23:42:15 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Dec 19 23:42:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31be70b4

media-video/ffmpeg: Fix chromium build in 9999

Some libraries were missing from the final link. This just involved
referencing FF_EXTRALIBS instead of FFEXTRALIBS. Also tested with
3.3.3.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-video/ffmpeg/files/chromium.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/files/chromium.patch 
b/media-video/ffmpeg/files/chromium.patch
index 60a3e5d6cb9..307f31f4a3a 100644
--- a/media-video/ffmpeg/files/chromium.patch
+++ b/media-video/ffmpeg/files/chromium.patch
@@ -14,7 +14,7 @@ index 0000000..992cf3c
 +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)
 +
 +libffmpeg-: libavcodec/$(LIBPREF)avcodec$(LIBSUF) 
libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) 
libswresample/$(LIBPREF)swresample$(LIBSUF)
-+      $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive 
$(FFEXTRALIBS)
++      $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive 
$(FF_EXTRALIBS)
 +
 +libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) 
libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
 +      $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil

Reply via email to