[proton-experimental] Version 9.0-20240509

8 files changed, 41 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f63eb507039d..27f2bd7c5379 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = proton-experimental
 	pkgdesc = Compatibility tool for Steam Play based on Wine and additional components, experimental branch
-	pkgver = 9.0.20240503.2
-	pkgrel = 2
+	pkgver = 9.0.20240509
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	install = proton-experimental.install
@@ -128,32 +128,32 @@ pkgbase = proton-experimental
 	noextract = wine-gecko-2.47.4-x86.tar.xz
 	noextract = wine-gecko-2.47.4-x86_64.tar.xz
 	noextract = wine-mono-9.1.0-x86.tar.xz
-	noextract = xalia-0.4.1-net48-mono.zip
+	noextract = xalia-0.4.2-net48-mono.zip
 	options = !staticlibs
 	options = !lto
 	options = !debug
 	options = emptydirs
-	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-9.0-20240503b
+	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-9.0-20240509
 	source = https://dl.winehq.org/wine/wine-gecko/2.47.4/wine-gecko-2.47.4-x86.tar.xz
 	source = https://dl.winehq.org/wine/wine-gecko/2.47.4/wine-gecko-2.47.4-x86_64.tar.xz
 	source = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-9.1.0/wine-mono-9.1.0-x86.tar.xz
-	source = https://github.com/madewokherd/xalia/releases/download/xalia-0.4.1/xalia-0.4.1-net48-mono.zip
+	source = https://github.com/madewokherd/xalia/releases/download/xalia-0.4.2/xalia-0.4.2-net48-mono.zip
 	source = 0001-AUR-Pkgbuild-changes.patch
 	source = 0002-AUR-Do-not-update-cargo-crates.patch
 	source = 0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
 	source = 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
 	source = 0005-AUR-Strip-binaries-early.patch
 	source = 0006-AUR-Fix-hwnd-redefinition.patch
-	sha256sums = 07a21f546d0ecfe28b409ea0aa402732a8d440ede2f49870059daf38989e46a8
+	sha256sums = 0c506e232b8c8c035ecb6c5c4a59bd4dc0086c918837acd6f926fe4c036610ef
 	sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6
 	sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
 	sha256sums = 601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767
-	sha256sums = a652c3289fb444efb2fbd8b5757484e21ffe6a537b3a3f9a0fbb04a9a10afcba
-	sha256sums = 722e1c7652235f5ec8cc7a01c8dd5cb3c990f3837b1c1ec0b91a8a0869af248b
-	sha256sums = c612b7c5838a4b13ecba55686b85e895666e6d5ea26439b91b6782af6a317348
-	sha256sums = 8f3be38254ee8a5177f225b6bf78f88b0b9ebcea7ba607bae53dabaa07080a9e
-	sha256sums = bdd466b9c41cb9ab1337a4f6f9aca87d47499b42e6b291164f6da4258f9a6d26
-	sha256sums = 0521aca754e25583cdb25318422642661e32e9fd6bd5bd53792f14df64b7613f
-	sha256sums = 4bf4a18b283ab0e50f78691681635085400e5fc7e2fbf64af2e19acf49b8483e
+	sha256sums = 50ce2cc85162343e62340b0ca7994ceba94592ab395fb99711e94e108e991f0c
+	sha256sums = 17bb21c160b79fbc97dc5d386e736b6eda1dcb19d4883cc1556312687343c1ac
+	sha256sums = ef7d7515628e4d1370502a7dc88c52edc6981eabcc02286c1218e3ebc6ca2d7b
+	sha256sums = a90792db3ac5cfff8bc595a0b9d7c07c272a8ae713d3e07374e475d818f1fcba
+	sha256sums = 813e43442ab0266536017e8920937a0d09a8b29297821f9d6bd40f701ac48ef7
+	sha256sums = 20aca547e37c007a6362bbb72f0522a0e681c9acdfac0c202b01a24cf3f8cc1b
+	sha256sums = b576abb091bbdb056e5f2b5e322afbac6ea9473eee0176e0d773f1c80562bcad
 
 pkgname = proton-experimental
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index d9f3d89edb71..a02ae962d352 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,26 +1,26 @@
-From 789e431a31dcdd7fb79a874baf4bc017ea35d202 Mon Sep 17 00:00:00 2001
+From 4a53c69e878bff530e68c3cda92639d792819c87 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 26 Apr 2023 14:22:23 +0300
 Subject: [PATCH 1/6] AUR Pkgbuild changes
 
 ---
- Makefile.in                    | 76 ++++++++++++++++++++++++++--------
+ Makefile.in                    | 74 ++++++++++++++++++++++++++--------
  compatibilitytool.vdf.template |  2 +-
  configure.sh                   |  2 +
  make/rules-autoconf.mk         |  4 +-
  make/rules-cargo.mk            |  4 +-
  make/rules-cmake.mk            |  4 +-
- make/rules-common.mk           | 18 ++++----
+ make/rules-common.mk           | 18 +++++----
  make/rules-configure.mk        |  4 +-
  make/rules-makedep.mk          |  4 +-
  make/rules-meson.mk            |  3 +-
  make/rules-winemaker.mk        |  2 +-
  proton                         |  6 +--
  toolmanifest_runtime.vdf       |  3 --
- 13 files changed, 88 insertions(+), 44 deletions(-)
+ 13 files changed, 87 insertions(+), 43 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 8c687aed..b8306e1d 100644
+index bbbef5ee..11eb5ca7 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -54,11 +54,12 @@ else
@@ -189,18 +189,6 @@ index 8c687aed..b8306e1d 100644
  $(eval $(call rules-source,dxvk-nvapi,$(SRCDIR)/dxvk-nvapi))
  $(eval $(call rules-meson,dxvk-nvapi,32,CROSS))
  $(eval $(call rules-meson,dxvk-nvapi,64,CROSS))
-@@ -608,10 +649,10 @@ VKD3D_CONFIGURE_ARGS = \
-   --disable-tests \
-   --disable-demos \
-   --without-ncurses \
-+  SONAME_LIBVULKAN=vulkan-1 \
- 
- VKD3D_LDFLAGS = -static-libgcc $(CROSSLDFLAGS)
- VKD3D_DEPENDS = vulkan-loader vulkan-headers spirv-headers
--VKD3D_CONFIGURE_ARGS = SONAME_LIBVULKAN=vulkan-1
- 
- $(eval $(call rules-source,vkd3d,$(SRCDIR)/vkd3d))
- $(eval $(call rules-autoconf,vkd3d,32,CROSS))
 @@ -649,6 +690,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
  	VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
  endif
@@ -476,7 +464,7 @@ index 5c3b59a3..ed6589e0 100644
  	winebuild --$(lastword $(subst ., ,$(4))) --fake-module -E "$(basename $(4)).spec" -o "$(4).fake"
  	mkdir -p $$($(2)_LIBDIR$(3))/$(LIBDIR_WINE_$(3))
 diff --git a/proton b/proton
-index 8327b3d2..a0c1bcf8 100755
+index 9a8db8cc..6b26b486 100755
 --- a/proton
 +++ b/proton
 @@ -424,7 +424,6 @@ class Proton:
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index efb0d088d541..bd97573a49eb 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From eb72ec9ab042801e14ce931a25311a4530fa4f8e Mon Sep 17 00:00:00 2001
+From e77fc3b6e37c89648afb3ce8e9ec0b54cb5a0b88 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Sun, 19 Mar 2023 10:56:59 +0200
 Subject: [PATCH 2/6] AUR Do not update cargo crates
diff --git a/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch b/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
index a757997962a9..4554b5fa6a34 100644
--- a/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
+++ b/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
@@ -1,4 +1,4 @@
-From f7dc74e9828318f452716ca0087f5d44da0c5dcc Mon Sep 17 00:00:00 2001
+From e13d963ed9fb79b793d8b01773cd9cc4c90a8628 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 12 Jul 2023 17:53:47 +0300
 Subject: [PATCH 3/6] AUR Remove kaldi, openfst, vosk-api modules because of
@@ -9,7 +9,7 @@ Subject: [PATCH 3/6] AUR Remove kaldi, openfst, vosk-api modules because of
  1 file changed, 1 insertion(+), 81 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index b8306e1d..64b817d4 100644
+index 11eb5ca7..65ce8106 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -410,86 +410,6 @@ $(OBJ)/.steamexe-post-build64:
diff --git a/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch b/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
index 82ea0d1b3e12..d398dfc7e572 100644
--- a/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
+++ b/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
@@ -1,4 +1,4 @@
-From 14789dfb348b6aa0a8f1a1b3608425c0aaeae506 Mon Sep 17 00:00:00 2001
+From 1171cf4ff58b797aa911b7c5174308ad546126ae Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 12 Jul 2023 03:16:34 +0300
 Subject: [PATCH 4/6] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
@@ -20,7 +20,7 @@ a runtime dependency.
  1 file changed, 9 insertions(+)
 
 diff --git a/proton b/proton
-index a0c1bcf8..db10017c 100755
+index 6b26b486..5ae39c6e 100755
 --- a/proton
 +++ b/proton
 @@ -923,6 +923,15 @@ class CompatData:
diff --git a/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch
index 398dfe6147eb..aea4cc7d847f 100644
--- a/0005-AUR-Strip-binaries-early.patch
+++ b/0005-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From cb4f6b273aafa5210e03a9281bd43efd88edd5d7 Mon Sep 17 00:00:00 2001
+From 0e3c4098dbd0d00a874e4cfb2d4dc7a1fa9fddef Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 23 Aug 2023 19:31:35 +0300
 Subject: [PATCH 5/6] AUR Strip binaries early
@@ -8,7 +8,7 @@ Subject: [PATCH 5/6] AUR Strip binaries early
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 64b817d4..938b1104 100644
+index 65ce8106..2777549c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -58,7 +58,7 @@ CFLAGS         ?= -O2 -march=nocona -mtune=core-avx2
diff --git a/0006-AUR-Fix-hwnd-redefinition.patch b/0006-AUR-Fix-hwnd-redefinition.patch
index 43a613101c47..c00a277edda8 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From 3150d4e1e70bcda2c4b35045c99a7f261146a33e Mon Sep 17 00:00:00 2001
+From 0253a49da62ac06b04bd278751d54a0feaacd536 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Thu, 28 Sep 2023 14:16:04 +0300
 Subject: [PATCH 6/6] AUR: Fix hwnd redefinition
@@ -9,7 +9,7 @@ Subject: [PATCH 6/6] AUR: Fix hwnd redefinition
  2 files changed, 6 insertions(+)
 
 diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp
-index 5240e465..7ee80752 100644
+index 542aa972..31c48beb 100644
 --- a/steam_helper/steam.cpp
 +++ b/steam_helper/steam.cpp
 @@ -34,11 +34,15 @@
diff --git a/PKGBUILD b/PKGBUILD
index 18b0084699b5..7d1b34260553 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton-experimental
-_srctag=9.0-20240503b
+_srctag=9.0-20240509
 _commit=
-pkgver=9.0.20240503.2 #${_srctag//-/.}
+pkgver=${_srctag//-/.}
 _geckover=2.47.4
 _monover=9.1.0
-_xaliaver=0.4.1
-pkgrel=2
+_xaliaver=0.4.2
+pkgrel=1
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, experimental branch"
 url="https://github.com/ValveSoftware/Proton"
@@ -223,8 +223,7 @@ package() {
     # For some unknown to me reason, 32bit vkd3d (not vkd3d-proton) always links
     # to libgcc_s_dw2-1.dll no matter what linker options I tried.
     # Copy the required dlls into the package, they will be copied later into the prefix
-    # by the patched proton script. Bundling the helps to avoid making mingw-w64-gcc package
-    # a runtime dependency.
+    # by the patched proton script. Bundle them to not depend on mingw-w64-gcc being installed.
     cp /usr/i686-w64-mingw32/bin/{libgcc_s_dw2-1.dll,libwinpthread-1.dll} \
         "$_compatdir/${pkgname}"/files/lib/vkd3d/
     cp /usr/x86_64-w64-mingw32/bin/{libgcc_s_seh-1.dll,libwinpthread-1.dll} \
@@ -257,14 +256,14 @@ package() {
         $(find "$_monodir" -iname "*x86_64.dll" -or -iname "*x86_64.exe")
 }
 
-sha256sums=('07a21f546d0ecfe28b409ea0aa402732a8d440ede2f49870059daf38989e46a8'
+sha256sums=('0c506e232b8c8c035ecb6c5c4a59bd4dc0086c918837acd6f926fe4c036610ef'
             '2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6'
             'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
             '601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767'
-            'a652c3289fb444efb2fbd8b5757484e21ffe6a537b3a3f9a0fbb04a9a10afcba'
-            '722e1c7652235f5ec8cc7a01c8dd5cb3c990f3837b1c1ec0b91a8a0869af248b'
-            'c612b7c5838a4b13ecba55686b85e895666e6d5ea26439b91b6782af6a317348'
-            '8f3be38254ee8a5177f225b6bf78f88b0b9ebcea7ba607bae53dabaa07080a9e'
-            'bdd466b9c41cb9ab1337a4f6f9aca87d47499b42e6b291164f6da4258f9a6d26'
-            '0521aca754e25583cdb25318422642661e32e9fd6bd5bd53792f14df64b7613f'
-            '4bf4a18b283ab0e50f78691681635085400e5fc7e2fbf64af2e19acf49b8483e')
+            '50ce2cc85162343e62340b0ca7994ceba94592ab395fb99711e94e108e991f0c'
+            '17bb21c160b79fbc97dc5d386e736b6eda1dcb19d4883cc1556312687343c1ac'
+            'ef7d7515628e4d1370502a7dc88c52edc6981eabcc02286c1218e3ebc6ca2d7b'
+            'a90792db3ac5cfff8bc595a0b9d7c07c272a8ae713d3e07374e475d818f1fcba'
+            '813e43442ab0266536017e8920937a0d09a8b29297821f9d6bd40f701ac48ef7'
+            '20aca547e37c007a6362bbb72f0522a0e681c9acdfac0c202b01a24cf3f8cc1b'
+            'b576abb091bbdb056e5f2b5e322afbac6ea9473eee0176e0d773f1c80562bcad')