contrib/src/ffmpeg/rules.mak

@@ -239,9 +239,7 @@ $(TARBALLS)/ffmpeg-$(FFMPEG_VERSION).tar.xz:
 .sum-ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.xz
 
 ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.xz .sum-ffmpeg
-	rm -Rf $@ $@-$(FFMPEG_VERSION)
-	mkdir -p $@-$(FFMPEG_VERSION)
-	tar xvJfo "$<" --strip-components=1 -C $@-$(FFMPEG_VERSION)
+	$(UNPACK)
 ifdef USE_FFMPEG
 	$(APPLY) $(SRC)/ffmpeg/armv7_fixup.patch
 	$(APPLY) $(SRC)/ffmpeg/dxva_vc1_crash.patch

contrib/src/x262/rules.mak

+# x262
+
+X262_GITURL := git://git.videolan.org/x262.git
+X262_HASH := bb887aa4c0a4da955524aa220b62998c3b50504e
+
+# ifdef BUILD_ENCODERS
+# ifdef GPL
+# PKGS += x262
+# endif
+# endif
+
+#ifeq ($(call need_pkg,"x262"),)
+#PKGS_FOUND += x262
+#endif
+
+$(TARBALLS)/x262-git.tar.xz:
+	$(call download_git,$(X262_GITURL),,$(X262_HASH))
+
+.sum-x262: $(TARBALLS)/x262-git.tar.xz
+	$(call check_githash,$(X262_HASH))
+	touch $@
+
+x262: $(TARBALLS)/x262-git.tar.xz .sum-x262
+	$(UNPACK)
+	$(UPDATE_AUTOCONFIG)
+	$(MOVE)
+
+.x262: x262
+	$(REQUIRE_GPL)
+	cd $< && sed -i -e 's/x264/x262/g' configure
+	cd $< && sed -i -e 's/x264_config/x262_config/g' *.h Makefile *.c
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(X264CONF)
+	cd $< && sed -i -e 's/x264.pc/x262.pc/g' Makefile
+	cd $< && sed -i -e 's/x264.h/x262.h/g' Makefile
+	cd $< && $(MAKE)
+	cd $< && cp x264.h x262.h
+	cd $< && $(MAKE) install
+	touch $@

contrib/src/x264/0001-configure-set-_FILE_OFFSET_BITS-to-detect-fseeko.patch

+From dc69fefa49726021d75e6a764357779a4b4d0800 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Mon, 22 Apr 2024 14:03:02 +0200
+Subject: [PATCH] configure: set _FILE_OFFSET_BITS to detect fseeko
+
+On Android fseeko is not detected properly if if _FILE_OFFSET_BITS is not set.
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index c1fb599f..60ad229b 100755
+--- a/configure
++++ b/configure
+@@ -1369,7 +1369,7 @@ if [ $SYS = WINDOWS -a $ARCH = X86 -a $compiler = GNU ] ; then
+     cc_check '' -fno-zero-initialized-in-bss && CFLAGS="$CFLAGS -fno-zero-initialized-in-bss"
+ fi
+ 
+-if cc_check "stdio.h" "" "fseeko(stdin,0,0);" ; then
++if cc_check "stdio.h" "#define _FILE_OFFSET_BITS 64" "fseeko(stdin,0,0);" ; then
+     define fseek fseeko
+     define ftell ftello
+ elif cc_check "stdio.h" "" "fseeko64(stdin,0,0);" ; then
+-- 
+2.37.3.windows.1
+

contrib/src/x264/0001-osdep-use-direct-path-to-internal-x264.h.patch

+From 2597083bc24f3d3172ecc4fc336face1fcc0c4e2 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Thu, 21 Sep 2023 11:44:40 +0200
+Subject: [PATCH] osdep: use direct path to internal x264.h
+
+This fixes issues when a previous x264.h is found in the include path.
+---
+ common/osdep.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/osdep.h b/common/osdep.h
+index dfa4aaec..f3cd5822 100644
+--- a/common/osdep.h
++++ b/common/osdep.h
+@@ -49,7 +49,7 @@
+ #include <io.h>
+ #endif
+ 
+-#include "x264.h"
++#include "../x264.h"
+ 
+ #if !HAVE_LOG2F
+ #define log2f(x) (logf(x)/0.693147180559945f)
+-- 
+2.38.1.windows.1
+

contrib/src/x264/rules.mak

 # x264
 
-X264_GITURL := git://git.videolan.org/x264.git
-X264_SNAPURL := http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180324-2245.tar.bz2
-X262_GITURL := git://git.videolan.org/x262.git
+X264_HASH := e067ab0b530395f90b578f6d05ab0a225e2efdf9
+X264_VERSION := $(X264_HASH)
+X264_GITURL := https://code.videolan.org/videolan/x264.git
 
 ifdef BUILD_ENCODERS
 ifdef GPL
@@ -18,14 +18,9 @@ ifeq ($(call need_pkg,"x264 >= 0.153"),)
 PKGS_FOUND += x26410b
 endif
 
-#ifeq ($(call need_pkg,"x262"),)
-#PKGS_FOUND += x262
-#endif
-
 PKGS_ALL += x26410b
 
-X264CONF = --prefix="$(PREFIX)" --host="$(HOST)" \
-	--enable-static \
+X264CONF = \
 	--disable-avs \
 	--disable-lavf \
 	--disable-cli \
@@ -39,90 +34,46 @@ X264CONF += --enable-win32thread
 else
 X264CONF += --disable-win32thread
 endif
-ifeq ($(ARCH), arm)
-X264_AS = AS="./tools/gas-preprocessor.pl -arch arm -as-type clang -force-thumb -- $(CC) -mimplicit-it=always"
-endif
-ifeq ($(ARCH),aarch64)
-# Configure defaults to gas-preprocessor + armasm64 for this target,
-# unless overridden.
-X264_AS = AS="$(CC)"
-endif
 endif
 ifdef HAVE_CROSS_COMPILE
 ifndef HAVE_DARWIN_OS
+ifdef HAVE_ANDROID
+X264CONF += --cross-prefix="$(subst ld,,$(LD))"
+else
 X264CONF += --cross-prefix="$(HOST)-"
 endif
+endif
 ifdef HAVE_ANDROID
 # broken text relocations
 ifeq ($(ANDROID_ABI), x86)
 X264CONF += --disable-asm
 endif
-ifeq ($(ANDROID_ABI), x86_64)
-X264CONF += --disable-asm
-endif
-endif
 endif
-ifdef HAVE_DARWIN_OS
-ifeq ($(ARCH),aarch64)
-X264CONF += --extra-asflags="-arch $(PLATFORM_SHORT_ARCH)"
 endif
-endif
-
-$(TARBALLS)/x262-git.tar.xz:
-	$(call download_git,$(X262_GITURL))
-
-$(TARBALLS)/x262-git.tar.gz:
-	$(call download,$(X262_SNAPURL))
 
-$(TARBALLS)/x264-git.tar.xz:
-	$(call download_git,$(X264_GITURL))
-
-$(TARBALLS)/x264-git.tar.bz2:
-	$(call download,$(X264_SNAPURL))
-
-.sum-x262: x262-git.tar.gz
-	$(warning $@ not implemented)
-	touch $@
+$(TARBALLS)/x264-$(X264_VERSION).tar.xz:
+	$(call download_git,$(X264_GITURL),,$(X264_HASH))
 
 .sum-x26410b: .sum-x264
 	touch $@
 
-.sum-x264: x264-git.tar.bz2
-	$(warning $@ not implemented)
+.sum-x264: x264-$(X264_VERSION).tar.xz
+	$(call check_githash,$(X264_VERSION))
 	touch $@
 
-x264 x26410b: %: x264-git.tar.bz2 .sum-%
-	rm -Rf $*-git
-	mkdir -p $*-git
-	tar xvjfo "$<" --strip-components=1 -C $*-git
-	$(UPDATE_AUTOCONFIG)
-	mv $*-git $*
-
-x262: x262-git.tar.gz .sum-x262
-	rm -Rf $@-git
-	mkdir -p $@-git
-	tar xvzfo "$<" --strip-components=1 -C $@-git
+x264 x26410b: %: x264-$(X264_VERSION).tar.xz .sum-%
+	$(UNPACK)
 	$(UPDATE_AUTOCONFIG)
+	$(APPLY) $(SRC)/x264/x264-winstore.patch
+	$(APPLY) $(SRC)/x264/0001-osdep-use-direct-path-to-internal-x264.h.patch
+	$(APPLY) $(SRC)/x264/0001-configure-set-_FILE_OFFSET_BITS-to-detect-fseeko.patch
 	$(MOVE)
 
-
 .x264: x264
 	$(REQUIRE_GPL)
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(X264_AS) $(X264CONF)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(X264CONF)
 	cd $< && $(MAKE) install
 	touch $@
 
 .x26410b: .x264
 	touch $@
-
-.x262: x262
-	$(REQUIRE_GPL)
-	cd $< && sed -i -e 's/x264/x262/g' configure
-	cd $< && sed -i -e 's/x264_config/x262_config/g' *.h Makefile *.c
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(X264CONF)
-	cd $< && sed -i -e 's/x264.pc/x262.pc/g' Makefile
-	cd $< && sed -i -e 's/x264.h/x262.h/g' Makefile
-	cd $< && $(MAKE)
-	cd $< && cp x264.h x262.h
-	cd $< && $(MAKE) install
-	touch $@

contrib/src/x264/x264-winstore.patch

+--- x264/configure.winstore	2019-03-07 12:42:19.238431200 +0100
++++ x264/configure	2019-03-07 12:42:30.238709600 +0100
+@@ -841,15 +841,15 @@ if [ $SYS = WINDOWS ]; then
+     fi
+ 
+     if cpp_check "winapifamily.h" "" "!WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)" ; then
+-        [ $compiler = CL ] || die "WinRT requires MSVC"
++        #~ [ $compiler = CL ] || die "WinRT requires MSVC"
+         define HAVE_WINRT
+-        CFLAGS="$CFLAGS -MD"
++        #~ CFLAGS="$CFLAGS -MD"
+         LDFLAGS="$LDFLAGS -appcontainer"
+         if ! cpp_check "" "" "defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x0603" ; then
+             die "_WIN32_WINNT must be defined to at least 0x0603 (Windows 8.1) for WinRT"
+-        elif cpp_check "" "" "_WIN32_WINNT >= 0x0A00" ; then
+-            # Universal Windows Platform (Windows 10)
+-            LDFLAGS="$LDFLAGS -lWindowsApp"
++        #~ elif cpp_check "" "" "_WIN32_WINNT >= 0x0A00" ; then
++            #~ # Universal Windows Platform (Windows 10)
++            #~ LDFLAGS="$LDFLAGS -lWindowsApp"
+         fi
+         cli="no"
+         opencl="no"