[vlc-commits] [Git][videolan/vlc][3.0.x] 5 commits: contrib: aom: do not force _WIN32_WINNT

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch 3.0.x at VideoLAN / VLC


Commits:
7fa4ab64 by Steve Lhomme at 2026-07-22T16:03:29+00:00
contrib: aom: do not force _WIN32_WINNT

Either it's set in the environment or the user wants to use the toolchain default.
If a minimum version is required it should be checked there, not in the code when
we force this value.

- - - - -
5c3d56f1 by Steve Lhomme at 2026-07-22T16:03:29+00:00
contrib: aom: disable InitOnceBeginInitialize call

It's not compatible with XP and fails to link properly.

- - - - -
c12a1d5c by Steve Lhomme at 2026-07-22T16:03:29+00:00
contrib: caca: do not builds tools/examples

- - - - -
8ac2bf83 by Steve Lhomme at 2026-07-22T16:03:29+00:00
CI: update vlc-debian-llvm-ucrt to a newer version with zstd

- - - - -
7447cdc0 by Steve Lhomme at 2026-07-22T16:03:29+00:00
CI: update windows Docker images to have zstd prebuilt

>From https://code.videolan.org/videolan/docker-images/-/merge_requests/380

- - - - -


4 changed files:

- + contrib/src/aom/0001-Do-not-force-_WIN32_WINNT.patch
- contrib/src/aom/rules.mak
- contrib/src/caca/rules.mak
- extras/ci/gitlab-ci.yml


Changes:

=====================================
contrib/src/aom/0001-Do-not-force-_WIN32_WINNT.patch
=====================================
@@ -0,0 +1,30 @@
+From 40d944066622f2e7dc07e475caba38efbef311a1 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at videolan.org>
+Date: Mon, 20 Jul 2026 10:36:22 +0200
+Subject: [PATCH] Do not force _WIN32_WINNT
+
+Either it's set in the environment or the user wants to use the toolchain default.
+If a minimum version is required it should be checked there, not in the code when
+we force this value.
+
+Change-Id: I47400eadc5c2e0dcee874e932a99e6c987ddf5c9
+---
+ cmake/aom_configure.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/aom_configure.cmake b/cmake/aom_configure.cmake
+index d5cd4db55b..39d77a4aae 100644
+--- a/cmake/aom_configure.cmake
++++ b/cmake/aom_configure.cmake
+@@ -244,7 +244,7 @@ endif()
+ if(AOM_TARGET_SYSTEM STREQUAL "Windows")
+   # The default _WIN32_WINNT value in MinGW is 0x0502 (Windows XP with SP2). Set
+   # it to 0x0601 (Windows 7).
+-  add_compiler_flag_if_supported("-D_WIN32_WINNT=0x0601")
++  # add_compiler_flag_if_supported("-D_WIN32_WINNT=0x0601")
+   # Quiet warnings related to fopen, printf, etc.
+   add_compiler_flag_if_supported("-D_CRT_SECURE_NO_WARNINGS")
+ endif()
+-- 
+2.52.0.windows.1
+


=====================================
contrib/src/aom/rules.mak
=====================================
@@ -14,6 +14,11 @@ $(TARBALLS)/libaom-$(AOM_VERSION).tar.gz:
 
 aom: libaom-$(AOM_VERSION).tar.gz .sum-aom
 	$(UNPACK)
+	$(APPLY) $(SRC)/aom/0001-Do-not-force-_WIN32_WINNT.patch
+ifndef HAVE_WINSTORE
+	# disable Windows InitOnceBeginInitialize not compatible with XP
+	sed -i.orig 's,defined(_WIN32),0,' $(UNPACK_DIR)/aom_ports/aom_once.h
+endif
 	$(MOVE)
 
 DEPS_aom =


=====================================
contrib/src/caca/rules.mak
=====================================
@@ -70,6 +70,6 @@ CACA_CONF += \
 .caca: caca
 	$(MAKEBUILDDIR)
 	$(MAKECONFIGURE) $(CACA_CONF)
-	+$(MAKEBUILD) -C $<
-	+$(MAKEBUILD) -C $< install
+	+$(MAKEBUILD) -C $< noinst_PROGRAMS= bin_PROGRAMS=
+	+$(MAKEBUILD) -C $< noinst_PROGRAMS= bin_PROGRAMS= install
 	touch $@


=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -15,10 +15,10 @@ default:
 
 variables:
     FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: "true"
-    VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32-3.0:20260504124015
-    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-3.0:20260504124015
+    VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32-3.0:20260721134159
+    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-3.0:20260721134159
     VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20211020111246
-    VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20251223015425
+    VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20260611225331
     VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20200229201904
     VLC_DEBIAN_QT6_IMAGE: registry.videolan.org/vlc-debian-unstable:20260121072258
     VLC_ANDROID_IMAGE: registry.videolan.org/vlc-debian-android-3.0:20260701183656



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/29996944eccc47165ac6ca06ad97dce557adde2a...7447cdc03a255a1c4d5b7b8311281938c550dd8b

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/29996944eccc47165ac6ca06ad97dce557adde2a...7447cdc03a255a1c4d5b7b8311281938c550dd8b
You're receiving this email because of your account on code.videolan.org. Manage all notifications: https://code.videolan.org/-/profile/notifications | Help: https://code.videolan.org/help