Accepting request 1156900 from Emulators

- Updated to 9.4 release
  - Bundled vkd3d upgraded to version 1.11.
  - Initial OpenGL support in the Wayland driver.
  - Support for elevating process privileges.
  - More HID pointer improvements.
  - Various bug fixes.
- update staging to 9.4 release

- remove outdated wine-nine support.

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

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

wine-9.3.tar.xz

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

wine-9.3.tar.xz.sign

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmXZDCMACgkQzvrI6q8X
-UZ2dUg//Rm2XCfGqfOCcH2ROhArVZD0Wgg+sS96sfWmZgNeSNETByggGP0LXcDYn
-idOGpoh18htoGEWn+0LtpnylIA4ut09K0tysTE89eZot5pkv3lKws1pj/KVsRpbe
-18wdILEdqJ7JsvKj00zBnWUypkob836w94efrGYnxJ+Xpw+r9pbNw2Ds7PEEVaAO
-oXCU+W9NlkMNEzTS5T0EEal8ydfIDP8wLnHzvHL7D74yaeqoA9J0xZFwRU+9AIE4
-DkarGoj61F7vJaqP0WEyj21iYsRRWcQS2CFo3ajWmIeUJ90Oa4bg1Q7MVfKq+t93
-3QCMNZedFnReuEZpvIeVEVKdz7fx62cGFmQugGnBx4Kl95T5UmBWhMiuWf8KMYzu
-HuMb1WngGwD6MT+usRamnDntdkuQrMnjSQwGHvxitpEKYct7+xwUz5F7HQaI1CRP
-yAzF1awx+Cve98Csudj5DC3G0Dq5Vm1svDUB9psOsBrtpGd1+btOiLKFFY/AFS+N
-wZl4CTSiEW8NhMgex5EjKtLyMvgVTZh6JOYalo529nDWbOHf7FcqNJoN3hRbV4s5
-h/+p4ub1r/geH1tDotoU36Fz0XMLl9vsyMAv8BVawLj+W5l77OCJwFfP9vUWCMqN
-nHvsMUQC+yvml5BRTdyBRHYQ1hRu585coe+4EFhFf1fYlhLQVtg=
-=QrWC
------END PGP SIGNATURE-----

wine-9.4.tar.xz

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

wine-9.4.tar.xz.sign

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmXrku4ACgkQzvrI6q8X
+UZ2EYA//Z2o7swSqE0xGI88A5GZcSugRMiaEHSS5GtkJnDG9JqO1tWU9efQ9NfHS
+88RnfotMR23mke90Kd4uKL8ybnMrYiSN6S/vPe9qLuQcgGgddFVAS2cA+fn6smgf
+2wkYJFOTtqQBT1jZmJzual/OfTkJMH4VUqkXdhpGcRN3xqb/c4wDKN+/bnssHUu3
+xk/W5/vzuZv/mPY1C4CVnbDiMmLlRE09XI6kEdn73AxBKGGBMvrr7q2oEFd2fS/M
+hiqJK6roBDzX+yTLHz7f9dt/t9/BBVKJ9wQXmYDHBNnT5EFPxJEwxIZ5Mafh0ns1
+kBmdE3dNtgWvtN56SXLBUvBmB5RhpBidI4dT8izYnoxA1usCMncyoHDDL6pvCn1u
+r1sRPjnR4fgCzKukdkJsiieRcGKU2+P8OWilfdqd2/yAFCZBcRReTnTHLkvyesYK
+mcUsDGuJL1VKDEreOhW/VZIofByulFMnA47Rh5VS1Npa8YA5GnrHIk4w1UaVatsj
+ykU2ElCml8zIF7Neu4at7y3s4j+BjndAfFQ46re78N0lgt6O5KacLWtqzP/r63cg
+7x87RlaLr4I+66TosfBopOCL4YQwGNXmjJMwWyDWb3dnOO32G+/voc1xb47rZfnI
+UIB++UXlJd3PGSUd3xFWtlfR0Xg8tGDt+mwARD8d6Mh8Nyljs2Y=
+=cMfe
+-----END PGP SIGNATURE-----

wine-d3d9-patches-4.1.tar.xz

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

wine-staging-9.3.tar.xz

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

wine-staging-9.4.tar.xz

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

wine.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sat Mar  9 07:50:32 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- Updated to 9.4 release
+  - Bundled vkd3d upgraded to version 1.11.
+  - Initial OpenGL support in the Wayland driver.
+  - Support for elevating process privileges.
+  - More HID pointer improvements.
+  - Various bug fixes.
+- update staging to 9.4 release
+
+-------------------------------------------------------------------
+Wed Feb 28 13:48:34 UTC 2024 - Marcus Meissner <meissner@suse.com>
+
+- remove outdated wine-nine support.
+
 -------------------------------------------------------------------
 Mon Feb 26 10:34:20 UTC 2024 - Marcus Meissner <meissner@suse.com>
 

wine.spec

@@ -19,18 +19,14 @@
 %define projectname wine
 %global flavor @BUILD_FLAVOR@%nil
 %define staging 0
-%define nine 0
 
-%if "%flavor" == "staging" || "%flavor" == "staging-nine"
+%if "%flavor" == "staging"
 %define staging 1
 %endif
-%if "%flavor" == "nine" || "%flavor" == "staging-nine"
-%define nine 1
-%endif
 
 # needs to be on top due to usage of %version macro below
-%define realver 9.3
+%define realver 9.4
-Version:        9.3
+Version:        9.4
 Release:        0
 
 %if "%{flavor}" != ""
@@ -174,22 +170,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 ppc armv7l armv7hl aarch64
 %if %{staging}
 # upstream patch target version
-%define staging_version 9.3
+%define staging_version 9.4
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel
 BuildRequires:  libva-devel
 BuildRequires:  python3
 %endif
-%if %{nine}
-# upstream patch target version
-%define nine_version 4.1
-BuildRequires:  Mesa-libd3d-devel
-Requires:       Mesa-libd3d
-BuildRequires:  libOSMesa-devel
-BuildRequires:  pkgconfig(dri2proto)
-Source110:      wine-d3d9-patches-%{nine_version}.tar.xz
-%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
@@ -221,10 +208,6 @@ This WINE flavor contains the "staging" development patchset
 on top of the regular Wine release.
 %endif
 
-%if %{nine}
-This WINE flavor contains Direct3D9 enhancements patches for Gallium Nine support.
-%endif
-
 You can run your Windows executables with it and write your Windows
 programs under Linux and link against the WINE libraries. It is not
 necessary to have a Windows installation to run WINE.
@@ -260,16 +243,6 @@ tar xf %{SOURCE100}
 python3 ./wine-staging-%staging_version/staging/patchinstall.py --all
 %endif
 
-%if %{nine}
-tar xf %{SOURCE110}
-%if %{staging}
-patch --no-backup-if-mismatch -p1 -i ./wine-d3d9-patches-%nine_version/staging-helper.patch
-%else
-patch --no-backup-if-mismatch -p1 -i ./wine-d3d9-patches-%nine_version/d3d9-helper.patch
-%endif
-patch --no-backup-if-mismatch -p1 -i ./wine-d3d9-patches-%nine_version/wine-d3d9.patch
-%endif
-
 %build
 # currently not building with LTO
 %define _lto_cflags %{nil}
@@ -286,7 +259,7 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/-fomit-frame-pointer//'`
 export CC="/usr/bin/clang"
 %endif
 
-%if %{staging} || %{nine}
+%if %{staging}
 autoreconf -i -f
 %endif
 # keep just for susepatches with configure changes
@@ -300,9 +273,6 @@ CFLAGS="$RPM_OPT_FLAGS" \
 %endif
 %ifarch x86_64 aarch64
         --enable-win64 \
-%endif
-%if %{nine}
-    --with-d3d9-nine \
 %endif
 	--verbose
 
@@ -333,9 +303,6 @@ echo " recommends \"wine-mp3-32bit\""		>> %SOURCE7
 %if 0%{?suse_version} >= 1310
 echo " requires \"p11-kit-32bit\""		>> %SOURCE7
 %endif
-%if %{nine}
-echo " requires \"Mesa-libd3d-32bit\""		>> %SOURCE7
-%endif
 %if "%{flavor}" != ""
 echo " provides \"wine-<targettype> = <version>\""		>> %SOURCE7
 %endif