commit: 4ee1f92d3a83a75687e14feb178eb5748d9a0957 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Jan 18 22:00:00 2018 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Jan 18 22:01:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ee1f92d
media-video/ffmpeg: Revert chromium.patch change and add -r1 for 9999 My change to fix 9999 in 31be70b4de8dc1f3627765a4a35a4b5cf90a170f broke all versions when ffmpeg is not already installed. I have reverted this change for earlier versions and introduced a new patch with a different approach for 9999. Closes: https://bugs.gentoo.org/643750 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +- media-video/ffmpeg/files/{chromium.patch => chromium-r1.patch} | 2 +- media-video/ffmpeg/files/chromium.patch | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index f78260745ad..bae322e21e7 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -291,7 +291,7 @@ RESTRICT=" S=${WORKDIR}/${P/_/-} PATCHES=( - "${FILESDIR}"/chromium.patch + "${FILESDIR}"/chromium-r1.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/chromium.patch b/media-video/ffmpeg/files/chromium-r1.patch similarity index 94% copy from media-video/ffmpeg/files/chromium.patch copy to media-video/ffmpeg/files/chromium-r1.patch index 307f31f4a3a..cfe06a7aec8 100644 --- a/media-video/ffmpeg/files/chromium.patch +++ b/media-video/ffmpeg/files/chromium-r1.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 $(FF_EXTRALIBS) ++ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(EXTRALIBS-avcodec) $(EXTRALIBS-avformat) $(EXTRALIBS-avutil) $(EXTRALIBS-swresample) + +libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF) + $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil diff --git a/media-video/ffmpeg/files/chromium.patch b/media-video/ffmpeg/files/chromium.patch index 307f31f4a3a..60a3e5d6cb9 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 $(FF_EXTRALIBS) ++ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(FFEXTRALIBS) + +libffmpeg-yes: libavcodec/$(SLIBPREF)avcodec$(SLIBSUF) libavformat/$(SLIBPREF)avformat$(SLIBSUF) libavutil/$(SLIBPREF)avutil$(SLIBSUF) + $(LIBFFMPEG_LINK) -Wl,--no-as-needed -lavcodec -lavformat -lavutil
