diff --git a/multimedia/video/ffmpeg/files/chromium.patch b/multimedia/video/ffmpeg/files/chromium.patch index 6f4b80a42b..df9a0a2931 100644 --- a/multimedia/video/ffmpeg/files/chromium.patch +++ b/multimedia/video/ffmpeg/files/chromium.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 $(FFEXTRALIBS) ++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,6 +36,6 @@ index 0000000..992cf3c +uninstall-libffmpeg: + $(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)" + -+.PHONY: libffmpeg libffmpeg-* install-libffmpeg ++.PHONY: libffmpeg install-libffmpeg uninstall-libffmpeg -- 2.13.1 diff --git a/multimedia/video/ffmpeg/pspec.xml b/multimedia/video/ffmpeg/pspec.xml index 9fb82c9974..33f425f014 100644 --- a/multimedia/video/ffmpeg/pspec.xml +++ b/multimedia/video/ffmpeg/pspec.xml @@ -15,7 +15,7 @@ app:console A command-line tool to record, convert and stream audio and video FFmpeg is a complete solution to record, convert and stream audio and video. - https://ffmpeg.org/releases/ffmpeg-4.0.tar.gz + https://ffmpeg.org/releases/ffmpeg-4.0.3.tar.gz freetype-devel faac-devel @@ -129,6 +129,13 @@ + + 2018-12-22 + 4.0.3 + Rebuild. + Mustafa Cinasal + muscnsl@gmail.com + 2018-08-03 4.0