diff options
| author | Damiano Galassi <[email protected]> | 2021-01-23 18:56:10 +0100 |
|---|---|---|
| committer | Damiano Galassi <[email protected]> | 2021-01-23 19:00:27 +0100 |
| commit | 581f60136ad0c68b8849cd0b6f9331cf1283cb5c (patch) | |
| tree | 6f744caebd526953e17b6d6418d0d5009234193a /contrib/ffmpeg | |
| parent | 00beb1c9b8decd7c58cafc95cd7a99a707d66a2c (diff) | |
contrib: add zimg.
Diffstat (limited to 'contrib/ffmpeg')
| -rw-r--r-- | contrib/ffmpeg/module.defs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs index ebddcf19a..4bee8a574 100644 --- a/contrib/ffmpeg/module.defs +++ b/contrib/ffmpeg/module.defs @@ -1,4 +1,4 @@ -__deps__ := BZIP2 ZLIB FDKAAC LIBDAV1D LIBVPX LAME LIBOPUS LIBSPEEX XZ +__deps__ := BZIP2 ZLIB FDKAAC LIBDAV1D LIBVPX LAME LIBOPUS LIBSPEEX XZ ZIMG ifeq (1,$(FEATURE.qsv)) __deps__ += LIBMFX endif @@ -34,6 +34,7 @@ FFMPEG.CONFIGURE.extra = \ --disable-avdevice \ --disable-muxers \ --disable-network \ + --enable-libzimg \ --disable-hwaccels \ --disable-vdpau \ --disable-encoders \ @@ -58,7 +59,7 @@ FFMPEG.CONFIGURE.extra = \ --enable-libdav1d \ --enable-decoder=libdav1d \ --cc="$(FFMPEG.GCC.gcc)" \ - --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)" + --extra-ldflags="$(call fn.ARGS,FFMPEG.GCC,*archs *sysroot *minver ?extra) -L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(FFMPEG.GCC.args.extra-ldflags)" ifeq (size-aggressive,$(GCC.O)) FFMPEG.CONFIGURE.extra += \ @@ -111,8 +112,14 @@ else ifeq (1-mingw,$(HOST.cross)-$(HOST.system)) --target-os=mingw32 \ --arch=$(HOST.machine) \ --cross-prefix=$(HOST.cross.prefix) \ - --pkg-config=$(PKGCONFIG.exe) + --pkg-config=$(PKGCONFIG.exe) \ + --pkg-config-flags="--static" FFMPEG.GCC.args.extra += -fno-common + FFMPEG.GCC.args.extra-ldflags = -static-libgcc -static-libstdc++ -static +else ifeq (darwin,$(HOST.system)) + FFMPEG.GCC.args.extra-ldflags = -lc++ +else + FFMPEG.CONFIGURE.extra += --extra-libs="-lm -lstdc++" endif ifneq (none,$(FFMPEG.GCC.g)) |