<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fdb4839926f91515ef82486414a60a1c97ecf92b">https://github.com/macports/macports-ports/commit/fdb4839926f91515ef82486414a60a1c97ecf92b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new fdb4839 wine: Update to 4.0.3
</span>fdb4839 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit fdb4839926f91515ef82486414a60a1c97ecf92b
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Apr 6 05:57:05 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> wine: Update to 4.0.3
</span>---
x11/wine/Portfile | 42 ++++++++++++++++++++++---------------
x11/wine/files/fix-flicker.patch | 35 +++++++++++++++----------------
x11/wine/files/patch-configure.diff | 19 -----------------
x11/wine/files/wine.in | 4 ----
4 files changed, 42 insertions(+), 58 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/Portfile b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index dbcdf8e..aa13f86 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> name wine
conflicts wine-devel wine-crossover
set my_name wine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> set branch [lindex [split ${version} .] 0].0
license LGPL-2.1+
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,7 +29,7 @@ set wine_distfile ${distname}${extract.suffix}
</span> set wine_gecko_version 2.47
set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
set wine_gecko64_distfile wine_gecko-${wine_gecko_version}-x86_64.msi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_mono_version 4.7.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set wine_mono_version 4.7.5
</span> set wine_mono_distfile wine-mono-${wine_mono_version}.msi
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,9 +60,9 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1dc9763ea4e7549d9ffff488d8eba61865947e52 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d45a88edbe7db363e297cacedc94e66df3464504a01c2eccf04f518066a6fb0c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20556944 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 347dab2714272e4ef36f397cdbc52c5b95ea211a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 25026d9f98a5d62583b8a02c91b1adaca9a2ff000d54095bb274045379e00fda \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21680420 \
</span> ${wine_gecko_distfile} \
rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,8 +72,8 @@ checksums ${wine_distfile} \
</span> sha256 c565ea25e50ea953937d4ab01299e4306da4a556946327d253ea9b28357e4a7d \
size 50806272 \
${wine_mono_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 3e2932960dabff8283f02b32dc573b0dda6adfac \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0fa40e1701cd76e5590929beb20a3cb8b2c3184d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 154d68d476cdedef56f159d837fbb5eef9358a9f85de89f86c189ec4da004b3f \
</span> size 56470528
# Note: Most of the X11 libs are dlopen()'d
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,7 +99,6 @@ depends_build port:bison \
</span> port:pkgconfig
patchfiles BOOL.patch \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff \
</span> cups_headers.patch \
fix-flicker.patch \
mach_machine.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,6 +214,8 @@ if {${os.platform} ne "darwin" || (${os.major} >= 9 && ${os.major} <= 17)} {
</span>
configure.universal_args
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_build_args(x86_64) "dlldir=\\\\\${libdir}/wine64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set merger_destroot_args(x86_64) "dlldir=\\\\\${libdir}/wine64"
</span> set merger_configure_args(x86_64) "--enable-win64 --libdir=${prefix}/lib"
set merger_configure_args(i386) --with-wine64=${workpath}/${worksrcdir}-x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,6 +268,18 @@ platform darwin {
</span> configure.args-delete --with-gnutls
configure.args-append --without-gnutls
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Vulkan is supported on macOS through MoltenVK since Wine 3.13, but because
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # it uses Metal it only works on 64-bit, and because it only builds with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Xcode 9 or later it requires Sierra or later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 16 && [variant_exists universal] && [variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:MoltenVK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_skip_archcheck-append MoltenVK
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(x86_64) --with-vulkan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend merger_configure_args(i386) --without-vulkan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --without-vulkan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {${os.major} < 10} {
configure.args-delete --with-opencl
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -317,21 +331,15 @@ if {${os.endian} eq "big"} {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/libexec/wine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall ${filespath}/wine.in ${destroot}${prefix}/bin/wine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> xinstall -d ${destroot}${prefix}/share/wine/gecko
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${distpath} ${wine_gecko_distfile} ${wine_gecko64_distfile} ${destroot}${prefix}/share/wine/gecko
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${distpath} ${wine_gecko_distfile} ${wine_gecko64_distfile} ${destroot}${prefix}/share/wine/gecko
</span>
xinstall -d ${destroot}${prefix}/share/wine/mono
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${distpath}/${wine_mono_distfile} ${destroot}${prefix}/share/wine/mono
</span>
set docdir ${prefix}/share/doc/${my_name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} \
</span> ANNOUNCE \
AUTHORS \
COPYING.LIB \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/files/fix-flicker.patch b/x11/wine/files/fix-flicker.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 5bd31ea..9bdc874 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/files/fix-flicker.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine/files/fix-flicker.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch to fix flickering in full screen. Patch from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch to fix flickering in full screen. Patch updated from
</span> # https://raw.githubusercontent.com/Homebrew/formula-patches/74c2566/wine/2.14.patch
# See: https://bugs.winehq.org/show_bug.cgi?id=34166
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/wined3d/context.c.orig 2017-09-29 13:30:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wined3d/context.c 2017-09-29 19:58:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1600,20 +1600,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/wined3d/context.c.orig 2019-11-25 09:10:40.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/wined3d/context.c 2020-04-06 05:22:31.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1647,7 +1647,7 @@
</span> }
/* This function takes care of wined3d pixel format selection. */
-static int context_choose_pixel_format(const struct wined3d_device *device, HDC hdc,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- const struct wined3d_format *color_format, const struct wined3d_format *ds_format,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static int context_choose_pixel_format(const struct wined3d_device *device, const struct wined3d_swapchain *swapchain,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HDC hdc, const struct wined3d_format *color_format, const struct wined3d_format *ds_format,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int context_choose_pixel_format(const struct wined3d_device *device, const struct wined3d_swapchain *swapchain, HDC hdc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const struct wined3d_format *color_format, const struct wined3d_format *ds_format,
</span> BOOL auxBuffers)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int cfg_count = device->adapter->cfg_count;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1655,12 +1655,16 @@
</span> unsigned int current_value;
PIXELFORMATDESCRIPTOR pfd;
int iPixelFormat = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,13 +23,13 @@
</span> device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id),
auxBuffers);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !swapchain->desc.backbuffer_count)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !swapchain->desc.backbuffer_count)
</span> + double_buffer = FALSE;
+
current_value = 0;
for (i = 0; i < cfg_count; ++i)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1625,7 +1629,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1672,7 +1676,7 @@
</span> if (cfg->iPixelType != WGL_TYPE_RGBA_ARB)
continue;
/* In window mode we need a window drawable format and double buffering. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +38,7 @@
</span> continue;
if (cfg->redSize < color_format->red_size)
continue;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1648,17 +1652,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1695,17 +1699,19 @@
</span> * depth it is no problem to emulate 16-bit using e.g. 24-bit, so accept that. */
if (cfg->depthSize == ds_format->depth_size)
value += 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,23 +62,23 @@
</span>
if (value > current_value)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1674,7 +1680,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1721,7 +1727,9 @@
</span> memset(&pfd, 0, sizeof(pfd));
pfd.nSize = sizeof(pfd);
pfd.nVersion = 1;
- pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/
+ pfd.dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW;/*PFD_GENERIC_ACCELERATED*/
+ if (double_buffer)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pfd.dwFlags |= PFD_DOUBLEBUFFER;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pfd.dwFlags |= PFD_DOUBLEBUFFER;
</span> pfd.iPixelType = PFD_TYPE_RGBA;
pfd.cAlphaBits = color_format->alpha_size;
pfd.cColorBits = color_format->red_size + color_format->green_size
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1973,7 +1981,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2090,7 +2098,7 @@
</span> }
/* Try to find a pixel format which matches our requirements. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(ret->pixel_format = context_choose_pixel_format(device, ret->hdc, color_format, ds_format, auxBuffers)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(ret->pixel_format = context_choose_pixel_format(device, swapchain, ret->hdc, color_format, ds_format, auxBuffers)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto out;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!(context->pixel_format = context_choose_pixel_format(device,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!(context->pixel_format = context_choose_pixel_format(device, context->swapchain,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ context->hdc, color_format, ds_format, aux_buffers)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return FALSE;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ret->gl_info = gl_info;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/files/patch-configure.diff b/x11/wine/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6cc1ab2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Output DLLs to different directories so that we don't have a clash when
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# they're merged back together
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7320,7 +7320,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--dlldir="\${libdir}/wine"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if test "x$enable_win64" = "xyes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dlldir="\${libdir}/wine64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dlldir="\${libdir}/wine"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DLLFLAGS="-D_REENTRANT"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine/files/wine.in b/x11/wine/files/wine.in
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index e107b66..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine/files/wine.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:/usr/lib" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"@PREFIX@/libexec/wine/wine" "$@"
</span></pre><pre style='margin:0'>
</pre>