diff options
Diffstat (limited to 'emulators/wine-devel')
| -rw-r--r-- | emulators/wine-devel/Makefile | 63 | ||||
| -rw-r--r-- | emulators/wine-devel/distinfo | 6 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__x86__64.c | 11 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-server_ptrace.c | 11 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 20 |
5 files changed, 65 insertions, 46 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 613f0931ffb0..a4bdf3863d39 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= wine -DISTVERSION= 10.12 +DISTVERSION= 10.14 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/10.x/ @@ -18,18 +18,21 @@ ONLY_FOR_ARCHS= amd64 i386 BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex # Only devel/llvm17 and later come with necessary include files - PR274542 -USES= bison cpe desktop-file-utils gmake \ - llvm:min=17,build,noexport localbase \ - pkgconfig sdl shebangfix tar:xz +USES= bison cpe desktop-file-utils gmake llvm:min=17,build,noexport \ + localbase pkgconfig sdl shebangfix tar:xz +CPE_VENDOR= winehq USE_GCC= yes +WINELIBDIR= ${PREFIX}/lib +.if !defined(USE_LDCONFIG32) +USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine +.endif USE_SDL= sdl2 -CPE_VENDOR= winehq - -CONFLICTS_INSTALL= wine +SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ + tools/winedump/function_grep.pl GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--verbose \ +CONFIGURE_ARGS= --verbose \ --disable-kerberos \ --disable-tests \ --without-capi \ @@ -53,70 +56,66 @@ CONFIGURE_ARGS+=--verbose \ --without-unwind \ --without-usb CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" -WINELIBDIR= ${PREFIX}/lib -.if !defined(USE_LDCONFIG32) -USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine -.endif -SHEBANG_FILES= tools/make_requests tools/winemaker/winemaker \ - tools/winedump/function_grep.pl + +PIE_UNSAFE= yes + +CONFLICTS_INSTALL= wine BINARY_ALIAS+= clang=${LOCALBASE}/bin/clang${LLVM_VERSION} \ lld-link=${LOCALBASE}/bin/lld-link${LLVM_VERSION} SUB_FILES= pkg-message -PIE_UNSAFE= yes - PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS V4L WAYLAND X11 GECKO MONO -OPTIONS_DEFAULT=ALSA GNUTLS WAYLAND X11 -OPTIONS_RADIO= AUDIO +OPTIONS_DEFINE= CUPS DOCS DOSBOX GECKO GNUTLS MONO V4L WAYLAND X11 +OPTIONS_DEFAULT= ALSA GNUTLS WAYLAND X11 +OPTIONS_RADIO= AUDIO OPTIONS_RADIO_AUDIO= ALSA OSS -OPTIONS_SUB= yes +OPTIONS_SUB= yes DOSBOX_DESC= Use DOSBox to run MS-DOS programs GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine WAYLAND_DESC= Wayland Support -ALSA_CONFIGURE_WITH= alsa -ALSA_USES= gnome gstreamer -ALSA_USE= GNOME=glib20 ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_RUN_DEPENDS= alsa-plugins>0:audio/alsa-plugins +ALSA_USES= gnome gstreamer +ALSA_USE= GNOME=glib20 +ALSA_CONFIGURE_WITH= alsa -CUPS_CONFIGURE_WITH= cups CUPS_LIB_DEPENDS= libcups.so:print/cups +CUPS_CONFIGURE_WITH= cups DOSBOX_RUN_DEPENDS= dosbox:emulators/dosbox GECKO_RUN_DEPENDS= wine-gecko-devel>0:emulators/wine-gecko-devel -GNUTLS_CONFIGURE_WITH= gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls +GNUTLS_CONFIGURE_WITH= gnutls MONO_RUN_DEPENDS= wine-mono-devel>0:emulators/wine-mono-devel -OSS_CONFIGURE_WITH= oss OSS_USES= gnome gstreamer OSS_USE= GNOME=glib20 +OSS_CONFIGURE_WITH= oss -V4L_CONFIGURE_WITH= v4l2 V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l +V4L_CONFIGURE_WITH= v4l2 -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 +WAYLAND_CONFIGURE_WITH= wayland -X11_CONFIGURE_WITH= x fontconfig freetype opengl xinerama xinput2 xrandr xrender -X11_USES= gl xorg -X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libvulkan.so:graphics/vulkan-loader +X11_USES= gl xorg +X11_USE= GL=glu XORG=x11,xcomposite,xcursor,xext,xi,xinerama,xrandr,xrender +X11_CONFIGURE_WITH= fontconfig freetype opengl x xinerama xinput2 xrandr xrender .include <bsd.port.pre.mk> @@ -147,7 +146,7 @@ post-patch: ${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop .else -EXTRA_PATCHES+= ${PATCHDIR}/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 b1fee7a29e6a..023228ac2e3b 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1752417916 -SHA256 (wine-10.12.tar.xz) = cd572c71a3d72e87f98490b228c7c26aaeb3fde38dd9e79fc3b56391d599d6bf -SIZE (wine-10.12.tar.xz) = 32594888 +TIMESTAMP = 1756654573 +SHA256 (wine-10.14.tar.xz) = a4fa3b5aefe1c0b7391a91a2c3c733b8dfd04bb315c8eabcfb2af413969e5e4b +SIZE (wine-10.14.tar.xz) = 32742480 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/patch-server_ptrace.c b/emulators/wine-devel/files/patch-server_ptrace.c deleted file mode 100644 index e07e605613f5..000000000000 --- a/emulators/wine-devel/files/patch-server_ptrace.c +++ /dev/null @@ -1,11 +0,0 @@ ---- server/ptrace.c.orig 2025-07-11 20:05:52 UTC -+++ server/ptrace.c -@@ -687,7 +687,7 @@ void init_thread_context( struct thread *thread ) - struct dbreg dbregs; - - memset( &dbregs, 0, sizeof(dbregs) ); -- ptrace( PTRACE_SETDBREGS, get_ptrace_tid( thread ), (caddr_t)&dbregs, 0 ); -+ ptrace( PTRACE_SETDBREGS, thread->unix_tid , (caddr_t)&dbregs, 0 ); - resume_after_ptrace( thread ); - } - thread->system_regs = 0; diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 27f578564923..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 @@ -230,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 @@ -539,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 @@ -1136,6 +1140,8 @@ 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 @@ -1197,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 @@ -1205,12 +1213,16 @@ 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 @@ -1273,6 +1285,8 @@ 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 @@ -1439,6 +1453,7 @@ 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 @@ -1753,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 @@ -1899,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 @@ -1998,6 +2015,7 @@ 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 @@ -2542,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 @@ -2583,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 |