<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0da224afbf2b0cd24dae75bb14aec20c77145084">https://github.com/macports/macports-ports/commit/0da224afbf2b0cd24dae75bb14aec20c77145084</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0da224afbf2b0cd24dae75bb14aec20c77145084
</span>Author: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Tue Jan 7 23:11:21 2025 -0500
<span style='display:block; white-space:pre;color:#404040;'> wine-devel, wine-staging: Allow building on 10.12 and later
</span>---
emulators/wine-devel/Portfile | 68 ++++++++++++++++++++++++++++++++++++-------
1 file changed, 57 insertions(+), 11 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/wine-devel/Portfile b/emulators/wine-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da4ea667341..271a26ecfa2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,11 +13,12 @@ name wine-devel
</span> conflicts wine-stable wine-staging wine-crossover
set my_name wine
revision 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms {darwin >= 19}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# MacPorts does not support i386 on macOS Mojave and new WoW64 requires macOS Catalina 10.15.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms {darwin > 15 != 18}
</span> set branch [lindex [split ${version} .] 0].x
license LGPL-2.1+
categories emulators
<span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs i386 x86_64
</span> maintainers {@Gcenx gmail.com:gcenx83}
homepage https://www.winehq.org
dist_subdir ${my_name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,7 +53,6 @@ depends_lib \
</span> port:freetype \
port:gettext-runtime \
path:lib/pkgconfig/gnutls.pc:gnutls \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libMoltenVK.dylib:MoltenVK-latest \
</span> port:libpcap \
port:libsdl2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,6 +60,12 @@ depends_run \
</span> port:mingw-w64-wine-gecko-2.47.4 \
port:mingw-w64-wine-mono-9.3.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gitlab.winehq.org/wine/wine/-/commit/c7a97b5d5d56ef00a0061b75412c6e0e489fdc99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "/PKG_CONFIG_LIBDIR/d" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -q "/PKG_CONFIG_LIBDIR/d" ${worksrcpath}/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patch.pre_args-replace -p0 -p1
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +82,6 @@ configure.install \
</span> ${worksrcpath}/tools/install-sh
configure.args.x86_64 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-archs=i386,x86_64 \
</span> --enable-win64
configure.args \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,7 +117,7 @@ configure.args \
</span> --with-unwind \
--without-usb \
--without-v4l2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-vulkan \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-vulkan \
</span> --without-wayland \
--without-x
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,10 +130,6 @@ configure.ldflags-append -Wl,-rpath,${compiler.library_path}
</span> # FSF GCC cannot compile code using Apple's "blocks" language extensions
compiler.blacklist-append {*gcc*} {clang < 800} {macports-clang-3.*}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Setting an older deployment target avoids build error with MacOSX15.sdk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gitlab.winehq.org/wine/wine/-/merge_requests/5935#note_74758
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-macosx_deployment_target 10.15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {${subport} eq "wine-devel"} {
patchfiles-append 1001-devel-msync.diff
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -150,10 +151,14 @@ subport wine-staging {
</span>
depends_patch-append port:autoconf
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver 3.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_patch-append port:python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Applying staging after other patchfiles to avoid problems
post-patch {
system -W ${worksrcpath} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "${workpath}/wine-staging-${staging_version}/staging/patchinstall.py --all -W eventfd_synchronization -W ntdll-Syscall_Emulation -W winemac.drv-no-flicker-patch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${frameworks_dir}/Python.framework/Versions/${py_ver}/bin/python3 ${workpath}/wine-staging-${staging_version}/staging/patchinstall.py --all -W eventfd_synchronization -W ntdll-Syscall_Emulation -W winemac.drv-no-flicker-patch"
</span> system -W ${worksrcpath} \
"patch -p1 < ${filespath}/1001-staging-msync.diff"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,7 +203,48 @@ variant kerberos description "Build ${subport} with Kerberos, for network authen
</span> configure.args-replace --without-krb5 --with-krb5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +ffmpeg +gstreamer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} < 19} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Using the 10.13 SDK as that's what CodeWeavers tests against for i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.sdk_version 10.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Building ${subport} @${version} requires the MacOSX10.13.sdk to be present in ${developer_dir}/SDKs/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +universal
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${universal_possible} && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args.i386 --with-wine64=${workpath}/${worksrcdir}-x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notes-append "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \n
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Wine supports both 32-bit and 64-bit now. It is compatible with your\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ existing 32-bit wine prefix, but it will now default to 64-bit when you\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ create a new wine prefix. The architecture can be selected using the\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WINEARCH environment variable which can be set to either \"win32\" or\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \"win64\".
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ To create a new pure 32-bit prefix, you can run:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \$ WINEARCH=win32 WINEPREFIX=~/.wine32 winecfg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ See the Wine FAQ for details: https://wiki.winehq.org/FAQ#Wineprefixes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ supported_archs i386
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} > 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib path:lib/libMoltenVK.dylib:MoltenVK-latest
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args.x86_64-append --enable-archs=i386,x86_64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --without-vulkan --with-vulkan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Setting an older deployment target avoids build error with MacOSX15.sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://gitlab.winehq.org/wine/wine/-/merge_requests/5935#note_74758
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macosx_deployment_target 10.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +ffmpeg +gstreamer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
triplet.add_build cross
triplet.add_host none
</pre><pre style='margin:0'>
</pre>