From 51f87a23d40908da2a08fded76221c7188bee797d7702cec93f9d6b6cbe89307 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 23 Oct 2021 08:23:02 +0000 Subject: [PATCH 1/4] - 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 OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=871 --- _service | 2 +- wine-6.19.tar.xz | 3 --- wine-6.19.tar.xz.sign | 16 ---------------- wine-6.20.tar.xz | 3 +++ wine-6.20.tar.xz.sign | 16 ++++++++++++++++ wine-staging-6.19.tar.xz | 3 --- wine-staging-6.20.tar.xz | 3 +++ wine.changes | 11 +++++++++++ wine.spec | 6 +++--- 9 files changed, 37 insertions(+), 26 deletions(-) delete mode 100644 wine-6.19.tar.xz delete mode 100644 wine-6.19.tar.xz.sign create mode 100644 wine-6.20.tar.xz create mode 100644 wine-6.20.tar.xz.sign delete mode 100644 wine-staging-6.19.tar.xz create mode 100644 wine-staging-6.20.tar.xz diff --git a/_service b/_service index 2dd30d7..14431cc 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ @PARENT_TAG@ v(.*) https://github.com/wine-staging/wine-staging.git - refs/tags/v6.19 + refs/tags/v6.20 v*.* git diff --git a/wine-6.19.tar.xz b/wine-6.19.tar.xz deleted file mode 100644 index 03f1c2c..0000000 --- a/wine-6.19.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4182e2d9627704cc376f46fc3109580ea9077796f44f5ee83e08e3e96bf0ab66 -size 24894356 diff --git a/wine-6.19.tar.xz.sign b/wine-6.19.tar.xz.sign deleted file mode 100644 index 3a99ba1..0000000 --- a/wine-6.19.tar.xz.sign +++ /dev/null @@ -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----- diff --git a/wine-6.20.tar.xz b/wine-6.20.tar.xz new file mode 100644 index 0000000..92855cc --- /dev/null +++ b/wine-6.20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4028237e9c7bfdd56d7604af19783ff812f645f29c27de742a688e4535528471 +size 26921644 diff --git a/wine-6.20.tar.xz.sign b/wine-6.20.tar.xz.sign new file mode 100644 index 0000000..c2b00fa --- /dev/null +++ b/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----- diff --git a/wine-staging-6.19.tar.xz b/wine-staging-6.19.tar.xz deleted file mode 100644 index 231d2ee..0000000 --- a/wine-staging-6.19.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96778fbf3a3c20d4b28c9e460b13965d8b85dc28f81b64a170c1bc408d41603b -size 7352376 diff --git a/wine-staging-6.20.tar.xz b/wine-staging-6.20.tar.xz new file mode 100644 index 0000000..29e118c --- /dev/null +++ b/wine-staging-6.20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2896018ee0117b2995a9813ebd5e11a0ffc52cf8c12b7f3c4540c7532cdac534 +size 7323272 diff --git a/wine.changes b/wine.changes index 810916e..7aa5c08 100644 --- a/wine.changes +++ b/wine.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Oct 23 08:22:24 UTC 2021 - Marcus Meissner + +- 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 + ------------------------------------------------------------------- Sat Oct 9 07:57:53 UTC 2021 - Marcus Meissner diff --git a/wine.spec b/wine.spec index eb1e122..d68032e 100644 --- a/wine.spec +++ b/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}" != "" @@ -158,7 +158,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 From 244752b71666a402a20d533b61cb2413c70db2eb8eda0f475acb25ea1dc18154 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 23 Oct 2021 08:24:33 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=872 --- wine.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wine.spec b/wine.spec index d68032e..6c21a63 100644 --- a/wine.spec +++ b/wine.spec @@ -95,9 +95,13 @@ BuildRequires: valgrind-devel %if 0%{?suse_version} >= 1550 %ifarch x86_64 BuildRequires: mingw64-cross-gcc +BuildRequires: mingw64-libz +Requires: mingw64-libz %endif %ifarch %ix86 BuildRequires: mingw32-cross-gcc +BuildRequires: mingw32-libz +Requires: mingw32-libz %endif %endif BuildRequires: pkgconfig(egl) From 2b449ca32f9553310b296a02e08a32c04a26d7c94eecfd0ab47464a8fe422eac Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 23 Oct 2021 14:11:05 +0000 Subject: [PATCH 3/4] - wine-fix-faudio.patch: fix build OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=873 --- wine-fix-faudio.patch | 10 ++++++++++ wine.changes | 1 + wine.spec | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 wine-fix-faudio.patch diff --git a/wine-fix-faudio.patch b/wine-fix-faudio.patch new file mode 100644 index 0000000..e4e29da --- /dev/null +++ b/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) diff --git a/wine.changes b/wine.changes index 7aa5c08..860b737 100644 --- a/wine.changes +++ b/wine.changes @@ -8,6 +8,7 @@ Sat Oct 23 08:22:24 UTC 2021 - Marcus Meissner - 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 diff --git a/wine.spec b/wine.spec index 6c21a63..856f011 100644 --- a/wine.spec +++ b/wine.spec @@ -143,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 From 46450a229be48797169a29d4f91d235078a8e4fe4260aef0bfdef6b097eb297b Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 23 Oct 2021 14:12:15 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/Emulators/wine?expand=0&rev=874 --- wine.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wine.spec b/wine.spec index 856f011..f626a6d 100644 --- a/wine.spec +++ b/wine.spec @@ -95,12 +95,12 @@ BuildRequires: valgrind-devel %if 0%{?suse_version} >= 1550 %ifarch x86_64 BuildRequires: mingw64-cross-gcc -BuildRequires: mingw64-libz +BuildRequires: mingw64-zlib-devel Requires: mingw64-libz %endif %ifarch %ix86 BuildRequires: mingw32-cross-gcc -BuildRequires: mingw32-libz +BuildRequires: mingw32-zlib-devel Requires: mingw32-libz %endif %endif