<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/93945fbe46cbd1c2c8dae2fbd38cbd324edbfd61">https://github.com/macports/macports-ports/commit/93945fbe46cbd1c2c8dae2fbd38cbd324edbfd61</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 93945fb wine: Update to 3.0
</span>93945fb is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 93945fbe46cbd1c2c8dae2fbd38cbd324edbfd61
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jan 25 03:30:15 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> wine: Update to 3.0
</span>---
x11/wine/Portfile | 9 ++++---
x11/wine/files/fix-flicker.patch | 51 ++++++++++++++++++----------------------
2 files changed, 27 insertions(+), 33 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 abdea5a..b44c861 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;'>@@ -2,7 +2,6 @@
</span>
PortSystem 1.0
PortGroup compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup snowleopard_fixes 1.0
</span>
# Please keep the wine, wine-devel and wine-crossover ports as similar as possible.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,7 +12,7 @@ PortGroup snowleopard_fixes 1.0
</span> name wine
conflicts wine-devel wine-crossover
set my_name wine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.0.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0
</span> set branch [lindex [split ${version} .] 0].0
license LGPL-2.1+
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,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 2662d1e32cbc13f3eedc08966f99af41c74b90e0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b5e07b350edd34e4fb2615edb143f832a208a939fc9937a819181eecaf32985a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18898148 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 635bee4c3a0d94c0cce2faae830c843e91cd4a53 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 346a050aca5cd0d9978a655af11c30e68c201a58aea0c70d5e4c4f1b63c2fbec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19712932 \
</span> ${wine_gecko_distfile} \
rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
<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 9636098..5bd31ea 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,8 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch to fix flickering in full screen. Patch 57066 below.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugs.winehq.org/show_bug.cgi?id=34166
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/wined3d/context.c.orig 2017-10-20 07:17:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wined3d/context.c 2017-10-21 02:10:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1420,19 +1420,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Patch to fix flickering in full screen. Patch from
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://raw.githubusercontent.com/Homebrew/formula-patches/74c2566/wine/2.14.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See: https://bugs.winehq.org/show_bug.cgi?id=34166
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/wined3d/context.c.orig 2017-09-29 13:30:17.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/wined3d/context.c 2017-09-29 19:58:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1600,20 +1600,24 @@
</span> }
/* This function takes care of wined3d pixel format selection. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,25 +11,26 @@
</span> - const struct wined3d_format *color_format, const struct wined3d_format *ds_format,
+static int context_choose_pixel_format(const struct wined3d_device *device, const struct wined3d_swapchain *swapchain,
+ HDC hdc, const struct wined3d_format *color_format, const struct wined3d_format *ds_format,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- BOOL auxBuffers, BOOL findCompatible)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOL auxBuffers)
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- int iPixelFormat=0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned int current_value;
</span> unsigned int cfg_count = device->adapter->cfg_count;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int current_value;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PIXELFORMATDESCRIPTOR pfd;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int iPixelFormat = 0;
</span> + BOOL double_buffer = TRUE;
unsigned int i;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x, find_compatible %#x.\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TRACE("device %p, dc %p, color_format %s, ds_format %s, aux_buffers %#x.\n",
</span> device, hdc, debug_d3dformat(color_format->id), debug_d3dformat(ds_format->id),
<span style='display:block; white-space:pre;background:#ffe0e0;'>- auxBuffers, findCompatible);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auxBuffers);
</span>
<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;'>-@@ -1444,7 +1448,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1625,7 +1629,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;'>@@ -37,7 +39,7 @@
</span> continue;
if (cfg->redSize < color_format->red_size)
continue;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1467,17 +1471,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1648,17 +1652,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;'>@@ -61,30 +63,23 @@
</span>
if (value > current_value)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1498,7 +1504,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ZeroMemory(&pfd, sizeof(pfd));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1674,7 +1680,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memset(&pfd, 0, sizeof(pfd));
</span> 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;'>-@@ -1771,13 +1779,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1973,7 +1981,7 @@
</span> }
/* Try to find a pixel format which matches our requirements. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, FALSE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pixel_format = context_choose_pixel_format(device, swapchain, hdc, color_format, ds_format, auxBuffers, FALSE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Try to locate a compatible format if we weren't able to find anything. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!pixel_format)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TRACE("Trying to locate a compatible pixel format because an exact match failed.\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pixel_format = context_choose_pixel_format(device, swapchain, hdc, color_format, ds_format, auxBuffers, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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:#e0ffe0;'>++ 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:#e0ffe0;'>+ goto out;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /* If we still don't have a pixel format, something is very wrong as ChoosePixelFormat barely fails */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ret->gl_info = gl_info;
</span></pre><pre style='margin:0'>
</pre>