<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/6da8d797725e120484ff6bd4d1d22d08a41c24dd">https://github.com/macports/macports-ports/commit/6da8d797725e120484ff6bd4d1d22d08a41c24dd</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 6da8d79 wine-devel: Update to 2.14
</span>6da8d79 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6da8d797725e120484ff6bd4d1d22d08a41c24dd
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Aug 5 03:04:35 2017 -0500
<span style='display:block; white-space:pre;color:#404040;'> wine-devel: Update to 2.14
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/54570
</span>---
x11/wine-devel/Portfile | 12 ++++++------
x11/wine-devel/files/cups_headers.patch | 8 ++++----
x11/wine-devel/files/fix-flicker.patch | 19 ++++++++++---------
3 files changed, 20 insertions(+), 19 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 1498f32..6841594 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.13
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.14
</span> set branch [lindex [split ${version} .] 0].x
license LGPL-2.1+
categories x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ dist_subdir ${my_name}
</span> set wine_distfile ${distname}${extract.suffix}
set wine_gecko_version 2.47
set wine_gecko_distfile wine_gecko-${wine_gecko_version}-x86.msi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set wine_mono_version 4.7.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set wine_mono_version 4.7.1
</span> set wine_mono_distfile wine-mono-${wine_mono_version}.msi
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,14 +55,14 @@ distfiles ${wine_distfile}:winesource \
</span> ${wine_mono_distfile}:winemono
checksums ${wine_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 399f90cb76db283900063d4d067fb781a8a9a94d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6fbca3ddd19b061ce65a267639efae93cf38cfabbe4a9c148a17a44703587ef8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8ebda69ddc584c6e90579c1e5800b8a53184917b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 03f934d95181f728600ca04d395f10e821ee38cfa31655e872e4d27d2a8795c6 \
</span> ${wine_gecko_distfile} \
rmd160 abf7cc78b49dd0623bc8fe87ae0e32bb8694e13d \
sha256 3b8a361f5d63952d21caafd74e849a774994822fb96c5922b01d554f1677643a \
${wine_mono_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6158dce54355c4174ff30544db3a0fd2b9c488b5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7698474dd9cb9eb80796b5812dff37386ba97b78b21ca23b20079ca5ad6ca5a1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 3e2932960dabff8283f02b32dc573b0dda6adfac \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2c8d5db7f833c3413b2519991f5af1f433d59a927564ec6f38a3f1f8b2c629aa
</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/cups_headers.patch b/x11/wine-devel/files/cups_headers.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 795af4b..56ec901 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/wine-devel/files/cups_headers.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/wine-devel/files/cups_headers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- dlls/winspool.drv/info.c.orig 2016-03-18 06:31:01.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ dlls/winspool.drv/info.c 2016-03-23 00:09:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dlls/winspool.drv/info.c.orig 2017-08-03 12:38:53.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dlls/winspool.drv/info.c 2017-08-05 02:53:44.000000000 -0500
</span> @@ -43,6 +43,7 @@
#include <signal.h>
#ifdef HAVE_CUPS_CUPS_H
# include <cups/cups.h>
+# include <cups/ppd.h>
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_CUPS_PPD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <cups/ppd.h>
</span><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 672d701..295b938 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,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Patch to fix flickering in full screen. Patch 57353 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:#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>
--- dlls/wined3d/context.c.orig 2017-02-17 21:35:09.000000000 +0100
+++ dlls/wined3d/context.c 2017-02-18 17:45:40.000000000 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1431,20 +1431,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1431,20 +1431,24 @@
</span> }
/* This function takes care of wined3d pixel format selection. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +32,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;'>+@@ -1456,7 +1460,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;'>@@ -40,7 +41,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;'>+@@ -1479,17 +1483,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;'>@@ -64,7 +65,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;'>+@@ -1505,7 +1511,9 @@
</span> memset(&pfd, 0, sizeof(pfd));
pfd.nSize = sizeof(pfd);
pfd.nVersion = 1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,12 +76,12 @@
</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;'>+@@ -1777,7 +1785,7 @@
</span> }
/* Try to find a pixel format which matches our requirements. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!(pixel_format = context_choose_pixel_format(device, hdc, color_format, ds_format, auxBuffers)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!(pixel_format = context_choose_pixel_format(device, swapchain, 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, 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> goto out;
ret->gl_info = gl_info;
</pre><pre style='margin:0'>
</pre>