summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Le Cuirot <chewi@gentoo.org>2017-12-19 23:42:15 +0000
committerJames Le Cuirot <chewi@gentoo.org>2017-12-19 23:42:15 +0000
commit31be70b4de8dc1f3627765a4a35a4b5cf90a170f (patch)
tree7f65a0136065d601999b43d2839f7d66755d0244 /media-video/ffmpeg
parentapp-admin/radmind: add dev-util/repo blocker (diff)
downloadgentoo-31be70b4de8dc1f3627765a4a35a4b5cf90a170f.tar.gz
gentoo-31be70b4de8dc1f3627765a4a35a4b5cf90a170f.tar.bz2
gentoo-31be70b4de8dc1f3627765a4a35a4b5cf90a170f.zip
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
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/files/chromium.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/media-video/ffmpeg/files/chromium.patch b/media-video/ffmpeg/files/chromium.patch
index 60a3e5d6cb99..307f31f4a3a5 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