[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: contrib: caca: force recognition of all sprint variants tested on Windows

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch 3.0.x at VideoLAN / VLC


Commits:
92dd4ae3 by Steve Lhomme at 2025-12-08T15:50:50+01:00
contrib: caca: force recognition of all sprint variants tested on Windows

The built-in in some mingw-w64 variants require linking for kernel32.

configure:18427: i686-w64-mingw32-gcc -o conftest.exe -D__MSVCRT_VERSION__=0x700 -D_WIN32_WINNT=0x0502 -DWINVER=0x0502  -I/home/videolan/vlc/contrib/i686-w64-mingw32/include -g -O0 -D__MSVCRT_VERSION__=0x700 -D_WIN32_WINNT=0x0502 -DWINVER=0x0502 -I/home/videolan/vlc/contrib/i686-w64-mingw32/include -DCACA_STATIC  -L/home/videolan/vlc/contrib/i686-w64-mingw32/lib  conftest.c  >&5
conftest.c:47:6: warning: conflicting types for built-in function 'vsnprintf'
 char vsnprintf ();
      ^~~~~~~~~
/opt/gcc-i686-w64-mingw32/lib/gcc/i686-w64-mingw32/6.4.0/../../../../i686-w64-mingw32/lib/../lib/libmsvcrt.a(lib32_libmsvcrt_extra_a-_vscprintf.o): In function `_mingw_get_msvcrt_handle':
/build/mingw-w64/mingw-w64-crt/build/../include/msvcrt.h:9: undefined reference to `_imp__GetModuleHandleW at 4'
collect2: error: ld returned 1 exit status
configure:18427: $? = 1

- - - - -
841640c3 by Steve Lhomme at 2025-12-08T15:50:50+01:00
CI: update gcc windows images with wine compatible with the contrib Wix

Fixes #29489

- - - - -


2 changed files:

- contrib/src/caca/rules.mak
- extras/ci/gitlab-ci.yml


Changes:

=====================================
contrib/src/caca/rules.mak
=====================================
@@ -47,7 +47,9 @@ CACA_CONF += --disable-x11
 endif
 ifdef HAVE_WIN32
 CACA_CONF += --disable-ncurses \
+    ac_cv_func_sprintf=yes \
     ac_cv_func_vsnprintf_s=yes \
+    ac_cv_func_vsnprintf=yes \
     ac_cv_func_sprintf_s=yes
 endif
 ifdef HAVE_LINUX


=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -13,8 +13,8 @@ default:
     interruptible: true
 
 variables:
-    VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32-3.0:20251205143621
-    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-3.0:20251205143621
+    VLC_WIN32_IMAGE: registry.videolan.org/vlc-debian-win32-3.0:20251208092116
+    VLC_WIN64_IMAGE: registry.videolan.org/vlc-debian-win64-3.0:20251208092116
     VLC_UWP_LLVM_IMAGE: registry.videolan.org/vlc-debian-llvm-uwp:20211020111246
     VLC_WIN_LLVM_UCRT_IMAGE: registry.videolan.org/vlc-debian-llvm-ucrt:20250903131032
     VLC_DEBIAN_IMAGE: registry.videolan.org/vlc-debian-unstable:20200229201904



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/be17eee393bdef371d7aa3965f971986dabdfebd...841640c3031113bc3d2d1f177c7996a01a40813e

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/be17eee393bdef371d7aa3965f971986dabdfebd...841640c3031113bc3d2d1f177c7996a01a40813e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance