[vlc-commits] [Git][videolan/vlc][master] 3 commits: contrib: wine-headers: remove header replacement for mingw-w64 7 and below

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
c386be48 by Steve Lhomme at 2026-01-26T08:02:44+00:00
contrib: wine-headers: remove header replacement for mingw-w64 7 and below

The minimum mingw-w64 toolchain that anyone can get on Debian [^1] and Ubuntu [^2]
is mingw-w64 v8. We don't need to support older versions.

[^1]: https://packages.debian.org/bullseye/mingw-w64
[^2]: https://packages.ubuntu.com/en/jammy/mingw-w64

- - - - -
19bf280a by Steve Lhomme at 2026-01-26T08:02:44+00:00
contrib: remove unused WIDL tool

If we ever need it, it can be brought back.

- - - - -
90051287 by Steve Lhomme at 2026-01-26T08:02:44+00:00
package/win32: remove unused WIDL command

It was used by contribs and npapi before. In both cases they were using
a (triplet)-widl version by default.

- - - - -


5 changed files:

- contrib/src/ffmpeg/rules.mak
- contrib/src/main.mak
- − contrib/src/wine-headers/SHA512SUMS
- − contrib/src/wine-headers/rules.mak
- extras/package/win32/build.sh


Changes:

=====================================
contrib/src/ffmpeg/rules.mak
=====================================
@@ -169,7 +169,7 @@ endif
 # Windows
 ifdef HAVE_WIN32
 ifndef HAVE_VISUALSTUDIO
-DEPS_ffmpeg += wine-headers $(DEPS_wine-headers) mingw12-fixes $(DEPS_mingw12-fixes) d3d12 $(DEPS_d3d12)
+DEPS_ffmpeg += mingw12-fixes $(DEPS_mingw12-fixes) d3d12 $(DEPS_d3d12)
 endif
 FFMPEGCONF += --target-os=mingw32
 FFMPEGCONF += --enable-w32threads


=====================================
contrib/src/main.mak
=====================================
@@ -93,7 +93,6 @@ else
 RANLIB ?= $(MAYBEHOST)ranlib
 endif
 STRIP ?= $(MAYBEHOST)strip
-WIDL ?= $(MAYBEHOST)widl
 WINDRES ?= $(MAYBEHOST)windres
 
 ifdef HAVE_ANDROID


=====================================
contrib/src/wine-headers/SHA512SUMS deleted
=====================================
@@ -1 +0,0 @@
-7e1a16873f1a160960e44a38c7af743ea3a10bc545c5724745733d14093188134b74a4f60fbc54f38546b0ed053209b67e35ea131a9cda58ec8041855100c5ee  wine-6.13.tar.xz


=====================================
contrib/src/wine-headers/rules.mak deleted
=====================================
@@ -1,43 +0,0 @@
-# WINE
-WINE_VERSION := 6.13
-WINE_URL := https://dl.winehq.org/wine/source/6.x/wine-$(WINE_VERSION).tar.xz
-
-ifdef HAVE_WIN32
-PKGS += wine-headers
-endif
-ifeq ($(call mingw_at_least, 8), true)
-PKGS_FOUND += wine-headers
-endif
-
-# Order is important since *_(n).idl will depends on *_(n-1).idl
-WINE_IDL_HEADERS = \
-	d3d11.idl \
-	d3d11_1.idl d3d11_2.idl d3d11_3.idl d3d11_4.idl \
-	dxgicommon.idl dxgitype.idl dxgiformat.idl \
-	dxgidebug.idl \
-	dxgi.idl dxgi1_2.idl dxgi1_3.idl dxgi1_4.idl dxgi1_5.idl dxgi1_6.idl \
-	dxva2api.idl
-
-$(TARBALLS)/wine-$(WINE_VERSION).tar.xz:
-	$(call download_pkg,$(WINE_URL),wine)
-
-.sum-wine-headers: wine-$(WINE_VERSION).tar.xz
-
-wine-headers: wine-$(WINE_VERSION).tar.xz .sum-wine-headers
-	$(UNPACK)
-	$(MOVE)
-
-wine_widl = echo "GEN $(1)" && \
-	$(WIDL) -DBOOL=WINBOOL $(3) \
-	-I$(PREFIX)/include -Iwine-headers/idl-include \
-	-I`echo $(MSYSTEM) | tr A-Z a-z`/$(BUILD)/include -h \
-	-o "$(PREFIX)/include/$(1)" "wine-headers/idl-include/$(2)"
-
-.wine-headers: wine-headers
-	@mkdir -p $(PREFIX)/include
-	@mkdir -p wine-headers/idl-include
-	@cp wine-headers/include/*.idl  wine-headers/idl-include # be sure to not use .h from the wine project
-	@for header in $(WINE_IDL_HEADERS); do \
-		$(call wine_widl,"`basename $$header idl`h",$$header,); \
-	done
-	touch $@


=====================================
extras/package/win32/build.sh
=====================================
@@ -273,7 +273,6 @@ VLC_LDFLAGS="$LDFLAGS"
 unset LDFLAGS
 
 if [ -n "$BUILD_UCRT" ]; then
-    WIDL=${TRIPLET}-widl
     VLC_CPPFLAGS="$VLC_CPPFLAGS -D__MSVCRT_VERSION__=0xE00 -D_UCRT"
 
     if [ -n "$WINSTORE" ]; then



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/cbe090a32d38b9ad5596c7a3fb1739a44e2f3fa0...900512878397fb56e7c4dce655e1b28b05ad0816

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


VideoLAN code repository instance