From fb236481b77d11d7e0623f039a9bf57e9a7350f6 Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Wed, 3 May 2023 05:47:25 +0000 Subject: [PATCH] emulators/wine-devel: update to Wine 8.4: This includes 8.0 release candidates and the actual release as well as 8.1, 8.2, 8.3, and 8.4, and brings the following changes: - Bundled vkd3d upgraded to version 1.6. - Vulkan and OpenGL thunking optimizations. - More support for print processors. - Improved joystick control panel. - Long types printf format conversion finished. - Windows version set to Windows 10 for new prefixes. - Many code cleanups that were deferred during code freeze. - Better debug information in Wow64 mode. - Wow64 thunks in the WPCAP library. - Indeo IV50 codec support. - Monitor names set from EDID data. - Support for the Low Fragmentation Heap. - Smard card support using PCSC-Lite. [not enabled] - Bundled Zydis library for more correct disassembly. - Initial step of the Wayland graphics driver. - Cleanups in IME support. - A number of test fixes. - Various bug fixes. Now configure --without-pcap since the requirements have changed since upstream commit 032e8d9c362b881a4213c819d1cc6262f2df4b35 on February 7th 2023 and stock FreeBSD does not meet them any longer. Also explicitly configure --without-wayland since Wayland and Wine do not yet go together well. files/patch-configure is a hack to restore build with a mixture of GCC ("native") and clang (MinGW) after upstream Commit: 6a3c382df0ed6ab7c4406c10aa7c3b15fcc0c5b9 Author: Jacek Caban Date: Tue Dec 6 01:46:55 2022 +0100 configure: Use -Wl,-WX for clang configure checks in MSVC mode. --- emulators/wine-devel/Makefile | 10 +++--- emulators/wine-devel/distinfo | 10 +++--- emulators/wine-devel/pkg-plist | 56 +++++++++++++++++++++++++++++----- 3 files changed, 58 insertions(+), 18 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 2e546496f9a6..cc5970cbe031 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,9 +1,8 @@ PORTNAME= wine -DISTVERSION= 7.22 -PORTREVISION= 1 +DISTVERSION= 8.4 PORTEPOCH= 1 CATEGORIES= emulators -MASTER_SITES= https://dl.winehq.org/wine/source/7.x/ +MASTER_SITES= https://dl.winehq.org/wine/source/8.x/ PKGNAMESUFFIX= -devel DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -45,14 +44,15 @@ CONFIGURE_ARGS+=--verbose \ --without-netapi \ --without-opencl \ --without-osmesa \ - --with-pcap \ + --without-pcap \ --with-pthread \ --without-pulse \ --without-sane \ --with-sdl \ --without-udev \ --without-unwind \ - --without-usb + --without-usb \ + --without-wayland CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" WINELIBDIR= ${PREFIX}/lib .if !defined(USE_LDCONFIG32) diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 7869c0bdb3d5..00c8aeda6a4b 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,5 @@ -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 +TIMESTAMP = 1683015375 +SHA256 (wine-8.4.tar.xz) = 0459a462ea83705ada35ed5da71b61c73586dad59d18cdc528f0408a456cfbe0 +SIZE (wine-8.4.tar.xz) = 29031312 +SHA256 (v8.4.tar.gz) = 34ed95052b3e49b7a5837a219cb1c46b8ce16fc764bf0596bbda14401826bdf3 +SIZE (v8.4.tar.gz) = 9522340 diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 1ab982c53fe2..498ddd6d8351 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -41,6 +41,7 @@ include/wine/msvcrt/complex.h 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_startup.h include/wine/msvcrt/corecrt_stdio_config.h include/wine/msvcrt/corecrt_wctype.h @@ -78,6 +79,7 @@ include/wine/msvcrt/search.h include/wine/msvcrt/setjmp.h include/wine/msvcrt/share.h include/wine/msvcrt/signal.h +include/wine/msvcrt/stdarg.h include/wine/msvcrt/stdbool.h include/wine/msvcrt/stddef.h include/wine/msvcrt/stdint.h @@ -93,6 +95,7 @@ include/wine/msvcrt/sys/utime.h include/wine/msvcrt/time.h include/wine/msvcrt/uchar.h include/wine/msvcrt/unistd.h +include/wine/msvcrt/vadefs.h include/wine/msvcrt/wchar.h include/wine/msvcrt/wctype.h include/wine/windows/accctrl.h @@ -332,6 +335,12 @@ include/wine/windows/dciddi.h include/wine/windows/dciman.h include/wine/windows/dcommon.h include/wine/windows/dcommon.idl +include/wine/windows/dcomp.h +include/wine/windows/dcomp.idl +include/wine/windows/dcompanimation.h +include/wine/windows/dcompanimation.idl +include/wine/windows/dcomptypes.h +include/wine/windows/dcomptypes.idl include/wine/windows/dde.h include/wine/windows/dde.rh include/wine/windows/ddeml.h @@ -528,6 +537,7 @@ include/wine/windows/iimgctx.idl include/wine/windows/imagehlp.h include/wine/windows/ime.h include/wine/windows/imm.h +include/wine/windows/immdev.h include/wine/windows/imnact.h include/wine/windows/imnact.idl include/wine/windows/imnxport.h @@ -553,6 +563,9 @@ include/wine/windows/ipmib.h include/wine/windows/iprtrmib.h include/wine/windows/iptypes.h include/wine/windows/isguids.h +include/wine/windows/ivectorchangedeventargs.h +include/wine/windows/ivectorchangedeventargs.idl +include/wine/windows/kbd.h include/wine/windows/knownfolders.h include/wine/windows/ks.h include/wine/windows/ksguid.h @@ -795,6 +808,7 @@ include/wine/windows/qos2.h include/wine/windows/ras.h include/wine/windows/rasdlg.h include/wine/windows/raserror.h +include/wine/windows/realtimeapiset.h include/wine/windows/reason.h include/wine/windows/regstr.h include/wine/windows/relogger.h @@ -869,6 +883,8 @@ include/wine/windows/shlobj.h include/wine/windows/shlwapi.h include/wine/windows/shobjidl.h include/wine/windows/shobjidl.idl +include/wine/windows/shobjidl_core.h +include/wine/windows/shobjidl_core.idl include/wine/windows/shtypes.h include/wine/windows/shtypes.idl include/wine/windows/sipbase.h @@ -944,6 +960,8 @@ include/wine/windows/uiautomationcore.idl include/wine/windows/uiautomationcoreapi.h include/wine/windows/uiribbon.h include/wine/windows/uiribbon.idl +include/wine/windows/uiviewsettingsinterop.h +include/wine/windows/uiviewsettingsinterop.idl include/wine/windows/unexposeenums2managed.h include/wine/windows/unknwn.h include/wine/windows/unknwn.idl @@ -981,6 +999,7 @@ include/wine/windows/wbemdisp.idl include/wine/windows/wbemprov.h include/wine/windows/wbemprov.idl include/wine/windows/wct.h +include/wine/windows/wdbgexts.h include/wine/windows/weakreference.h include/wine/windows/weakreference.idl include/wine/windows/webservices.h @@ -1031,6 +1050,12 @@ 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.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.holographic.h +include/wine/windows/windows.graphics.holographic.idl include/wine/windows/windows.h include/wine/windows/windows.media.closedcaptioning.h include/wine/windows/windows.media.closedcaptioning.idl @@ -1046,6 +1071,12 @@ include/wine/windows/windows.media.speechsynthesis.idl %%STAGING%%include/wine/windows/windows.networking.connectivity.idl %%STAGING%%include/wine/windows/windows.networking.h %%STAGING%%include/wine/windows/windows.networking.idl +include/wine/windows/windows.perception.spatial.h +include/wine/windows/windows.perception.spatial.idl +include/wine/windows/windows.perception.spatial.surfaces.h +include/wine/windows/windows.perception.spatial.surfaces.idl +include/wine/windows/windows.security.credentials.h +include/wine/windows/windows.security.credentials.idl include/wine/windows/windows.security.cryptography.h include/wine/windows/windows.security.cryptography.idl include/wine/windows/windows.storage.streams.h @@ -1054,12 +1085,16 @@ include/wine/windows/windows.system.h include/wine/windows/windows.system.idl include/wine/windows/windows.system.power.h include/wine/windows/windows.system.power.idl +include/wine/windows/windows.system.profile.systemmanufacturers.h +include/wine/windows/windows.system.profile.systemmanufacturers.idl include/wine/windows/windows.system.threading.h include/wine/windows/windows.system.threading.idl include/wine/windows/windows.system.userprofile.h include/wine/windows/windows.system.userprofile.idl include/wine/windows/windows.ui.h include/wine/windows/windows.ui.idl +include/wine/windows/windows.ui.viewmanagement.h +include/wine/windows/windows.ui.viewmanagement.idl include/wine/windows/windowscontracts.h include/wine/windows/windowscontracts.idl include/wine/windows/windowsx.h @@ -1122,6 +1157,7 @@ include/wine/windows/wmsdkidl.idl include/wine/windows/wmsecure.h include/wine/windows/wmsecure.idl include/wine/windows/wnaspi32.h +include/wine/windows/wofapi.h include/wine/windows/wownt16.h include/wine/windows/wownt32.h include/wine/windows/wpcapi.h @@ -1185,7 +1221,6 @@ include/wine/windows/ddk/hidpi.h include/wine/windows/ddk/hidport.h include/wine/windows/ddk/hidsdi.h include/wine/windows/ddk/hidtypes.h -include/wine/windows/ddk/imm.h include/wine/windows/ddk/mountmgr.h include/wine/windows/ddk/ndis.h include/wine/windows/ddk/ntddcdvd.h @@ -1223,6 +1258,7 @@ lib/wine/%%WINEARCH%%-unix/libavicap32.a lib/wine/%%WINEARCH%%-unix/libavifil32.a lib/wine/%%WINEARCH%%-unix/libavrt.a lib/wine/%%WINEARCH%%-unix/libbcrypt.a +lib/wine/%%WINEARCH%%-unix/libbluetoothapis.a lib/wine/%%WINEARCH%%-unix/libcabinet.a lib/wine/%%WINEARCH%%-unix/libcards.a lib/wine/%%WINEARCH%%-unix/libcfgmgr32.a @@ -1415,8 +1451,6 @@ lib/wine/%%WINEARCH%%-unix/libwevtapi.a lib/wine/%%WINEARCH%%-unix/libwin32u.a lib/wine/%%WINEARCH%%-unix/libwindowscodecs.a lib/wine/%%WINEARCH%%-unix/libwindowscodecsext.a -lib/wine/%%WINEARCH%%-unix/libwine.so.1 -lib/wine/%%WINEARCH%%-unix/libwine.so.1.0 lib/wine/%%WINEARCH%%-unix/libwinecrt0.a lib/wine/%%WINEARCH%%-unix/libwined3d.a lib/wine/%%WINEARCH%%-unix/libwinevulkan.a @@ -1424,7 +1458,6 @@ lib/wine/%%WINEARCH%%-unix/libwinhttp.a lib/wine/%%WINEARCH%%-unix/libwininet.a lib/wine/%%WINEARCH%%-unix/libwinmm.a lib/wine/%%WINEARCH%%-unix/libwinnls32.a -lib/wine/%%WINEARCH%%-unix/libwinscard.a lib/wine/%%WINEARCH%%-unix/libwinspool.a lib/wine/%%WINEARCH%%-unix/libwintab32.a lib/wine/%%WINEARCH%%-unix/libwintrust.a @@ -1443,6 +1476,7 @@ lib/wine/%%WINEARCH%%-unix/libwtsapi32.a %%STAGING%%lib/wine/%%WINEARCH%%-unix/libx3daudio1_7.a lib/wine/%%WINEARCH%%-unix/libxinput.a lib/wine/%%WINEARCH%%-unix/libxmllite.a +lib/wine/%%WINEARCH%%-unix/localspl.so lib/wine/%%WINEARCH%%-unix/mountmgr.so lib/wine/%%WINEARCH%%-unix/msv1_0.so lib/wine/%%WINEARCH%%-unix/netapi32.so @@ -1459,7 +1493,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/wpcap.so lib/wine/%%WINEARCH%%-unix/ws2_32.so lib/wine/%%WINEARCH%%-windows/acledit.dll lib/wine/%%WINEARCH%%-windows/aclui.dll @@ -1540,6 +1573,7 @@ lib/wine/%%WINEARCH%%-windows/d3d10_1.dll lib/wine/%%WINEARCH%%-windows/d3d10core.dll lib/wine/%%WINEARCH%%-windows/d3d11.dll %%X11%%lib/wine/%%WINEARCH%%-windows/d3d12.dll +lib/wine/%%WINEARCH%%-windows/d3d12core.dll lib/wine/%%WINEARCH%%-windows/d3d8.dll lib/wine/%%WINEARCH%%-windows/d3d8thk.dll lib/wine/%%WINEARCH%%-windows/d3d9.dll @@ -1714,6 +1748,7 @@ lib/wine/%%WINEARCH%%-windows/inseng.dll lib/wine/%%WINEARCH%%-windows/ipconfig.exe lib/wine/%%WINEARCH%%-windows/iphlpapi.dll lib/wine/%%WINEARCH%%-windows/iprop.dll +lib/wine/%%WINEARCH%%-windows/ir50_32.dll lib/wine/%%WINEARCH%%-windows/irprops.cpl lib/wine/%%WINEARCH%%-windows/itircl.dll lib/wine/%%WINEARCH%%-windows/itss.dll @@ -1743,6 +1778,7 @@ lib/wine/%%WINEARCH%%-windows/libavicap32.a lib/wine/%%WINEARCH%%-windows/libavifil32.a lib/wine/%%WINEARCH%%-windows/libavrt.a lib/wine/%%WINEARCH%%-windows/libbcrypt.a +lib/wine/%%WINEARCH%%-windows/libbluetoothapis.a lib/wine/%%WINEARCH%%-windows/libcabinet.a lib/wine/%%WINEARCH%%-windows/libcards.a lib/wine/%%WINEARCH%%-windows/libcfgmgr32.a @@ -1942,7 +1978,6 @@ lib/wine/%%WINEARCH%%-windows/libwinhttp.a lib/wine/%%WINEARCH%%-windows/libwininet.a lib/wine/%%WINEARCH%%-windows/libwinmm.a lib/wine/%%WINEARCH%%-windows/libwinnls32.a -lib/wine/%%WINEARCH%%-windows/libwinscard.a lib/wine/%%WINEARCH%%-windows/libwinspool.a lib/wine/%%WINEARCH%%-windows/libwintab32.a lib/wine/%%WINEARCH%%-windows/libwintrust.a @@ -2003,6 +2038,7 @@ lib/wine/%%WINEARCH%%-windows/msacm32.drv lib/wine/%%WINEARCH%%-windows/msado15.dll lib/wine/%%WINEARCH%%-windows/msadp32.acm lib/wine/%%WINEARCH%%-windows/msasn1.dll +lib/wine/%%WINEARCH%%-windows/msauddecmft.dll lib/wine/%%WINEARCH%%-windows/mscat32.dll lib/wine/%%WINEARCH%%-windows/mscms.dll lib/wine/%%WINEARCH%%-windows/mscoree.dll @@ -2032,6 +2068,7 @@ lib/wine/%%WINEARCH%%-windows/msinfo32.exe lib/wine/%%WINEARCH%%-windows/msisip.dll lib/wine/%%WINEARCH%%-windows/msisys.ocx lib/wine/%%WINEARCH%%-windows/msls31.dll +lib/wine/%%WINEARCH%%-windows/msmpeg2vdec.dll lib/wine/%%WINEARCH%%-windows/msnet32.dll lib/wine/%%WINEARCH%%-windows/mspatcha.dll lib/wine/%%WINEARCH%%-windows/msports.dll @@ -2182,6 +2219,7 @@ lib/wine/%%WINEARCH%%-windows/sapi.dll lib/wine/%%WINEARCH%%-windows/sas.dll lib/wine/%%WINEARCH%%-windows/sc.exe lib/wine/%%WINEARCH%%-windows/scarddlg.dll +lib/wine/%%WINEARCH%%-windows/scardsvr.dll lib/wine/%%WINEARCH%%-windows/sccbase.dll lib/wine/%%WINEARCH%%-windows/schannel.dll lib/wine/%%WINEARCH%%-windows/schedsvc.dll @@ -2322,6 +2360,9 @@ 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 +lib/wine/%%WINEARCH%%-windows/windows.perception.stub.dll +lib/wine/%%WINEARCH%%-windows/windows.system.profile.systemmanufacturers.dll +lib/wine/%%WINEARCH%%-windows/windows.ui.dll lib/wine/%%WINEARCH%%-windows/windowscodecs.dll lib/wine/%%WINEARCH%%-windows/windowscodecsext.dll %%ALSA%%lib/wine/%%WINEARCH%%-windows/winealsa.drv @@ -2359,7 +2400,6 @@ lib/wine/%%WINEARCH%%-windows/winmm.dll 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 lib/wine/%%WINEARCH%%-windows/winsta.dll @@ -2381,13 +2421,13 @@ lib/wine/%%WINEARCH%%-windows/wmphoto.dll lib/wine/%%WINEARCH%%-windows/wmplayer.exe lib/wine/%%WINEARCH%%-windows/wmvcore.dll lib/wine/%%WINEARCH%%-windows/wnaspi32.dll +lib/wine/%%WINEARCH%%-windows/wofutil.dll lib/wine/%%WINEARCH%%-windows/wordpad.exe %%WINE32%%lib/wine/%%WINEARCH%%-windows/wow32.dll %%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64.dll %%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64cpu.dll %%WINE64%%lib/wine/%%WINEARCH%%-windows/wow64win.dll lib/wine/%%WINEARCH%%-windows/wpc.dll -lib/wine/%%WINEARCH%%-windows/wpcap.dll lib/wine/%%WINEARCH%%-windows/write.exe lib/wine/%%WINEARCH%%-windows/ws2_32.dll lib/wine/%%WINEARCH%%-windows/wscript.exe -- 2.38.1