emulators/wine-devel: update to Wine 7.21

This includes the following changes:
 - OpenGL library converted to PE.
 - Support for multi-architecture PE builds.
 - More preparation work for Vulkan 32-on-64 support.
 - Support for creating import libraries without dlltool.
 - Locale data updates.
 - Various bug fixes.

Additionally, OpenAL has been removed as a dependency, as upstream
no longer provides it either.

3 files changed, 15 insertions, 14 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 02538d4ec65b..29ea8d26257d 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wine
-DISTVERSION=	7.20
+DISTVERSION=	7.21
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/7.x/
@@ -67,8 +67,8 @@ SUB_FILES=	pkg-message
 
 PORTDATA=	wine.inf
 
-OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS LDAP OPENAL STAGING V4L WINEMAKER X11 GECKO MONO
-OPTIONS_DEFAULT=GNUTLS OPENAL OSS X11
+OPTIONS_DEFINE=	CUPS DOCS DOSBOX GNUTLS LDAP STAGING V4L WINEMAKER X11 GECKO MONO
+OPTIONS_DEFAULT=GNUTLS OSS X11
 OPTIONS_RADIO=	AUDIO
 OPTIONS_RADIO_AUDIO=	ALSA OSS
 OPTIONS_SUB=	yes
@@ -97,9 +97,6 @@ LDAP_USE=		OPENLDAP=yes
 
 MONO_RUN_DEPENDS=	wine-mono-devel>0:emulators/wine-mono-devel
 
-OPENAL_CONFIGURE_WITH=	openal
-OPENAL_USES=		openal
-
 OSS_CONFIGURE_ON=	--without-alsa --with-oss
 
 STAGING_MASTER_SITES=	https://github.com/wine-staging/wine-staging/archive/:staging
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index b5d7d63de6d2..44e37a6f7f7c 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1667271216
-SHA256 (wine-7.20.tar.xz) = 751b79f22b5a9f72c9ec15f755b00b13d3ed073e9168c3ef4adabd9db37d0d50
-SIZE (wine-7.20.tar.xz) = 28534920
-SHA256 (v7.20.tar.gz) = d3210cf8e8c75c7dba63dce9af014fae2664078c00baaff85eb878df81e421ed
-SIZE (v7.20.tar.gz) = 9521481
+TIMESTAMP = 1668771607
+SHA256 (wine-7.21.tar.xz) = cc56ecb701c3e51c22c4863b6ce3f8a17332534057c6d3934ebeb2b042c972ca
+SIZE (wine-7.21.tar.xz) = 28703308
+SHA256 (v7.21.tar.gz) = 7d99a9967706a8113be09f6653779e3951049fc0753d8a036f4e4cf5e8430347
+SIZE (v7.21.tar.gz) = 9530737
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index cefb49c6b102..26015dfcaaf8 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -849,6 +849,7 @@ include/wine/windows/schannel.h
 include/wine/windows/schemadef.h
 include/wine/windows/schnlsp.h
 include/wine/windows/sddl.h
+include/wine/windows/sdkddkver.h
 include/wine/windows/secext.h
 include/wine/windows/security.h
 include/wine/windows/sensapi.h
@@ -1031,6 +1032,8 @@ include/wine/windows/windows.gaming.input.forcefeedback.h
 include/wine/windows/windows.gaming.input.forcefeedback.idl
 include/wine/windows/windows.gaming.input.h
 include/wine/windows/windows.gaming.input.idl
+include/wine/windows/windows.gaming.ui.h
+include/wine/windows/windows.gaming.ui.idl
 include/wine/windows/windows.globalization.h
 include/wine/windows/windows.globalization.idl
 include/wine/windows/windows.h
@@ -1454,8 +1457,7 @@ lib/wine/%%WINEARCH%%-unix/ntdll.so
 %%WINE32%%%%STAGING%%lib/wine/%%WINEARCH%%-unix/nvencodeapi.dll.so
 %%WINE64%%%%STAGING%%lib/wine/%%WINEARCH%%-unix/nvencodeapi64.dll.so
 lib/wine/%%WINEARCH%%-unix/odbc32.so
-%%OPENAL%%lib/wine/%%WINEARCH%%-unix/openal32.dll.so
-lib/wine/%%WINEARCH%%-unix/opengl32.dll.so
+lib/wine/%%WINEARCH%%-unix/opengl32.so
 lib/wine/%%WINEARCH%%-unix/qcap.so
 lib/wine/%%WINEARCH%%-unix/secur32.so
 lib/wine/%%WINEARCH%%-unix/win32u.so
@@ -1507,6 +1509,7 @@ lib/wine/%%WINEARCH%%-windows/cabinet.dll
 lib/wine/%%WINEARCH%%-windows/cacls.exe
 lib/wine/%%WINEARCH%%-windows/cards.dll
 lib/wine/%%WINEARCH%%-windows/cdosys.dll
+lib/wine/%%WINEARCH%%-windows/certutil.exe
 lib/wine/%%WINEARCH%%-windows/cfgmgr32.dll
 lib/wine/%%WINEARCH%%-windows/chcp.com
 lib/wine/%%WINEARCH%%-windows/clock.exe
@@ -2141,7 +2144,6 @@ lib/wine/%%WINEARCH%%-windows/olesvr32.dll
 lib/wine/%%WINEARCH%%-windows/olethk32.dll
 lib/wine/%%WINEARCH%%-windows/oleview.exe
 lib/wine/%%WINEARCH%%-windows/opcservices.dll
-%%OPENAL%%lib/wine/%%WINEARCH%%-windows/openal32.dll
 lib/wine/%%WINEARCH%%-windows/opengl32.dll
 lib/wine/%%WINEARCH%%-windows/packager.dll
 lib/wine/%%WINEARCH%%-windows/pdh.dll
@@ -2214,6 +2216,7 @@ lib/wine/%%WINEARCH%%-windows/servicemodelreg.exe
 lib/wine/%%WINEARCH%%-windows/services.exe
 lib/wine/%%WINEARCH%%-windows/setupapi.dll
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/setupx.dll16
+lib/wine/%%WINEARCH%%-windows/setx.exe
 lib/wine/%%WINEARCH%%-windows/sfc.dll
 lib/wine/%%WINEARCH%%-windows/sfc_os.dll
 lib/wine/%%WINEARCH%%-windows/shcore.dll
@@ -2328,6 +2331,7 @@ lib/wine/%%WINEARCH%%-windows/win32u.dll
 %%WINE32%%lib/wine/%%WINEARCH%%-windows/windebug.dll16
 lib/wine/%%WINEARCH%%-windows/windows.devices.enumeration.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.media.devices.dll
 lib/wine/%%WINEARCH%%-windows/windows.media.speech.dll