git: d37ed3532c21 - main - emulators/wine-devel: Update 11.3 => 11.4

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Wed, 11 Mar 2026 21:26:34 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d37ed3532c2107320dce2bf7949b867f038ea9e6

commit d37ed3532c2107320dce2bf7949b867f038ea9e6
Author:     Thibault Payet <monwarez@mailoo.org>
AuthorDate: 2026-03-11 21:26:06 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2026-03-11 21:26:06 +0000

    emulators/wine-devel: Update 11.3 => 11.4
    
    Changelog:
    - SAX reader reimplemented in MSXML.
    - Resampling optimizations in DirectSound.
    - Beginnings of a proper CFGMGR32 implementation.
    - Better Unix timezone matching.
    - Various bug fixes.
    https://gitlab.winehq.org/wine/wine/-/releases/wine-11.4
    
    Add support for libusb
    
    PR:     293722
---
 emulators/wine-devel/Makefile                      |  6 +--
 emulators/wine-devel/distinfo                      |  6 +--
 emulators/wine-devel/files/patch-configure.ac      | 45 ++++++++++++++++++++++
 .../files/patch-dlls_ntdll_unix_loader.c           |  6 +--
 emulators/wine-devel/pkg-plist                     | 14 +++++++
 5 files changed, 68 insertions(+), 9 deletions(-)

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index a31a42afe8fc..2982d0178a94 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wine
-DISTVERSION=	11.3
+DISTVERSION=	11.4
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/11.x/
@@ -22,7 +22,7 @@ FLAVORS=	default allaudio
 FLAVOR?=	default
 
 # Only devel/llvm17 and later come with necessary include files - PR274542
-USES=		bison cpe desktop-file-utils gmake llvm:min=17,build,noexport \
+USES=		autoreconf bison cpe desktop-file-utils gmake llvm:min=17,build,noexport \
 		localbase pkgconfig sdl shebangfix tar:xz
 CPE_VENDOR=	winehq
 USE_GCC=	yes
@@ -55,7 +55,7 @@ CONFIGURE_ARGS=	--verbose \
 		--with-sdl \
 		--without-udev \
 		--without-unwind \
-		--without-usb
+		--with-usb
 CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
 
 PIE_UNSAFE=	yes
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index d50ad6e92940..b93603118776 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1771683036
-SHA256 (wine-11.3.tar.xz) = bbe42158cfdc673280971e00c9be820b05816c8f6a568b80ae7829c06c455e24
-SIZE (wine-11.3.tar.xz) = 33238452
+TIMESTAMP = 1773085679
+SHA256 (wine-11.4.tar.xz) = 1970a46381d3bc2c44d651d08336370e499eeb8b53dc93cbd1ce544f7115e598
+SIZE (wine-11.4.tar.xz) = 33308984
diff --git a/emulators/wine-devel/files/patch-configure.ac b/emulators/wine-devel/files/patch-configure.ac
new file mode 100644
index 000000000000..7b398e5dfc1b
--- /dev/null
+++ b/emulators/wine-devel/files/patch-configure.ac
@@ -0,0 +1,45 @@
+--- configure.ac.orig	2026-03-06 20:41:46 UTC
++++ configure.ac
+@@ -1552,14 +1552,35 @@ then
+ dnl **** Check for libusb ****
+ if test "x$with_usb" != "xno"
+ then
+-    WINE_PACKAGE_FLAGS(USB,[libusb-1.0],[-lusb-1.0],,,
+-        [AC_CHECK_HEADER([libusb.h],
+-            [AC_CHECK_LIB(usb-1.0,libusb_interrupt_event_handler,[:],[USB_LIBS=""],[$USB_LIBS])],
+-            [USB_LIBS=""])])
++
++    case $host_os in
++      freebsd*)
++        WINE_PACKAGE_FLAGS(USB,[libusb-1.0],[-lusb],,,
++            [AC_CHECK_HEADER([libusb.h],
++                [AC_CHECK_LIB(usb,libusb_interrupt_event_handler,[:],[USB_LIBS=""],[$USB_LIBS])],
++                [USB_LIBS=""])])
++        ;;
++      *)
++        WINE_PACKAGE_FLAGS(USB,[libusb-1.0],[-lusb-1.0],,,
++            [AC_CHECK_HEADER([libusb.h],
++                [AC_CHECK_LIB(usb-1.0,libusb_interrupt_event_handler,[:],[USB_LIBS=""],[$USB_LIBS])],
++                [USB_LIBS=""])])
++        ;;
++    esac
++
+ fi
+-WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" != "yes"],
+-                 [libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported.],
+-                 [enable_wineusb_sys])
++case $host_os in
++    freebsd*)
++        WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_libusb_interrupt_event_handler" != "yes"],
++                         [libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported.],
++                         [enable_wineusb_sys])
++    ;;
++    *)
++        WINE_NOTICE_WITH(usb,[test "$ac_cv_lib_usb_1_0_libusb_interrupt_event_handler" != "yes"],
++                         [libusb-1.0 ${notice_platform}development files not found (or too old), USB devices won't be supported.],
++                         [enable_wineusb_sys])
++    ;;
++esac
+ 
+ dnl **** Check for libv4l2 ****
+ if test "x$with_v4l2" != "xno"
diff --git a/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c b/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c
index 793877fa1b17..d27fd512e95d 100644
--- a/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c
+++ b/emulators/wine-devel/files/patch-dlls_ntdll_unix_loader.c
@@ -1,6 +1,6 @@
---- dlls/ntdll/unix/loader.c.orig	2025-02-21 21:19:31 UTC
-+++ dlls/ntdll/unix/loader.c	2025-04-08 21:22:55 UTC
-@@ -503,6 +503,24 @@
+--- dlls/ntdll/unix/loader.c.orig	2026-03-06 20:41:46 UTC
++++ dlls/ntdll/unix/loader.c
+@@ -418,6 +418,24 @@ char *get_alternate_wineloader( WORD machine )
      BOOL force_wow64 = (arch = getenv( "WINEARCH" )) && !strcmp( arch, "wow64" );
      char *ret = NULL;
  
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index f041a8e05e18..de57b4941ae8 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -40,6 +40,7 @@ include/wine/msvcrt/conio.h
 include/wine/msvcrt/corecrt.h
 include/wine/msvcrt/corecrt_io.h
 include/wine/msvcrt/corecrt_malloc.h
+include/wine/msvcrt/corecrt_math_defines.h
 include/wine/msvcrt/corecrt_startup.h
 include/wine/msvcrt/corecrt_stdio_config.h
 include/wine/msvcrt/corecrt_wctype.h
@@ -72,6 +73,7 @@ include/wine/msvcrt/math.h
 include/wine/msvcrt/mbctype.h
 include/wine/msvcrt/mbstring.h
 include/wine/msvcrt/memory.h
+include/wine/msvcrt/new.h
 include/wine/msvcrt/process.h
 include/wine/msvcrt/search.h
 include/wine/msvcrt/setjmp.h
@@ -94,6 +96,9 @@ include/wine/msvcrt/time.h
 include/wine/msvcrt/uchar.h
 include/wine/msvcrt/unistd.h
 include/wine/msvcrt/vadefs.h
+include/wine/msvcrt/vcruntime_exception.h
+include/wine/msvcrt/vcruntime_new.h
+include/wine/msvcrt/vcruntime_typeinfo.h
 include/wine/msvcrt/wchar.h
 include/wine/msvcrt/wctype.h
 include/wine/svcctl.h
@@ -1205,6 +1210,8 @@ include/wine/windows/windows.graphics.directx.direct3d11.h
 include/wine/windows/windows.graphics.directx.direct3d11.idl
 include/wine/windows/windows.graphics.directx.h
 include/wine/windows/windows.graphics.directx.idl
+include/wine/windows/windows.graphics.display.h
+include/wine/windows/windows.graphics.display.idl
 include/wine/windows/windows.graphics.effects.h
 include/wine/windows/windows.graphics.effects.idl
 include/wine/windows/windows.graphics.h
@@ -1304,6 +1311,10 @@ include/wine/windows/windows.ui.input.h
 include/wine/windows/windows.ui.input.idl
 include/wine/windows/windows.ui.notifications.h
 include/wine/windows/windows.ui.notifications.idl
+include/wine/windows/windows.ui.text.core.h
+include/wine/windows/windows.ui.text.core.idl
+include/wine/windows/windows.ui.text.h
+include/wine/windows/windows.ui.text.idl
 include/wine/windows/windows.ui.viewmanagement.core.h
 include/wine/windows/windows.ui.viewmanagement.core.idl
 include/wine/windows/windows.ui.viewmanagement.h
@@ -1718,6 +1729,7 @@ lib/wine/%%WINEARCH%%-unix/winedmo.so
 %%OSS%%lib/wine/%%WINEARCH%%-unix/wineoss.so
 lib/wine/%%WINEARCH%%-unix/wineps.so
 %%PULSEAUDIO%%lib/wine/%%WINEARCH%%-unix/winepulse.so
+lib/wine/%%WINEARCH%%-unix/wineusb.so
 lib/wine/%%WINEARCH%%-unix/winevulkan.so
 %%WAYLAND%%lib/wine/%%WINEARCH%%-unix/winewayland.so
 %%X11%%lib/wine/%%WINEARCH%%-unix/winex11.so
@@ -2654,6 +2666,7 @@ lib/wine/%%WINEARCH%%-windows/windows.devices.usb.dll
 lib/wine/%%WINEARCH%%-windows/windows.gaming.input.dll
 lib/wine/%%WINEARCH%%-windows/windows.gaming.ui.gamebar.dll
 lib/wine/%%WINEARCH%%-windows/windows.globalization.dll
+lib/wine/%%WINEARCH%%-windows/windows.graphics.dll
 lib/wine/%%WINEARCH%%-windows/windows.media.devices.dll
 lib/wine/%%WINEARCH%%-windows/windows.media.dll
 lib/wine/%%WINEARCH%%-windows/windows.media.mediacontrol.dll
@@ -2696,6 +2709,7 @@ lib/wine/%%WINEARCH%%-windows/winemsibuilder.exe
 lib/wine/%%WINEARCH%%-windows/winepath.exe
 lib/wine/%%WINEARCH%%-windows/wineps.drv
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/wineps16.drv16
+lib/wine/%%WINEARCH%%-windows/wineusb.sys
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/winevdm.exe
 lib/wine/%%WINEARCH%%-windows/winevulkan.dll
 %%WAYLAND%%lib/wine/%%WINEARCH%%-windows/winewayland.drv