media-video/ffmpeg: Fix chromium-r1.patch to not link every time

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi@gentoo.org>

diff --git a/media-video/ffmpeg/files/chromium-r1.patch b/media-video/ffmpeg/files/chromium-r1.patch
index cfe06a7aec8d96981dc5237d7a8b826c754c1683..514780035bc0037209de330943d26d3879759008 100644 (file)
--- a/media-video/ffmpeg/files/chromium-r1.patch
+++ b/media-video/ffmpeg/files/chromium-r1.patch
@@ -9,17 +9,23 @@ new file mode 100644
 index 0000000..992cf3c
 --- /dev/null
 +++ b/ffbuild/libffmpeg.mak
-@@ -0,0 +1,21 @@
+@@ -0,0 +1,27 @@
 +LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF)
 +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 $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample)
++ifeq ($(CONFIG_SHARED),yes)
++LIBFFMPEG_DEPS = libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++else
++LIBFFMPEG_DEPS = libavcodec/$(LIBPREF)avcodec$(LIBSUF) libavformat/$(LIBPREF)avformat$(LIBSUF) libavutil/$(LIBPREF)avutil$(LIBSUF) libswresample/$(LIBPREF)swresample$(LIBSUF)
++endif
 +
-+libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF)
++$(LIBFFMPEG): $(LIBFFMPEG_DEPS)
++ifeq ($(CONFIG_SHARED),yes)
 +      $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
++else
++      $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample)
++endif
 +
-+$(LIBFFMPEG): libffmpeg-$(CONFIG_SHARED)
 +libffmpeg: $(LIBFFMPEG)
 +
 +install-libffmpeg: $(LIBFFMPEG)
@@ -30,7 +36,7 @@ index 0000000..992cf3c
 +uninstall-libffmpeg:
 +      $(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)"
 +
-+.PHONY: libffmpeg libffmpeg-* install-libffmpeg
++.PHONY: libffmpeg install-libffmpeg uninstall-libffmpeg
 -- 
 2.13.1