contrib/src/vpx/0001-force-detection-of-pthread-on-Windows.patch

+From 31d0b0f8b637ad92b505ba0b696721afb9a16c1a Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Tue, 14 Jan 2025 15:12:48 +0100
+Subject: [PATCH] force detection of pthread on Windows
+
+---
+ configure | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/configure b/configure
+index 97e78996e..84a6fa093 100755
+--- a/configure
++++ b/configure
+@@ -598,10 +598,6 @@ process_detect() {
+ 
+             # Specialize windows and POSIX environments.
+             case $toolchain in
+-                *-win*-*)
+-                    # Don't check for any headers in Windows builds.
+-                    false
+-                ;;
+                 *)
+                     case $header in
+                         pthread.h) true;;
+-- 
+2.43.0
+

contrib/src/vpx/rules.mak

@@ -3,7 +3,9 @@
 VPX_VERSION := 1.15.0
 VPX_URL := $(GITHUB)/webmproject/libvpx/archive/v${VPX_VERSION}.tar.gz
 
+ifneq ($(filter arm aarch64 i386 loongarch64 mipsel mips64el ppc64le x86_64, $(ARCH)),)
 PKGS += vpx
+endif
 ifeq ($(call need_pkg,"vpx >= 1.5.0"),)
 PKGS_FOUND += vpx
 endif
@@ -30,6 +32,8 @@ endif
 	# Disable automatic addition of -fembed-bitcode for iOS
 	# as it is enabled through --extra-cflags if necessary.
 	$(APPLY) $(SRC)/vpx/libvpx-remove-bitcode.patch
+	# make sure we can build when targetting Windows XP
+	$(APPLY) $(SRC)/vpx/0001-force-detection-of-pthread-on-Windows.patch
 	$(MOVE)
 
 DEPS_vpx =
@@ -62,14 +66,10 @@ else ifeq ($(ARCH),mips)
 VPX_ARCH := mips32
 else ifeq ($(ARCH),ppc)
 VPX_ARCH := ppc32
-else ifeq ($(ARCH),ppc64)
-VPX_ARCH := ppc64
-else ifeq ($(ARCH),sparc)
-VPX_ARCH := sparc
-else ifeq ($(ARCH),x86_64)
-VPX_ARCH := x86_64
 else ifeq ($(ARCH),aarch64)
 VPX_ARCH := arm64
+else
+VPX_ARCH := $(ARCH)
 endif
 
 ifdef HAVE_ANDROID
@@ -108,7 +108,9 @@ VPX_CONF := \
 	--disable-install-docs \
 	--disable-dependency-tracking \
 	--enable-vp9-highbitdepth \
-	--disable-tools
+	--disable-tools \
+	--target=$(VPX_TARGET) \
+	--prefix=$(PREFIX)
 
 ifneq ($(filter arm aarch64, $(ARCH)),)
 # Only enable runtime cpu detect on architectures other than arm/aarch64
@@ -120,22 +122,26 @@ endif
 endif
 endif
 
+VPX_CFLAGS=$(CFLAGS)
+
 ifndef BUILD_ENCODERS
 VPX_CONF += --disable-vp8-encoder --disable-vp9-encoder
 endif
 
+ifeq ($(ARCH),i386)
+VPX_CFLAGS += -mstackrealign
+endif
+
 ifndef HAVE_WIN32
 VPX_CONF += --enable-pic
 else
-VPX_CONF += --extra-cflags="-mstackrealign"
 ifeq ($(ARCH),arm)
 # As of libvpx 1.14.0 we have to explicitly disable runtime CPU detection for Windows armv7
 VPX_CONF += --disable-runtime-cpu-detect
 endif
 endif
 ifdef HAVE_DARWIN_OS
-VPX_CONF += --enable-vp8-decoder --disable-tools
-VPX_CONF += --extra-cflags="$(CFLAGS) $(EXTRA_CFLAGS)"
+VPX_CONF += --enable-vp8-decoder
 ifdef HAVE_IOS
 ifeq ($(ARCH),arm)
 # As of libvpx 1.14.0 we have to explicitly disable runtime CPU detection for iOS arm7
@@ -150,9 +156,12 @@ VPX_LDFLAGS += -arch $(PLATFORM_SHORT_ARCH)
 endif
 
 ifndef WITH_OPTIMIZATION
-VPX_CONF += --enable-debug --disable-optimizations
+VPX_CONF += --disable-optimizations
 endif
 
+# Always enable debug symbols, we strip in the final executables if needed
+VPX_CONF += --enable-debug
+
 ifdef HAVE_ANDROID
 # Starting NDK19, standalone toolchains are deprecated and gcc is not shipped.
 # The presence of gcc can be used to detect if we are using an old standalone
@@ -163,11 +172,13 @@ VPX_HOSTVARS = $(HOSTVARS)
 endif
 endif
 
+VPX_CONF += --extra-cflags="$(VPX_CFLAGS)"
+
 .vpx: libvpx
 	rm -rf $(PREFIX)/include/vpx
-	cd $< && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) ./configure --target=$(VPX_TARGET) \
-		$(VPX_CONF) --prefix=$(PREFIX)
-	cd $< && $(MAKE)
-	$(call pkg_static,"vpx.pc")
-	cd $< && $(MAKE) install
+	$(MAKEBUILDDIR)
+	cd $(BUILD_DIR) && LDFLAGS="$(VPX_LDFLAGS)" CROSS=$(VPX_CROSS) $(VPX_HOSTVARS) $(BUILD_SRC)/configure $(VPX_CONF)
+	+CONFIG_DEBUG=1 $(MAKEBUILD)
+	$(call pkg_static,"_build/vpx.pc")
+	+CONFIG_DEBUG=1 $(MAKEBUILD) install
 	touch $@