svn commit: r455277 - in head/emulators/wine-devel: . files

[Gerald Pfeifer]

Author: gerald
Date: Fri Dec  1 11:48:12 2017
New Revision: 455277
URL: https://svnweb.freebsd.org/changeset/ports/455277

Log:
  Update to Wine 2.22.  This includes the following changes:
   - Source selection dialog for scanners.
   - Float audio formats with more than 2 channels in XAudio.
   - Fixes for DLL injection support.
   - Input methods improvements.
   - Various bug fixes.
  
  Mark the STAGING option, and hence the wine-staging port as well, as
  BROKEN.  Once again that patchset still is not available yet a week
  after the Wine snapshot.
  
  Temporarily add a patch against dlls/advapi32/perf.c that I got
  accepted upstream in the meantime, so it should become obsolete
  with the next minor version.

Added:
  head/emulators/wine-devel/files/patch-dlls_advapi32_perf.c   (contents, props changed)
Modified:
  head/emulators/wine-devel/Makefile
  head/emulators/wine-devel/distinfo
  head/emulators/wine-devel/pkg-plist

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Fri Dec  1 11:46:32 2017	(r455276)
+++ head/emulators/wine-devel/Makefile	Fri Dec  1 11:48:12 2017	(r455277)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	2.21
+DISTVERSION=	2.22
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \

Modified: head/emulators/wine-devel/distinfo
==============================================================================
--- head/emulators/wine-devel/distinfo	Fri Dec  1 11:46:32 2017	(r455276)
+++ head/emulators/wine-devel/distinfo	Fri Dec  1 11:48:12 2017	(r455277)
@@ -1,5 +1,3 @@
-TIMESTAMP = 1511391649
-SHA256 (wine-2.21.tar.xz) = bafa04e8cfbb3c5fbb6bb5080fb5d3f2f6816ac69518d0ed50aceadb66b4abef
-SIZE (wine-2.21.tar.xz) = 19620888
-SHA256 (v2.21.tar.gz) = 20ff258de2dcc2f886fcb804c313963da060a55c89f5265c69510a2adfd04ba6
-SIZE (v2.21.tar.gz) = 10229454
+TIMESTAMP = 1511621287
+SHA256 (wine-2.22.tar.xz) = db5c7e7f652405d927b3ba43cc09e4e2f5726a2c7cbf9445a0d01d1b335e8b73
+SIZE (wine-2.22.tar.xz) = 19635032

Added: head/emulators/wine-devel/files/patch-dlls_advapi32_perf.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/wine-devel/files/patch-dlls_advapi32_perf.c	Fri Dec  1 11:48:12 2017	(r455277)
@@ -0,0 +1,44 @@
+From: Gerald Pfeifer <gerald at pfeifer.com>
+To: wine-devel at winehq.org, Austin English <austinenglish at gmail.com>
+Date: Sat, 25 Nov 2017 15:43:13 +0100 (CET)
+Subject: [PATCH] advapi32: Include <stdarg.h> since winbase.h expects va_list
+
+The addition of dlls/advapi32/perf.c about a week ago broke my nightly 
+FreeBSD builder as follows:
+
+  In file included from perf.c:24:
+  ../../include/windef.h:106:24: error: unknown type name ‘va_list’
+   #  define __ms_va_list va_list
+                          ^~~~~~~
+  ../../include/winbase.h:2002:84: note: in expansion of macro ‘__ms_va_list’ in
+  WINBASEAPI DWORD WINAPI FormatMessageA(DWORD,LPCVOID,DWORD,DWORD,LPSTR,DWORD,__ms_va_list*);
+
+This is a typical failure mode I've seen on FreeBSD, which is more 
+parsimonious than GNU/Linux when it comes to include files pulling 
+in others, though our peak with Wine running into this was more than 
+a decade ago. ;-)
+
+Investigating this case a little I found that indeed winbase.h and 
+in turn windef.h assume va_list is known and indeed many other files 
+in dlls/advapi32 already include stdarg.h.
+
+Gerald
+
+Signed-off-by: Gerald Pfeifer <gerald at pfeifer.com>
+---
+ dlls/advapi32/perf.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- UTC
+--- dlls/advapi32/perf.c
++++ dlls/advapi32/perf.c
+@@ -18,6 +18,7 @@
+  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+  */
+ 
++#include <stdarg.h>
+ #include <stdio.h>
+ 
+ #include "windef.h"
+-- 
+2.15.0

Modified: head/emulators/wine-devel/pkg-plist
==============================================================================
--- head/emulators/wine-devel/pkg-plist	Fri Dec  1 11:46:32 2017	(r455276)
+++ head/emulators/wine-devel/pkg-plist	Fri Dec  1 11:48:12 2017	(r455277)
@@ -629,6 +629,7 @@ include/wine/windows/patchapi.h
 %%STAGING%%include/wine/windows/pathcch.h
 include/wine/windows/pdh.h
 include/wine/windows/pdhmsg.h
+include/wine/windows/perflib.h
 include/wine/windows/perhist.h
 include/wine/windows/perhist.idl
 include/wine/windows/physicalmonitorenumerationapi.h
@@ -667,6 +668,8 @@ include/wine/windows/rmxfguid.h
 include/wine/windows/rmxftmpl.h
 include/wine/windows/rmxftmpl.x
 include/wine/windows/roapi.h
+include/wine/windows/roparameterizediid.h
+include/wine/windows/roparameterizediid.idl
 include/wine/windows/row.idl
 include/wine/windows/rowchg.idl
 include/wine/windows/rowpos.idl