X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=contrib%2Fsrc%2Fffmpeg%2Frules.mak;h=628f60695c6ace358686e3e167287ebdc7574ffc;hb=c1223539332b016c6b3450f611b6f7bade879454;hp=3516b7a2233d454bca0d2c925a0284c2b235f632;hpb=ba2d5efe17fd664fb3cd356a09782db31a42ee79;p=vlc

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 3516b7a223..628f60695c 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -14,8 +14,8 @@ endif
 
 FFMPEGCONF = \
 	--cc="$(CC)" \
+	--pkg-config="$(PKG_CONFIG)" \
 	--disable-doc \
-	--disable-decoder=bink \
 	--disable-encoder=vorbis \
 	--enable-libgsm \
 	--enable-libopenjpeg \
@@ -26,7 +26,6 @@ FFMPEGCONF = \
 	--disable-filters \
 	--disable-bsfs \
 	--disable-bzlib \
-	--disable-programs \
 	--disable-avresample
 
 ifdef USE_FFMPEG
@@ -59,7 +58,7 @@ endif
 endif
 
 ifdef HAVE_CROSS_COMPILE
-FFMPEGCONF += --enable-cross-compile
+FFMPEGCONF += --enable-cross-compile --disable-programs
 ifndef HAVE_DARWIN_OS
 FFMPEGCONF += --cross-prefix=$(HOST)-
 endif
@@ -67,9 +66,7 @@ endif
 
 # ARM stuff
 ifeq ($(ARCH),arm)
-ifndef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=arm
-endif
 ifdef HAVE_NEON
 FFMPEGCONF += --enable-neon
 endif
@@ -81,6 +78,11 @@ FFMPEGCONF += --cpu=armv6 --disable-neon
 endif
 endif
 
+# ARM64 stuff
+ifeq ($(ARCH),aarch64)
+FFMPEGCONF += --arch=aarch64
+endif
+
 # MIPS stuff
 ifeq ($(ARCH),mipsel)
 FFMPEGCONF += --arch=mips
@@ -93,21 +95,32 @@ FFMPEGCONF += --arch=x86
 endif
 endif
 
+# x86_64 stuff
+ifeq ($(ARCH),x86_64)
+ifndef HAVE_DARWIN_OS
+FFMPEGCONF += --arch=x86_64
+endif
+endif
+
 # Darwin
 ifdef HAVE_DARWIN_OS
 FFMPEGCONF += --arch=$(ARCH) --target-os=darwin
+ifdef USE_FFMPEG
+FFMPEGCONF += --disable-lzma
+endif
 ifeq ($(ARCH),x86_64)
 FFMPEGCONF += --cpu=core2
 endif
-endif
 ifdef HAVE_IOS
-ifeq ($(ARCH),arm)
-FFMPEGCONF += --enable-pic --as="$(AS)"
+FFMPEGCONF += --enable-pic --extra-ldflags="$(EXTRA_CFLAGS)"
+ifdef HAVE_NEON
+FFMPEGCONF += --as="$(AS)"
 endif
 endif
 ifdef HAVE_MACOSX
 FFMPEGCONF += --enable-vda
 endif
+endif
 
 # Linux
 ifdef HAVE_LINUX
@@ -134,12 +147,22 @@ else # !Windows
 FFMPEGCONF += --enable-pthreads
 endif
 
+# Solaris
+ifdef HAVE_SOLARIS
+ifeq ($(ARCH),x86_64)
+FFMPEGCONF += --cpu=core2
+endif
+FFMPEGCONF += --target-os=sunos --enable-pic
+endif
+
 # Build
 PKGS += ffmpeg
 ifeq ($(call need_pkg,"libavcodec >= 54.25.0 libavformat >= 53.21.0 libswscale"),)
 PKGS_FOUND += ffmpeg
 endif
 
+FFMPEGCONF += --nm="$(NM)" --ar="$(AR)"
+
 $(TARBALLS)/ffmpeg-$(HASH).tar.gz:
 	$(call download,$(FFMPEG_SNAPURL))
 
@@ -150,7 +173,7 @@ $(TARBALLS)/ffmpeg-$(HASH).tar.gz:
 ffmpeg: ffmpeg-$(HASH).tar.gz .sum-ffmpeg
 	rm -Rf $@ $@-$(HASH)
 	mkdir -p $@-$(HASH)
-	$(ZCAT) "$<" | (cd $@-$(HASH) && tar xv --strip-components=1)
+	$(XZCAT) "$<" | (cd $@-$(HASH) && tar xv --strip-components=1)
 	$(MOVE)
 
 .ffmpeg: ffmpeg