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/wine-wow64.sh | 3 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 10 |
5 files changed, 23 insertions, 25 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 42173a71f552..d98676b38c45 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,12 +1,11 @@ PORTNAME= wine -DISTVERSION= 10.6 -PORTREVISION= 1 +DISTVERSION= 10.10 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..261fa76cdef2 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 = 1749898973 +SHA256 (wine-10.10.tar.xz) = e76466a5ca3197f399ddf8069b0a79e5eb2dffe5b3b7db9eb7272288330c8596 +SIZE (wine-10.10.tar.xz) = 32528748 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/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..90a35cde7ec4 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -341,6 +341,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 @@ -502,6 +503,7 @@ 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/errorrep.h include/wine/windows/errors.h include/wine/windows/errrec.idl @@ -1129,6 +1131,8 @@ include/wine/windows/windows.data.xml.dom.h include/wine/windows/windows.data.xml.dom.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 @@ -1202,6 +1206,8 @@ 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,6 +1260,8 @@ 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.xaml.h @@ -1415,6 +1423,7 @@ 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 @@ -1973,6 +1982,7 @@ 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 |