Accepting request 1199324 from Emulators

- Updated to 9.17 release
  - Window surface scaling on High DPI displays.
  - Bundled vkd3d upgraded to version 1.13.
  - Mono engine updated to version 9.3.0
  - Improved CPU detection on ARM64.
  - Various bug fixes.
- update staging to 9.17 release
- updated bundle versions provides

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

0001-mf-tests-help-older-compilers-by-using-defines.patch

@@ -1,116 +0,0 @@
-From 100ab9fb0d55111c353d5a042902e62d163e47f4 Mon Sep 17 00:00:00 2001
-From: Marcus Meissner <marcus@jet.franken.de>
-Date: Mon, 3 Jun 2024 15:50:19 +0200
-Subject: [PATCH] mf/tests: help older compilers by using defines
-
-older compilers do not see this always as constant
-
-Signed-off-by: Marcus Meissner <marcus@jet.franken.de>
----
- dlls/mf/tests/transform.c | 33 ++++++++++++++++++---------------
- 1 file changed, 18 insertions(+), 15 deletions(-)
-
-diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c
-index 0291fe16e18..a6367fee764 100644
---- a/dlls/mf/tests/transform.c
-+++ b/dlls/mf/tests/transform.c
-@@ -9044,9 +9044,12 @@ static IMFSample *create_d3d_sample(IMFVideoSampleAllocator *allocator, const vo
-     return sample;
- }
- 
-+#define SET_WIDTH 82
-+#define SET_HEIGHT 84
-+
- static void test_video_processor_with_dxgi_manager(void)
- {
--    static const unsigned int set_width = 82, set_height = 84, aligned_width = 96, aligned_height = 96;
-+    static const unsigned int aligned_width = 96, aligned_height = 96;
-     const struct attribute_desc output_sample_attributes[] =
-     {
-         {0},
-@@ -9054,7 +9057,7 @@ static void test_video_processor_with_dxgi_manager(void)
-     const struct buffer_desc output_buffer_desc_rgb32 =
-     {
-         .length = aligned_width * aligned_height * 4,
--        .compare = compare_rgb32, .compare_rect = {.right = set_width, .bottom = set_height},
-+        .compare = compare_rgb32, .compare_rect = {.right = SET_WIDTH, .bottom = SET_HEIGHT},
-         .dump = dump_rgb32, .size = {.cx = aligned_width, .cy = aligned_height},
-     };
-     const struct sample_desc output_sample_desc_rgb32 =
-@@ -9066,9 +9069,9 @@ static void test_video_processor_with_dxgi_manager(void)
- 
-     const struct buffer_desc output_buffer_desc_rgb32_crop =
-     {
--        .length = set_width * set_height * 4,
--        .compare = compare_rgb32, .compare_rect = {.right = set_width, .bottom = set_height},
--        .dump = dump_rgb32, .size = {.cx = set_width, .cy = set_height},
-+        .length = SET_WIDTH * SET_HEIGHT * 4,
-+        .compare = compare_rgb32, .compare_rect = {.right = SET_WIDTH, .bottom = SET_HEIGHT},
-+        .dump = dump_rgb32, .size = {.cx = SET_WIDTH, .cy = SET_HEIGHT},
-     };
-     const struct sample_desc output_sample_desc_rgb32_crop =
-     {
-@@ -9079,9 +9082,9 @@ static void test_video_processor_with_dxgi_manager(void)
- 
-     const struct buffer_desc output_buffer_desc_abgr32_crop =
-     {
--        .length = set_width * set_height * 4,
--        .compare = compare_abgr32, .compare_rect = {.right = set_width, .bottom = set_height},
--        .dump = dump_rgb32, .size = {.cx = set_width, .cy = set_height},
-+        .length = SET_WIDTH * SET_HEIGHT * 4,
-+        .compare = compare_abgr32, .compare_rect = {.right = SET_WIDTH, .bottom = SET_HEIGHT},
-+        .dump = dump_rgb32, .size = {.cx = SET_WIDTH, .cy = SET_HEIGHT},
-     };
-     const struct sample_desc output_sample_desc_abgr32_crop =
-     {
-@@ -9108,7 +9111,7 @@ static void test_video_processor_with_dxgi_manager(void)
-         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
-     };
- 
--    static const MFVideoArea aperture = {.Area={set_width, set_height}};
-+    static const MFVideoArea aperture = {.Area={SET_WIDTH, SET_HEIGHT}};
-     const struct attribute_desc nv12_with_aperture[] =
-     {
-         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
-@@ -9123,14 +9126,14 @@ static void test_video_processor_with_dxgi_manager(void)
-     {
-         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
-         ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_RGB32),
--        ATTR_RATIO(MF_MT_FRAME_SIZE, set_width, set_height),
-+        ATTR_RATIO(MF_MT_FRAME_SIZE, SET_WIDTH, SET_HEIGHT),
-         {0},
-     };
-     const struct attribute_desc abgr32_no_aperture[] =
-     {
-         ATTR_GUID(MF_MT_MAJOR_TYPE, MFMediaType_Video),
-         ATTR_GUID(MF_MT_SUBTYPE, MFVideoFormat_ABGR32),
--        ATTR_RATIO(MF_MT_FRAME_SIZE, set_width, set_height),
-+        ATTR_RATIO(MF_MT_FRAME_SIZE, SET_WIDTH, SET_HEIGHT),
-         {0},
-     };
- 
-@@ -9465,8 +9468,8 @@ static void test_video_processor_with_dxgi_manager(void)
-     ok(!desc.CPUAccessFlags, "got %#x.\n", desc.CPUAccessFlags);
-     ok(!desc.MiscFlags, "got %#x.\n", desc.MiscFlags);
-     ok(desc.MipLevels == 1, "git %u.\n", desc.MipLevels);
--    ok(desc.Width == set_width, "got %u.\n", desc.Width);
--    ok(desc.Height == set_height, "got %u.\n", desc.Height);
-+    ok(desc.Width == SET_WIDTH, "got %u.\n", desc.Width);
-+    ok(desc.Height == SET_HEIGHT, "got %u.\n", desc.Height);
- 
-     ID3D11Texture2D_Release(tex2d);
-     IMFDXGIBuffer_Release(dxgi_buffer);
-@@ -9533,8 +9536,8 @@ skip_rgb32:
-     ok(!desc.CPUAccessFlags, "got %#x.\n", desc.CPUAccessFlags);
-     ok(!desc.MiscFlags, "got %#x.\n", desc.MiscFlags);
-     ok(desc.MipLevels == 1, "git %u.\n", desc.MipLevels);
--    ok(desc.Width == set_width, "got %u.\n", desc.Width);
--    ok(desc.Height == set_height, "got %u.\n", desc.Height);
-+    ok(desc.Width == SET_WIDTH, "got %u.\n", desc.Width);
-+    ok(desc.Height == SET_HEIGHT, "got %u.\n", desc.Height);
- 
-     ID3D11Texture2D_Release(tex2d);
-     IMFDXGIBuffer_Release(dxgi_buffer);
--- 
-2.45.1
-

0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch

@@ -1,33 +0,0 @@
-From 1e701a6b3798ecfd688ad1ff405dbb62b3d214c6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
-Date: Sat, 15 Jun 2024 18:36:50 +0200
-Subject: [PATCH] winewayland: Avoid crashing when the dummy window surface is
- used.
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56840
-Signed-off-by: Marcus Meissner <marcus@jet.franken.de>
----
- dlls/winewayland.drv/window_surface.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/winewayland.drv/window_surface.c b/dlls/winewayland.drv/window_surface.c
-index fb3b8750001..888fa74c085 100644
---- a/dlls/winewayland.drv/window_surface.c
-+++ b/dlls/winewayland.drv/window_surface.c
-@@ -489,8 +489,12 @@ failed:
- void wayland_window_surface_update_wayland_surface(struct window_surface *window_surface,
-                                                    struct wayland_surface *wayland_surface)
- {
--    struct wayland_window_surface *wws = wayland_window_surface_cast(window_surface);
-+    struct wayland_window_surface *wws;
-+
-+    /* ignore calls with the dummy surface */
-+    if (window_surface->funcs != &wayland_window_surface_funcs) return;
- 
-+    wws = wayland_window_surface_cast(window_surface);
-     window_surface_lock(window_surface);
- 
-     TRACE("surface=%p hwnd=%p wayland_surface=%p\n", wws, window_surface->hwnd, wayland_surface);
--- 
-2.45.2
-

_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/v9.11</param>
+    <param name="revision">refs/tags/v9.17</param>
     <param name="match-tag">v*.*</param>
     <param name="scm">git</param>
   </service>

wine-9.11.tar.xz

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

wine-9.11.tar.xz.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmZstsAACgkQzvrI6q8X
-UZ3bjA/9HJ7AX+fyiR6GcdsoJNTDcab3lRguNA/pII26eF2BbEiFNVDAube5XsIB
-VQW+iZOU+2NnZcWoDm1eBjRvjA1cquRWjEAmNEebITXXsr1XdMwpCwBYJlWgIo12
-G7i3FRmSEzVx4sdii1r4NhtZAJrmEnh8/UvEVR7nZOhAn84NLne1qgfKrPgxZP8a
-73mttrgXA8gCRBE1O0Gm5f/4CZnEeeeFC0ao+Lpf9maGlcChCTMPj2XGLgY0KEXG
-iOX7VwYdHoV5GJd2o9oAjDGQvFaRd5z+H3driu/t/kgv+Csfxr4fJn8cHGX3G4Q+
-9oaQim0QkSPMnAV2bD3LgwLPk7rPOSQv6TmrozEhbzPWmfSWqs+ytuWToBd/ziO7
-5ECn87KqrMURip+2CxLluGJX3dgZr1G1MM9R+Dy1PQA8Ci3INMJNxRmQjh1tFRLP
-Es5DfW0nKtlenFtOrK22h0SJpMvo90f5CzlP0pVRBK9tTHvap4kH21UHPonb+B+S
-rC5CIrc51mzRDBoEWm7UVnHC9eCJaoksRdubAjk8jWsi8q0ub0lt/7K87jqZWXj3
-SyeMu5N4wIGZAsFchc9tUXIwNVDQDjjHSkDUoWD1gXo4DgtdErgtQWh+BMg/0z9z
-aTH1qXtsTjPLLDeXHmrBd0f6/ULle+99m54kU/qb8h0yHk0T3Cg=
-=gatG
------END PGP SIGNATURE-----

wine-9.17.tar.xz

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

wine-9.17.tar.xz.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmbbZ2IACgkQzvrI6q8X
+UZ3Tow//dybRiUPYZRq3jgHNHNwOGMpYTrVXOrc/BmEUwWsLGOkwWqd2hPoP1lQd
+RYn5p8Mx6UKH+O7mK8wjlzjMl4NEta+0D66oLRLj/di2AG7hIf1sSwgFVGDeRWVj
+z+mVdt7L3qD5hKx4fDq272keIfuPRcNsenEgrTcu8nqigdYnG7qBJ+zWNGs3O67c
+1o1oiRr/xqL/U/PbQmf54JwdAy5GBR3Hew1CkeZq2a6G5d3osTSIansb6cnK9l2+
+xvbemr/Zdua0yCD4pdWOWMUM2fhrZEXFhcvOUjI+swo4vb8lqiFEsguUadjxISL5
+lYjo+3/83u1KA08QSKUVAVv0+RBhuMMN/ELZVAtvucVD91Hy7J8Sa6+Z1S6K0A0b
+Lk7JfNAmHGAdUpYhxfW8yBoQjrcGeI9cQsWqn9JH5Guf8rGVzfN9j47HkTARs1Hu
+05m8SAMV8uEHj/epemzNRQwazYdlpjeh/tyJzOG3aFWy/FHqQak86KoPJUl6Fmqk
+k1P2fmkl3OjGvtxcmmhvL97f4IAZNf04c0jzXZ5A4fCd3F7sEsQENzvjz3Gbr/vM
+L/FbjjtPaI25jaH1BHAuXccNNy+BxlA97YgvXBrDeuYbaH9z1Jpke2U7pSNy+DI3
+XdugPLXCoxcXkxhLpTvJI92n4vGNxdLS/66Pwe76OaOsF7SwjWI=
+=KPQU
+-----END PGP SIGNATURE-----

wine-staging-9.11.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:12b7ca49dbbb6faa877d116b98fbd5b66a473d0211f093c3960abe69a1192392
-size 7206756

wine-staging-9.17.tar.xz

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

wine.changes

@@ -1,3 +1,81 @@
+-------------------------------------------------------------------
+Sat Sep  7 07:42:59 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- Updated to 9.17 release
+  - Window surface scaling on High DPI displays.
+  - Bundled vkd3d upgraded to version 1.13.
+  - Mono engine updated to version 9.3.0
+  - Improved CPU detection on ARM64.
+  - Various bug fixes.
+- update staging to 9.17 release
+- updated bundle versions provides
+
+-------------------------------------------------------------------
+Sat Aug 24 11:39:25 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- Updated to 9.16 release
+  - Initial Driver Store implementation.
+  - Pbuffer support in the Wayland driver.
+  - More prototype objects in MSHTML.
+  - Various bug fixes.
+- update staging to 9.16 release
+- 6256.patch: upstream
+
+-------------------------------------------------------------------
+Wed Aug 21 09:16:21 UTC 2024 - llyyr <llyyr@yukari.in>
+
+- 6256.patch: fixes wayland backend
+
+-------------------------------------------------------------------
+Mon Aug 12 13:57:22 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- Updated to 9.15 release
+  - Prototype and constructor objects in MSHTML.
+  - More support for ODBC Windows drivers.
+  - Various bug fixes.
+- update staging to 9.15 release
+
+-------------------------------------------------------------------
+Mon Jul 29 09:39:31 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- Updated to 9.14 release
+  - Mailslots reimplemented using server-side I/O.
+  - More support for ODBC Windows drivers.
+  - Still more user32 data structures in shared memory.
+  - Various bug fixes.
+- update staging to 9.14 release
+
+-------------------------------------------------------------------
+Mon Jul 15 07:20:41 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- Updated to 9.13 release
+  - Support for loading ODBC Windows drivers.
+  - More user32 data structures in shared memory.
+  - More rewriting of the CMD.EXE engine.
+  - Various bug fixes.
+- update staging to 9.13 release
+- removed 0001-mf-tests-Remove-static-specifier-on-variables-refere.patch: upstream
+
+-------------------------------------------------------------------
+Wed Jul 10 09:49:46 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- replaced 0001-mf-tests-use-defines-instead-of-static-const-for-old.patch
+  by official commit 0001-mf-tests-Remove-static-specifier-on-variables-refere.patch
+
+-------------------------------------------------------------------
+Sat Jun 29 07:00:18 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- Updated to 9.12 release
+  - Initial support for user32 data structures in shared memory.
+  - Mono engine updated to version 9.2.0.
+  - Rewrite of the CMD.EXE engine.
+  - Fixed handling of async I/O status in new WoW64 mode.
+  - Various bug fixes.
+- update staging to 9.12 release
+- 0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch: upstream
+- removed/merged to below: 0001-mf-tests-help-older-compilers-by-using-defines.patch
+- added: 0001-mf-tests-use-defines-instead-of-static-const-for-old.patch
+ 
 -------------------------------------------------------------------
 Sun Jun 23 11:23:40 UTC 2024 - Marcus Meissner <meissner@suse.com>
 

wine.spec

@@ -41,8 +41,8 @@
 %endif
 
 # needs to be on top due to usage of %version macro below
-%define realver 9.11
+%define realver 9.17
-Version:        9.11
+Version:        9.17
 Release:        0
 
 %if "%{flavor}" != ""
@@ -176,13 +176,10 @@ Source7:        baselibs.conf
 Source8:        wine-rpmlintrc
 # SUSE specific patches
 # - currently none, but add them here
-Patch0:         0001-mf-tests-help-older-compilers-by-using-defines.patch
-# 1e701a6b3798ecfd688ad1ff405dbb62b3d214c6 fixing wayland
-Patch1:         0001-winewayland-Avoid-crashing-when-the-dummy-window-sur.patch
 Recommends:     wine-gecko >= 2.47.4
 Conflicts:      wine-gecko < 2.47.4
-Recommends:     wine-mono >= 9.0.0
+Recommends:     wine-mono >= 9.2.0
-Conflicts:      wine-mono < 9.0.0
+Conflicts:      wine-mono < 9.2.0
 # not packaged in distro...
 Recommends:     wine-mono
 Recommends:     alsa-plugins
@@ -199,7 +196,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 ppc armv7l armv7hl aarch64
 %if %{staging}
 # upstream patch target version
-%define staging_version 9.11
+%define staging_version 9.17
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel
@@ -208,21 +205,21 @@ BuildRequires:  python3
 %endif
 # wine bundles multiple unix libraries to be able to build PE files without dependencies
 # current versions are from 7.22 (update this if you update the versions below):
-Provides:       bundled(FAudio) = 23.12.0
+Provides:       bundled(FAudio) = 24.06
-Provides:       bundled(fluidsynth) = 2.3.3
+Provides:       bundled(fluidsynth) = 2.3.5
-Provides:       bundled(jpeg) = 9e
+Provides:       bundled(jpeg) = 9f
 Provides:       bundled(libgsm) = 1.10.19
 Provides:       bundled(libjxr) = 1.1
-Provides:       bundled(liblcms2) = 2.15
+Provides:       bundled(liblcms2) = 2.16
-Provides:       bundled(libpng) = 1.6.40
+Provides:       bundled(libpng) = 1.6.43
-Provides:       bundled(libxml2) = 2.11.5
+Provides:       bundled(libxml2) = 2.11.7
-Provides:       bundled(libxslt) = 1.1.38
+Provides:       bundled(libxslt) = 1.1.39
-Provides:       bundled(mpg123) = 1.32.2
+Provides:       bundled(mpg123) = 1.32.5
 Provides:       bundled(musl) = 1.2.3
-Provides:       bundled(openldap2) = 2.5.16
+Provides:       bundled(openldap2) = 2.5.17
 Provides:       bundled(tiff) = 4.6.0
-Provides:       bundled(vkd3d) = 1.10
+Provides:       bundled(vkd3d) = 1.13
-Provides:       bundled(zlib) = 1.3
+Provides:       bundled(zlib) = 1.3.1
 
 %description
 Wine is a compatibility layer capable of running Windows
@@ -564,8 +561,14 @@ chmod 755 %winedir/my-find-requires.sh
 %{_bindir}/wmc
 %{_bindir}/wrc
 %ifnarch aarch64
+%ifarch x86_64
+%if 0%{?suse_version} < 1600
 %{_libdir}/wine/*-unix/*.a
 %endif
+%else
+%{_libdir}/wine/*-unix/*.a
+%endif
+%endif
 %if 0%{?suse_version} >= 1550
 %ifarch %{ix86} x86_64
 %ifarch x86_64