Accepting request 927182 from Emulators

- updated to 6.20 development release
  - MSXml, XAudio, DInput and a few other modules converted to PE.
  - A few system libraries are bundled with the source to support PE builds.
  - HID joystick is now the only supported joystick backend in DirectInput.
  - Better support for MSVCRT builds in Winelib.
  - Various bug fixes.
- update staging to 6.20 release
- wine-fix-faudio.patch: fix build

OBS-URL: https://build.opensuse.org/request/show/927182
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wine?expand=0&rev=355

_service

@@ -3,7 +3,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="url">https://github.com/wine-staging/wine-staging.git</param>
-    <param name="revision">refs/tags/v6.19</param>
+    <param name="revision">refs/tags/v6.20</param>
     <param name="match-tag">v*.*</param>
     <param name="scm">git</param>
   </service>

wine-6.19.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4182e2d9627704cc376f46fc3109580ea9077796f44f5ee83e08e3e96bf0ab66
-size 24894356

wine-6.19.tar.xz.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmFgl/gACgkQzvrI6q8X
-UZ2yOw/+NQXj9MOF/OrXVBEx+825DkaUbrF9PzxullVOKzmJGPpGWIgGHV3EyP9K
-M/twGBMrEoNviKRY41vM5hnChPW747ovtDAVUn9aJmHglL/lnCqEXWM3lWYlFg5y
-2eBJQ/8LfrEone1SUyTH1wRxDlFznk04iYkIPUiPFRLyFJeIVv/lUsvriND6dmUD
-OWxdqcm9yZBIEWdX8kSH5jhulydpmuRd8Gvd+x0AuN2yayjKNOkuLC77Bz0hqnTd
-PSA4YvXuZ0Fuj53Ho4Gyvw+FwJBhw52usYesmcaJXwI2j+s+YRHT49WMsuhC1OSW
-oJTjzU2GyfZ7CmUJ+AhbZXZfXkw4m8BhOuOZIaTUdw4zVvXMs/9oUn5SL70pJ5UR
-RuB7oRB0fqHaSDDRsW21rGr6UMtK8CTX2rARlWdLimAaaS1/Vqe6fkoXUQz4hHpK
-Wwtm4gGI39qoQNaTeY2KkQ7+j5FWgFHTIOeHU/LBsNZWtHm5DV5xz8GMf6L0yH8M
-w80OGjt4pj3OdXYmCJszsaJ/HFX3tKYrTCkuPa/BpFUjJjpKu1sF/c61iOSzhf3x
-Rf31lPiyF57E4gMHnyXEFXvwUSH/uMmVLM4WM/bhHuk/pAsIyh+I+cxWnk7367dL
-CvbgGIbhcLuYs8f4Rkjkhhuw3ax/Ah8t7EeXZs4qeRQHk3bYTTs=
-=v2Gk
------END PGP SIGNATURE-----

wine-6.20.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4028237e9c7bfdd56d7604af19783ff812f645f29c27de742a688e4535528471
+size 26921644

wine-6.20.tar.xz.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmFzFOAACgkQzvrI6q8X
+UZ05lw/+MFt8+hnihi4UKGlGY/pgR4iDontvPbSrBXnwwOBM21qS48OF+NnPNSAF
+gzIgyH6KS0GnF47KM/ur7NbzJAB2Z4MKFKeFBqVqfKooRDu9AxoPuD8E6BiCPtKv
+fTMGSNW05md+DPwPQU/G7Yi4A8uhzeg7PaP/XmAKqGCuFLD+4w7g6E+WCJxSS0qB
+0VwifzuTY5+NQekocZS5EMeIzW9+pE+B6jYe+jQhAAgRmrT811RPZ6gIg8hjwSmg
+aSCnCYTytD5bH4dDiod/X+ioAvPcqtE1hY8bbORiD8CvxE1Ewmucd1L3wKfND7h1
+zVWmpEFa5KNNCuJdD42rrXtYA3RcPqDMVzJ6vU7nMSi2MmZBxwgoATFST9MyJPXv
+L8KJLiMsLKnQSJJe0cLvL7Gcb+XjpMwIAQbi7zfrh/jrFwhtgHL/ZyKrrWY41IVx
+RXxhW/msHr+Op5khN3dVqhyOeiR3vQLGkjrc32+or3syPLcMkZu85X2YyG/B/phj
+XX/8xB0+5YdN+PVS5KdvmgHmDMGkDRQAjFV/99uo9nbdEwkoJmr/G/Toilr3irMQ
+xzSt0jdKiQYDAOYkUQLreDlf5U8BVL3M8PXywr8KmdcRCltIM1szNax1BNKbflCV
+CgGTLPRMvSpSMC/FEzzWayVnmDed+E+gLqkYQITKn/z+0UXF04o=
+=l5p1
+-----END PGP SIGNATURE-----

wine-fix-faudio.patch

@@ -0,0 +1,10 @@
+--- wine-6.20/libs/faudio/src/FAudio_platform_win32.c.xx	2021-10-23 16:09:26.791259433 +0200
++++ wine-6.20/libs/faudio/src/FAudio_platform_win32.c	2021-10-23 16:09:38.291259232 +0200
+@@ -622,6 +622,7 @@
+ {
+ 	if (!data) return 0;
+ 	FAudio_free(data);
++	return 0;
+ }
+ 
+ FAudioIOStream* FAudio_memopen(void *mem, int len)

wine-staging-6.19.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:96778fbf3a3c20d4b28c9e460b13965d8b85dc28f81b64a170c1bc408d41603b
-size 7352376

wine-staging-6.20.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2896018ee0117b2995a9813ebd5e11a0ffc52cf8c12b7f3c4540c7532cdac534
+size 7323272

wine.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Oct 23 08:22:24 UTC 2021 - Marcus Meissner <meissner@suse.com>
+
+- updated to 6.20 development release
+  - MSXml, XAudio, DInput and a few other modules converted to PE.
+  - A few system libraries are bundled with the source to support PE builds.
+  - HID joystick is now the only supported joystick backend in DirectInput.
+  - Better support for MSVCRT builds in Winelib.
+  - Various bug fixes.
+- update staging to 6.20 release
+- wine-fix-faudio.patch: fix build
+
 -------------------------------------------------------------------
 Sat Oct  9 07:57:53 UTC 2021 - Marcus Meissner <meissner@suse.com>
 

wine.spec

@@ -29,8 +29,8 @@
 %endif
 
 # needs to be on top due to usage of %version macro below
-%define realver 6.19
-Version:        6.19
+%define realver 6.20
+Version:        6.20
 Release:        0
 
 %if "%{flavor}" != ""
@@ -95,9 +95,13 @@ BuildRequires:  valgrind-devel
 %if 0%{?suse_version} >= 1550
 %ifarch x86_64
 BuildRequires:  mingw64-cross-gcc
+BuildRequires:  mingw64-zlib-devel
+Requires:       mingw64-libz
 %endif
 %ifarch %ix86
 BuildRequires:  mingw32-cross-gcc
+BuildRequires:  mingw32-zlib-devel
+Requires:       mingw32-libz
 %endif
 %endif
 BuildRequires:  pkgconfig(egl)
@@ -139,7 +143,7 @@ Source7:        baselibs.conf
 Source8:        wine-rpmlintrc
 # SUSE specific patches
 # - currently none, but add them here
-#Patch0:         susefixes.patch
+Patch0:         wine-fix-faudio.patch
 Recommends:     wine-gecko >= 2.47.2
 Conflicts:      wine-gecko < 2.47.2
 Recommends:     wine-mono >= 6.1.1
@@ -158,7 +162,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 ppc armv7l armv7hl aarch64
 %if %{staging}
 # upstream patch target version
-%define staging_version 6.19
+%define staging_version 6.20
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel