Skip to content

Commit

Permalink
emulators/wine-devel: update to Wine 7.22
Browse files Browse the repository at this point in the history
This includes the following changes:
 - 32-on-64 thunks for both Vulkan and OpenGL.
 - OpenLDAP library bundled and built as PE.
 - Support for the RAW print processor in WinPrint.
 - More progress on the long types printf format conversion.
 - Various bug fixes.

Also since Wine now comes with the Windows version of OpenLDAP
bundled, remove the native OpenLDAP dependency from the Port.
  • Loading branch information
DamjanJovanovic authored and Gerald Pfeifer committed Dec 10, 2022
1 parent bad9733 commit 387cc07
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 26 deletions.
7 changes: 2 additions & 5 deletions emulators/wine-devel/Makefile
@@ -1,5 +1,5 @@
PORTNAME= wine
DISTVERSION= 7.21
DISTVERSION= 7.22
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= https://dl.winehq.org/wine/source/7.x/
Expand Down Expand Up @@ -67,7 +67,7 @@ SUB_FILES= pkg-message

PORTDATA= wine.inf

OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS LDAP STAGING V4L WINEMAKER X11 GECKO MONO
OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS STAGING V4L WINEMAKER X11 GECKO MONO
OPTIONS_DEFAULT=GNUTLS OSS X11
OPTIONS_RADIO= AUDIO
OPTIONS_RADIO_AUDIO= ALSA OSS
Expand All @@ -92,9 +92,6 @@ GECKO_RUN_DEPENDS= wine-gecko-devel>0:emulators/wine-gecko-devel
GNUTLS_CONFIGURE_WITH= gnutls
GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls

LDAP_CONFIGURE_WITH= ldap
LDAP_USE= OPENLDAP=yes

MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel

OSS_CONFIGURE_ON= --without-alsa --with-oss
Expand Down
10 changes: 5 additions & 5 deletions emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
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
TIMESTAMP = 1669625505
SHA256 (wine-7.22.tar.xz) = 1f2ac3b2cdf66c49bf145b43e7a3f30e6d8176d0ae498056c903fef8a6ccfc3a
SIZE (wine-7.22.tar.xz) = 28974052
SHA256 (v7.22.tar.gz) = 74104b902d2f60c019c62a15b1f475773f939aedafe05cc937d3ba89973bf00f
SIZE (v7.22.tar.gz) = 9528424
20 changes: 4 additions & 16 deletions emulators/wine-devel/pkg-plist
Expand Up @@ -224,9 +224,7 @@ include/wine/windows/ctfutb.h
include/wine/windows/ctfutb.idl
include/wine/windows/ctxtcall.h
include/wine/windows/ctxtcall.idl
%%STAGING%%include/wine/windows/cuda.h
include/wine/windows/custcntl.h
%%STAGING%%include/wine/windows/cuviddec.h
include/wine/windows/cvconst.h
include/wine/windows/cvttyp.idl
include/wine/windows/d2d1.h
Expand Down Expand Up @@ -725,9 +723,6 @@ include/wine/windows/ntsecapi.h
include/wine/windows/ntsecpkg.h
include/wine/windows/ntstatus.h
include/wine/windows/ntuser.h
%%STAGING%%include/wine/windows/nvapi.h
%%STAGING%%include/wine/windows/nvcuvid.h
%%STAGING%%include/wine/windows/nvencodeapi.h
include/wine/windows/oaidl.h
include/wine/windows/oaidl.idl
include/wine/windows/objbase.h
Expand Down Expand Up @@ -1148,6 +1143,7 @@ include/wine/windows/wsdxmldom.h
include/wine/windows/wshisotp.h
include/wine/windows/wsipx.h
include/wine/windows/wsnwlink.h
include/wine/windows/wspiapi.h
include/wine/windows/wtsapi32.h
include/wine/windows/wtypes.h
include/wine/windows/wtypes.idl
Expand Down Expand Up @@ -1452,10 +1448,6 @@ lib/wine/%%WINEARCH%%-unix/msv1_0.so
lib/wine/%%WINEARCH%%-unix/netapi32.so
lib/wine/%%WINEARCH%%-unix/nsiproxy.so
lib/wine/%%WINEARCH%%-unix/ntdll.so
%%STAGING%%lib/wine/%%WINEARCH%%-unix/nvcuda.dll.so
%%STAGING%%lib/wine/%%WINEARCH%%-unix/nvcuvid.dll.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
lib/wine/%%WINEARCH%%-unix/opengl32.so
lib/wine/%%WINEARCH%%-unix/qcap.so
Expand All @@ -1468,7 +1460,6 @@ lib/wine/%%WINEARCH%%-unix/winebus.so
lib/wine/%%WINEARCH%%-unix/winevulkan.so
%%X11%%lib/wine/%%WINEARCH%%-unix/winex11.so
lib/wine/%%WINEARCH%%-unix/winspool.so
lib/wine/%%WINEARCH%%-unix/wldap32.so
lib/wine/%%WINEARCH%%-unix/wpcap.so
lib/wine/%%WINEARCH%%-unix/ws2_32.so
lib/wine/%%WINEARCH%%-windows/acledit.dll
Expand Down Expand Up @@ -2114,12 +2105,6 @@ lib/wine/%%WINEARCH%%-windows/ntdll.dll
lib/wine/%%WINEARCH%%-windows/ntdsapi.dll
lib/wine/%%WINEARCH%%-windows/ntoskrnl.exe
lib/wine/%%WINEARCH%%-windows/ntprint.dll
%%WINE32%%%%STAGING%%lib/wine/%%WINEARCH%%-windows/nvapi.dll
%%WINE64%%%%STAGING%%lib/wine/%%WINEARCH%%-windows/nvapi64.dll
%%STAGING%%lib/wine/%%WINEARCH%%-windows/nvcuda.dll
%%STAGING%%lib/wine/%%WINEARCH%%-windows/nvcuvid.dll
%%WINE32%%%%STAGING%%lib/wine/%%WINEARCH%%-windows/nvencodeapi.dll
%%WINE64%%%%STAGING%%lib/wine/%%WINEARCH%%-windows/nvencodeapi64.dll
lib/wine/%%WINEARCH%%-windows/objsel.dll
lib/wine/%%WINEARCH%%-windows/odbc32.dll
lib/wine/%%WINEARCH%%-windows/odbcbcp.dll
Expand Down Expand Up @@ -2334,6 +2319,7 @@ 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.dll
lib/wine/%%WINEARCH%%-windows/windows.media.speech.dll
%%STAGING%%lib/wine/%%WINEARCH%%-windows/windows.networking.connectivity
lib/wine/%%WINEARCH%%-windows/windows.networking.dll
Expand Down Expand Up @@ -2372,6 +2358,7 @@ lib/wine/%%WINEARCH%%-windows/winmm.dll
%%WINE32%%lib/wine/%%WINEARCH%%-windows/winnls.dll16
lib/wine/%%WINEARCH%%-windows/winnls32.dll
%%WINE32%%lib/wine/%%WINEARCH%%-windows/winoldap.mod16
lib/wine/%%WINEARCH%%-windows/winprint.dll
lib/wine/%%WINEARCH%%-windows/winscard.dll
%%WINE32%%lib/wine/%%WINEARCH%%-windows/winsock.dll16
lib/wine/%%WINEARCH%%-windows/winspool.drv
Expand Down Expand Up @@ -2454,6 +2441,7 @@ lib/wine/%%WINEARCH%%-windows/xinput1_2.dll
lib/wine/%%WINEARCH%%-windows/xinput1_3.dll
lib/wine/%%WINEARCH%%-windows/xinput1_4.dll
lib/wine/%%WINEARCH%%-windows/xinput9_1_0.dll
lib/wine/%%WINEARCH%%-windows/xinputuap.dll
lib/wine/%%WINEARCH%%-windows/xmllite.dll
lib/wine/%%WINEARCH%%-windows/xolehlp.dll
lib/wine/%%WINEARCH%%-windows/xpsprint.dll
Expand Down

0 comments on commit 387cc07

Please sign in to comment.