<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/0dad2030ae563e8686bdbd981e11ab66a2a83e94">https://github.com/macports/macports-ports/commit/0dad2030ae563e8686bdbd981e11ab66a2a83e94</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 0dad203 wine-devel: Update to 3.15
</span>0dad203 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0dad2030ae563e8686bdbd981e11ab66a2a83e94
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Sep 9 23:26:03 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> wine-devel: Update to 3.15
</span>---
x11/wine-devel/Portfile | 9 ++++-----
x11/wine-devel/files/fix-flicker.patch | 29 ++++++++++++++---------------
2 files changed, 18 insertions(+), 20 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 69a6ef9..986a572 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;'>@@ -14,8 +14,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 3.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.15
</span> set branch [lindex [split ${version} .] 0].x
license LGPL-2.1+
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,9 +59,9 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 00bc0fa75ef6be64621dde79c90cbd06544aa120 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 47896634c255c202d04b85f884b4f1bceb02e1d7bb2ff257b6bc8d69d4b0b005 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20583696 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5151a9d94fc2c2d52593609a7908f730b6930035 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2ca2cd95b69f2d89aaa481db34db20cbb249c6aba28ad77ecf383270326ab51e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21402964 \
</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 65d1583..c195214 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,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 2018-05-25 13:38:57.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wined3d/context.c 2018-05-25 23:06:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1646,20 +1646,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/wined3d/context.c.orig 2018-08-31 14:24:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/wined3d/context.c 2018-09-09 23:06:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1646,7 +1646,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;'>+@@ -1654,12 +1654,16 @@
</span> unsigned int current_value;
PIXELFORMATDESCRIPTOR pfd;
int iPixelFormat = 0;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +23,7 @@
</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;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,16 +69,16 @@
</span> - 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;'>-@@ -2026,7 +2034,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2089,7 +2097,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></pre><pre style='margin:0'>
</pre>