<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/af4c98751b4a691e4c3118b2f2d909a65c27b834">https://github.com/macports/macports-ports/commit/af4c98751b4a691e4c3118b2f2d909a65c27b834</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 af4c987 wine-devel: Update to 4.8
</span>af4c987 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit af4c98751b4a691e4c3118b2f2d909a65c27b834
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri May 1 05:59:50 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> wine-devel: Update to 4.8
</span>---
x11/wine-devel/Portfile | 8 +++---
x11/wine-devel/files/fix-flicker.patch | 46 +++++++++++++++++++++++-----------
2 files changed, 36 insertions(+), 18 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-devel/Portfile b/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c22e81d..354fbe9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name wine-devel
conflicts wine wine-crossover
set my_name wine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.8
</span> revision 0
set branch [lindex [split ${version} .] 0].x
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,9 +55,9 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 91094a2201a50a9a21c3dd2e3e80d43a79f07741 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3bca9084354a60d202f6b8e670b130366126db0583fa27054f1f02294de7bab0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21962632 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 bd0137625bd09ab08734a0498187cc23692f96a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 48b9ab1c1277e13eede66e1af1f9f885cb8b4c5cb53eea6ebbfe10bc06dfa135 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22024100 \
</span> ${wine_gecko_distfile} \
rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/wine-devel/files/fix-flicker.patch b/x11/wine-devel/files/fix-flicker.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fae28d..c1df221 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-devel/files/fix-flicker.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-devel/files/fix-flicker.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span> # Patch to fix flickering in full screen. Patch updated from
# 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 2019-04-26 15:29:20.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wined3d/context.c 2019-06-17 17:13:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1648,7 +1648,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/wined3d/context.c.orig 2019-05-10 10:43:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/wined3d/context.c 2020-04-25 02:38:49.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1674,7 +1674,7 @@
</span> }
/* This function takes care of wined3d pixel format selection. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@
</span> const struct wined3d_format *color_format, const struct wined3d_format *ds_format,
BOOL auxBuffers)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1656,12 +1656,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1682,12 +1682,16 @@
</span> unsigned int current_value;
PIXELFORMATDESCRIPTOR pfd;
int iPixelFormat = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +29,7 @@
</span> current_value = 0;
for (i = 0; i < cfg_count; ++i)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1673,7 +1677,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1699,7 +1703,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;'>@@ -38,7 +38,7 @@
</span> continue;
if (cfg->redSize < color_format->red_size)
continue;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1696,17 +1700,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1722,17 +1726,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;'>@@ -62,7 +62,7 @@
</span>
if (value > current_value)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1722,7 +1728,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1748,7 +1754,9 @@
</span> memset(&pfd, 0, sizeof(pfd));
pfd.nSize = sizeof(pfd);
pfd.nVersion = 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,12 +73,30 @@
</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;'>-@@ -2073,7 +2081,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2070,7 +2078,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (i = 0; i < ARRAY_SIZE(ds_formats); ++i)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ds_format = wined3d_get_format(device->adapter, ds_formats[i], WINED3D_BIND_DEPTH_STENCIL);
</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, swapchain,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ context->hdc, color_format, ds_format, TRUE)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ swapchain->ds_format = ds_format;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2083,7 +2091,7 @@
</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;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- context->pixel_format = context_choose_pixel_format(device,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ context->pixel_format = context_choose_pixel_format(device, swapchain,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ context->hdc, color_format, swapchain->ds_format, TRUE);
</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;'>+@@ -2099,7 +2107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * conflicting pixel formats. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ color_format = wined3d_get_format(device->adapter, WINED3DFMT_B8G8R8A8_UNORM, target_bind_flags);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ds_format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, WINED3D_BIND_DEPTH_STENCIL);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- context->pixel_format = context_choose_pixel_format(device,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ context->pixel_format = context_choose_pixel_format(device, swapchain,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ context->hdc, color_format, ds_format, FALSE);
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Try to find a pixel format which matches our requirements. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(context->pixel_format = context_choose_pixel_format(device,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(context->pixel_format = context_choose_pixel_format(device, context->swapchain,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- context->hdc, color_format, ds_format, aux_buffers)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FALSE;
</span>
</pre><pre style='margin:0'>
</pre>