<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/9a97bac838bcca5e89df4a43edb22a027455f8bd">https://github.com/macports/macports-ports/commit/9a97bac838bcca5e89df4a43edb22a027455f8bd</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 9a97bac wine-devel: Update to 2.18
</span>9a97bac is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9a97bac838bcca5e89df4a43edb22a027455f8bd
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Fri Sep 29 20:24:44 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> wine-devel: Update to 2.18
</span>---
x11/wine-devel/Portfile | 11 +++++++----
x11/wine-devel/files/fix-flicker.patch | 18 ++++++++----------
2 files changed, 15 insertions(+), 14 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 8bfd0e7..674d3b1 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;'>@@ -12,7 +12,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 2.17
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.18
</span> set branch [lindex [split ${version} .] 0].x
license LGPL-2.1+
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,14 +55,17 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 140fc514d9b9892bd2abb4de2194f1825abebc75 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7edc95739043ccc55957af663fb910318283dc5d1db42cd7f0224e30acfcea69 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 730971f72eff121944bcb99cd43e3e47786fb1bf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 9f0931129878157d717cb39f16cd33bf49f40aac77331c93d0ad30f2ccac4f50 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 19546360 \
</span> ${wine_gecko_distfile} \
rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 49266176 \
</span> ${wine_mono_distfile} \
rmd160 3e2932960dabff8283f02b32dc573b0dda6adfac \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 56470528
</span>
# Note: Most of the X11 libs are dlopen()'d
depends_lib port:fontconfig \
<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 295b938..5bd31ea 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,17 @@
</span> # Patch to fix flickering in full screen. Patch 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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/wined3d/context.c.orig 2017-02-17 21:35:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/wined3d/context.c 2017-02-18 17:45:40.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1431,20 +1431,24 @@
</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. */
-static int context_choose_pixel_format(const struct wined3d_device *device, 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)
</span> +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)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BOOL auxBuffers)
</span> {
unsigned int cfg_count = device->adapter->cfg_count;
unsigned int current_value;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +30,7 @@
</span> current_value = 0;
for (i = 0; i < cfg_count; ++i)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1456,7 +1460,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;'>@@ -41,7 +39,7 @@
</span> continue;
if (cfg->redSize < color_format->red_size)
continue;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1479,17 +1483,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;'>@@ -65,7 +63,7 @@
</span>
if (value > current_value)
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1505,7 +1511,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1674,7 +1680,9 @@
</span> memset(&pfd, 0, sizeof(pfd));
pfd.nSize = sizeof(pfd);
pfd.nVersion = 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +74,7 @@
</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;'>-@@ -1777,7 +1785,7 @@
</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. */
</pre><pre style='margin:0'>
</pre>