Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg-4.0.3:ver.bump

Browse Source
This commit is contained in:
Rmys
2018-12-22 14:03:15 +03:00
parent 889946fd01
commit e55c437500
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/video/ffmpeg/files/chromium.patch
+12 -6
View File
@@ -9,17 +9,23 @@ new file mode 100644
index 0000000..992cf3c index 0000000..992cf3c
--- /dev/null --- /dev/null
+++ b/ffbuild/libffmpeg.mak +++ b/ffbuild/libffmpeg.mak
@@ -0,0 +1,21 @@ @@ -0,0 +1,27 @@
+LIBFFMPEG = $(SLIBPREF)ffmpeg$(SLIBSUF) +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_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) +ifeq ($(CONFIG_SHARED),yes)
+ $(LIBFFMPEG_LINK) -Wl,--whole-archive $^ -Wl,--no-whole-archive $(FFEXTRALIBS) +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 + $(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) +libffmpeg: $(LIBFFMPEG)
+ +
+install-libffmpeg: $(LIBFFMPEG) +install-libffmpeg: $(LIBFFMPEG)
@@ -30,6 +36,6 @@ index 0000000..992cf3c
+uninstall-libffmpeg: +uninstall-libffmpeg:
+ $(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)" + $(RM) "$(SHLIBDIR)/chromium/$(LIBFFMPEG)"
+ +
+.PHONY: libffmpeg libffmpeg-* install-libffmpeg +.PHONY: libffmpeg install-libffmpeg uninstall-libffmpeg
-- --
2.13.1 2.13.1
multimedia/video/ffmpeg/pspec.xml
+8 -1
View File
@@ -15,7 +15,7 @@
<IsA>app:console</IsA> <IsA>app:console</IsA>
<Summary>A command-line tool to record, convert and stream audio and video</Summary> <Summary>A command-line tool to record, convert and stream audio and video</Summary>
<Description>FFmpeg is a complete solution to record, convert and stream audio and video.</Description> <Description>FFmpeg is a complete solution to record, convert and stream audio and video.</Description>
<Archive sha1sum="cb2d672a0c08607658175fc21e3d7d10e82a52d4" type="targz">https://ffmpeg.org/releases/ffmpeg-4.0.tar.gz</Archive> <Archive sha1sum="abe03f656d59af589eb20890e7c20e946354f80b" type="targz">https://ffmpeg.org/releases/ffmpeg-4.0.3.tar.gz</Archive>
<BuildDependencies> <BuildDependencies>
<Dependency>freetype-devel</Dependency> <Dependency>freetype-devel</Dependency>
<Dependency>faac-devel</Dependency> <Dependency>faac-devel</Dependency>
@@ -129,6 +129,13 @@
<History> <History>
<Update release="12">
<Date>2018-12-22</Date>
<Version>4.0.3</Version>
<Comment>Rebuild.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="11"> <Update release="11">
<Date>2018-08-03</Date> <Date>2018-08-03</Date>
<Version>4.0</Version> <Version>4.0</Version>