diff options
Diffstat (limited to 'emulators/wine-devel')
| -rw-r--r-- | emulators/wine-devel/Makefile | 17 | ||||
| -rw-r--r-- | emulators/wine-devel/distinfo | 6 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-configure | 12 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__x86__64.c | 11 | ||||
| -rw-r--r-- | emulators/wine-devel/files/pkg32.sh | 16 | ||||
| -rw-r--r-- | emulators/wine-devel/files/wine-wow64.sh | 3 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 39 |
7 files changed, 73 insertions, 31 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 42173a71f552..fbe30ff5b05d 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,12 +1,11 @@ PORTNAME= wine -DISTVERSION= 10.6 -PORTREVISION= 1 +DISTVERSION= 10.14 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/10.x/ PKGNAMESUFFIX= -devel -MAINTAINER= ports@FreeBSD.org +MAINTAINER= monwarez@mailoo.org COMMENT= Microsoft Windows compatibility environment WWW= https://www.winehq.org @@ -44,7 +43,6 @@ CONFIGURE_ARGS+=--verbose \ --with-mingw CROSSCC="clang" \ --without-netapi \ --without-opencl \ - --without-osmesa \ --without-pcap \ --without-pcsclite \ --with-pthread \ @@ -72,7 +70,7 @@ PIE_UNSAFE= yes PORTDATA= wine.inf OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS V4L WAYLAND X11 GECKO MONO -OPTIONS_DEFAULT=ALSA GNUTLS X11 +OPTIONS_DEFAULT=ALSA GNUTLS WAYLAND X11 OPTIONS_RADIO= AUDIO OPTIONS_RADIO_AUDIO= ALSA OSS OPTIONS_SUB= yes @@ -100,10 +98,6 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel -WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto -WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ - libxkbcommon.so:x11/libxkbcommon - OSS_CONFIGURE_WITH= oss OSS_USES= gnome gstreamer OSS_USE= GNOME=glib20 @@ -113,6 +107,9 @@ V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l WAYLAND_CONFIGURE_WITH= wayland +WAYLAND_BUILD_DEPENDS= ${LOCALBASE}/include/linux/input.h:devel/evdev-proto +WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \ + libxkbcommon.so:x11/libxkbcommon X11_CONFIGURE_WITH= x fontconfig freetype opengl xinerama xinput2 xrandr xrender X11_USES= gl xorg @@ -150,7 +147,7 @@ post-patch: ${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop .else -EXTRA_PATCHES+= files/extra-patch-tools-winebuild-res32 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-tools-winebuild-res32 PLIST_SUB+= WINE32="" WINE64="@comment " WINEARCH="i386" .endif diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 71d09994e6f0..023228ac2e3b 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746303351 -SHA256 (wine-10.6.tar.xz) = 2af8809a3e987363752c8f7640efa72a7c9d3213d332437db87ce1d0d98e9061 -SIZE (wine-10.6.tar.xz) = 32380968 +TIMESTAMP = 1756654573 +SHA256 (wine-10.14.tar.xz) = a4fa3b5aefe1c0b7391a91a2c3c733b8dfd04bb315c8eabcfb2af413969e5e4b +SIZE (wine-10.14.tar.xz) = 32742480 diff --git a/emulators/wine-devel/files/patch-configure b/emulators/wine-devel/files/patch-configure deleted file mode 100644 index 1b505cb0fd84..000000000000 --- a/emulators/wine-devel/files/patch-configure +++ /dev/null @@ -1,12 +0,0 @@ ---- UTC ---- configure.orig 2024-08-10 14:38:54.000000000 +0000 -+++ configure 2024-08-10 23:43:05.264405000 +0000 -@@ -10662,7 +10662,7 @@ - llvm_extra_ldflags="" - llvm_cflags="" - case $llvm_target in -- *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;; -+ *windows) llvm_cflags="-Wl,-subsystem:console" ;; - esac - { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags --no-default-config" | $as_tr_sh` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags --no-default-config" >&5 diff --git a/emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__x86__64.c b/emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__x86__64.c new file mode 100644 index 000000000000..1e167db3c668 --- /dev/null +++ b/emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__x86__64.c @@ -0,0 +1,11 @@ +--- dlls/ntdll/unix/signal_x86_64.c.orig 2025-08-29 19:56:01 UTC ++++ dlls/ntdll/unix/signal_x86_64.c +@@ -2061,7 +2061,7 @@ static inline BOOL check_invalid_gsbase( ucontext_t *u + else + arch_prctl( ARCH_GET_GS, &cur_gsbase ); + #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +- amd64_get_gsbase( &cur_gsbase ); ++ amd64_get_gsbase((void **) &cur_gsbase); + #elif defined(__NetBSD__) + sysarch( X86_64_GET_GSBASE, &cur_gsbase ); + #endif diff --git a/emulators/wine-devel/files/pkg32.sh b/emulators/wine-devel/files/pkg32.sh index 64d82459c219..04595f6c104c 100644 --- a/emulators/wine-devel/files/pkg32.sh +++ b/emulators/wine-devel/files/pkg32.sh @@ -1,19 +1,23 @@ #!/bin/sh -e -if [ "$(id -u)" = 0 ] -then +if [ "$(id -u)" = 0 ]; then echo "Don't run this script as root!" exit 1 fi I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" +ABI_FILE=/usr/lib32/libc.so.7 -if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ] -then +if [ ! -f $ABI_FILE ]; then + echo "\"$ABI_FILE\" not found; exiting." + exit 1 +fi + +if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]; then mkdir -p "$I386_ROOT/usr/share/keys" ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg" fi # Show what we're going to do, then do it. -echo pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" -exec pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" +echo pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" +exec pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh index fd96577fb486..47d8fcc90f2c 100644 --- a/emulators/wine-devel/files/wine-wow64.sh +++ b/emulators/wine-devel/files/wine-wow64.sh @@ -23,6 +23,9 @@ HERE exit 1 fi +# Export early so that external libs could be found +export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$LOCALBASE/lib" + WINE32_VERSION=$(env -u WINELOADERNOEXEC "$I386_ROOT/$PREFIX/bin/wine" --version) WINE64_VERSION=$(env -u WINELOADERNOEXEC "${TARGET}64" --version) if [ "$WINE32_VERSION" != "$WINE64_VERSION" ] diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 005c41812e6e..191f08562d45 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -115,6 +115,7 @@ include/wine/windows/adserr.h include/wine/windows/adshlp.h include/wine/windows/advpub.h include/wine/windows/af_irda.h +include/wine/windows/afunix.h include/wine/windows/amaudio.h include/wine/windows/amsi.h include/wine/windows/amsi.idl @@ -177,8 +178,10 @@ include/wine/windows/bits5_0.h include/wine/windows/bits5_0.idl include/wine/windows/bitsmsg.h include/wine/windows/bluetoothapis.h +include/wine/windows/bluetoothleapis.h include/wine/windows/bthdef.h include/wine/windows/bthioctl.h +include/wine/windows/bthledef.h include/wine/windows/bthsdpdef.h include/wine/windows/cderr.h include/wine/windows/cdosys.h @@ -228,6 +231,7 @@ include/wine/windows/cpl.h include/wine/windows/crtrow.idl include/wine/windows/cryptdlg.h include/wine/windows/cryptuiapi.h +include/wine/windows/cryptxml.h include/wine/windows/ctfutb.h include/wine/windows/ctfutb.idl include/wine/windows/ctxtcall.h @@ -341,6 +345,7 @@ include/wine/windows/dbghelp.h include/wine/windows/dbinit.idl include/wine/windows/dbprop.idl include/wine/windows/dbs.idl +include/wine/windows/dbsrst.idl include/wine/windows/dbt.h include/wine/windows/dciddi.h include/wine/windows/dciman.h @@ -355,6 +360,7 @@ include/wine/windows/dcomptypes.idl include/wine/windows/dde.h include/wine/windows/dde.rh include/wine/windows/ddeml.h +include/wine/windows/ddk/bthguid.h include/wine/windows/ddk/compstui.h include/wine/windows/ddk/csq.h include/wine/windows/ddk/d3dkmthk.h @@ -390,11 +396,14 @@ include/wine/windows/ddstream.h include/wine/windows/ddstream.idl include/wine/windows/delayloadhandler.h include/wine/windows/devenum.idl +include/wine/windows/devfiltertypes.h include/wine/windows/devguid.h include/wine/windows/devicetopology.h include/wine/windows/devicetopology.idl include/wine/windows/devpkey.h include/wine/windows/devpropdef.h +include/wine/windows/devquery.h +include/wine/windows/devquerydef.h include/wine/windows/dhcpcsdk.h include/wine/windows/dhtmldid.h include/wine/windows/dhtmled.h @@ -502,6 +511,8 @@ include/wine/windows/dxvahd.idl include/wine/windows/dyngraph.idl include/wine/windows/endpointvolume.h include/wine/windows/endpointvolume.idl +include/wine/windows/errhandlingapi.h +include/wine/windows/errlup.idl include/wine/windows/errorrep.h include/wine/windows/errors.h include/wine/windows/errrec.idl @@ -530,6 +541,8 @@ include/wine/windows/fltdefs.h include/wine/windows/fontsub.h include/wine/windows/fusion.h include/wine/windows/fusion.idl +include/wine/windows/gameinput.h +include/wine/windows/gameinput.idl include/wine/windows/gameux.h include/wine/windows/gameux.idl include/wine/windows/gamingtcui.h @@ -1127,8 +1140,14 @@ include/wine/windows/windows.data.json.h include/wine/windows/windows.data.json.idl include/wine/windows/windows.data.xml.dom.h include/wine/windows/windows.data.xml.dom.idl +include/wine/windows/windows.devices.bluetooth.advertisement.h +include/wine/windows/windows.devices.bluetooth.advertisement.idl +include/wine/windows/windows.devices.bluetooth.genericattributeprofile.h +include/wine/windows/windows.devices.bluetooth.genericattributeprofile.idl include/wine/windows/windows.devices.bluetooth.h include/wine/windows/windows.devices.bluetooth.idl +include/wine/windows/windows.devices.bluetooth.rfcomm.h +include/wine/windows/windows.devices.bluetooth.rfcomm.idl include/wine/windows/windows.devices.enumeration.h include/wine/windows/windows.devices.enumeration.idl include/wine/windows/windows.devices.geolocation.h @@ -1184,6 +1203,8 @@ include/wine/windows/windows.media.capture.h include/wine/windows/windows.media.capture.idl include/wine/windows/windows.media.closedcaptioning.h include/wine/windows/windows.media.closedcaptioning.idl +include/wine/windows/windows.media.core.h +include/wine/windows/windows.media.core.idl include/wine/windows/windows.media.devices.h include/wine/windows/windows.media.devices.idl include/wine/windows/windows.media.effects.h @@ -1192,16 +1213,22 @@ include/wine/windows/windows.media.faceanalysis.h include/wine/windows/windows.media.faceanalysis.idl include/wine/windows/windows.media.h include/wine/windows/windows.media.idl +include/wine/windows/windows.media.mediaproperties.h +include/wine/windows/windows.media.mediaproperties.idl include/wine/windows/windows.media.render.h include/wine/windows/windows.media.render.idl include/wine/windows/windows.media.speechrecognition.h include/wine/windows/windows.media.speechrecognition.idl include/wine/windows/windows.media.speechsynthesis.h include/wine/windows/windows.media.speechsynthesis.idl +include/wine/windows/windows.media.transcoding.h +include/wine/windows/windows.media.transcoding.idl include/wine/windows/windows.networking.connectivity.h include/wine/windows/windows.networking.connectivity.idl include/wine/windows/windows.networking.h include/wine/windows/windows.networking.idl +include/wine/windows/windows.networking.sockets.h +include/wine/windows/windows.networking.sockets.idl include/wine/windows/windows.perception.spatial.h include/wine/windows/windows.perception.spatial.idl include/wine/windows/windows.perception.spatial.surfaces.h @@ -1254,8 +1281,12 @@ 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.viewmanagement.core.h +include/wine/windows/windows.ui.viewmanagement.core.idl include/wine/windows/windows.ui.viewmanagement.h include/wine/windows/windows.ui.viewmanagement.idl +include/wine/windows/windows.ui.windowmanagement.h +include/wine/windows/windows.ui.windowmanagement.idl include/wine/windows/windows.ui.xaml.h include/wine/windows/windows.ui.xaml.hosting.desktopwindowxamlsource.h include/wine/windows/windows.ui.xaml.hosting.desktopwindowxamlsource.idl @@ -1415,12 +1446,14 @@ lib/wine/%%WINEARCH%%-unix/libcomdlg32.a lib/wine/%%WINEARCH%%-unix/libcoml2.a lib/wine/%%WINEARCH%%-unix/libcompstui.a lib/wine/%%WINEARCH%%-unix/libcomsvcs.a +lib/wine/%%WINEARCH%%-unix/libcoremessaging.a lib/wine/%%WINEARCH%%-unix/libcredui.a lib/wine/%%WINEARCH%%-unix/libcrypt32.a lib/wine/%%WINEARCH%%-unix/libcryptdll.a lib/wine/%%WINEARCH%%-unix/libcryptnet.a lib/wine/%%WINEARCH%%-unix/libcryptsp.a lib/wine/%%WINEARCH%%-unix/libcryptui.a +lib/wine/%%WINEARCH%%-unix/libcryptxml.a lib/wine/%%WINEARCH%%-unix/libd2d1.a lib/wine/%%WINEARCH%%-unix/libd3d10.a lib/wine/%%WINEARCH%%-unix/libd3d10_1.a @@ -1735,6 +1768,7 @@ lib/wine/%%WINEARCH%%-windows/cryptnet.dll lib/wine/%%WINEARCH%%-windows/cryptowinrt.dll lib/wine/%%WINEARCH%%-windows/cryptsp.dll lib/wine/%%WINEARCH%%-windows/cryptui.dll +lib/wine/%%WINEARCH%%-windows/cryptxml.dll lib/wine/%%WINEARCH%%-windows/cscript.exe lib/wine/%%WINEARCH%%-windows/ctapi32.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/ctl3d.dll16 @@ -1881,6 +1915,7 @@ lib/wine/%%WINEARCH%%-windows/fontsub.dll lib/wine/%%WINEARCH%%-windows/fsutil.exe lib/wine/%%WINEARCH%%-windows/fusion.dll lib/wine/%%WINEARCH%%-windows/fwpuclnt.dll +lib/wine/%%WINEARCH%%-windows/gameinput.dll lib/wine/%%WINEARCH%%-windows/gameux.dll lib/wine/%%WINEARCH%%-windows/gamingtcui.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/gdi.exe16 @@ -1973,12 +2008,14 @@ lib/wine/%%WINEARCH%%-windows/libcoml2.a lib/wine/%%WINEARCH%%-windows/libcompiler-rt.a lib/wine/%%WINEARCH%%-windows/libcompstui.a lib/wine/%%WINEARCH%%-windows/libcomsvcs.a +lib/wine/%%WINEARCH%%-windows/libcoremessaging.a lib/wine/%%WINEARCH%%-windows/libcredui.a lib/wine/%%WINEARCH%%-windows/libcrypt32.a lib/wine/%%WINEARCH%%-windows/libcryptdll.a lib/wine/%%WINEARCH%%-windows/libcryptnet.a lib/wine/%%WINEARCH%%-windows/libcryptsp.a lib/wine/%%WINEARCH%%-windows/libcryptui.a +lib/wine/%%WINEARCH%%-windows/libcryptxml.a lib/wine/%%WINEARCH%%-windows/libd2d1.a lib/wine/%%WINEARCH%%-windows/libd3d10.a lib/wine/%%WINEARCH%%-windows/libd3d10_1.a @@ -2523,6 +2560,7 @@ lib/wine/%%WINEARCH%%-windows/usp10.dll lib/wine/%%WINEARCH%%-windows/utildll.dll lib/wine/%%WINEARCH%%-windows/uxtheme.dll lib/wine/%%WINEARCH%%-windows/vbscript.dll +lib/wine/%%WINEARCH%%-windows/vccorlib140.dll lib/wine/%%WINEARCH%%-windows/vcomp.dll lib/wine/%%WINEARCH%%-windows/vcomp100.dll lib/wine/%%WINEARCH%%-windows/vcomp110.dll @@ -2564,6 +2602,7 @@ lib/wine/%%WINEARCH%%-windows/wimgapi.dll lib/wine/%%WINEARCH%%-windows/win32u.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/win87em.dll16 %%WINE32%%lib/wine/%%WINEARCH%%-windows/winaspi.dll16 +lib/wine/%%WINEARCH%%-windows/winbio.dll %%WINE32%%lib/wine/%%WINEARCH%%-windows/windebug.dll16 lib/wine/%%WINEARCH%%-windows/windows.applicationmodel.dll lib/wine/%%WINEARCH%%-windows/windows.devices.bluetooth.dll |