[proton-experimental] Fix vkd3d

8 files changed, 38 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4033f1ff0048..f63eb507039d 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 = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	install = proton-experimental.install
@@ -149,11 +149,11 @@ pkgbase = proton-experimental
 	sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
 	sha256sums = 601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767
 	sha256sums = a652c3289fb444efb2fbd8b5757484e21ffe6a537b3a3f9a0fbb04a9a10afcba
-	sha256sums = 1c541c59b96d1b8e82fd17fa2b1d4bc929dce903e8b02abb9a45d69e415e9e43
-	sha256sums = 2405158b694487c37e0ca7c4e02788c8c4fad47b6de4ea9999565ead124019c2
-	sha256sums = f1c48a7d19800f9e46568c6ba2e3600a7f21885cc8251a655e83f7cd38e0b48b
-	sha256sums = 0fc622d47817dd0959e38e037d698fa843b515307511944b3021a9ff19e3cd3f
-	sha256sums = f6425db2bd252f7de452903a29f89183241bc317ee3140193b7d8343adb2f565
-	sha256sums = de138e48f6a4662c4877a7f76db9eaf42241b6784ea91a2583707a9842cde78b
+	sha256sums = 722e1c7652235f5ec8cc7a01c8dd5cb3c990f3837b1c1ec0b91a8a0869af248b
+	sha256sums = c612b7c5838a4b13ecba55686b85e895666e6d5ea26439b91b6782af6a317348
+	sha256sums = 8f3be38254ee8a5177f225b6bf78f88b0b9ebcea7ba607bae53dabaa07080a9e
+	sha256sums = bdd466b9c41cb9ab1337a4f6f9aca87d47499b42e6b291164f6da4258f9a6d26
+	sha256sums = 0521aca754e25583cdb25318422642661e32e9fd6bd5bd53792f14df64b7613f
+	sha256sums = 4bf4a18b283ab0e50f78691681635085400e5fc7e2fbf64af2e19acf49b8483e
 
 pkgname = proton-experimental
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 2f56bcbceed0..d9f3d89edb71 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,26 +1,26 @@
-From f263ffe75e8def27e97e11ddbb9dfe14a0d2106b Mon Sep 17 00:00:00 2001
+From 789e431a31dcdd7fb79a874baf4bc017ea35d202 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                    | 74 ++++++++++++++++++++++++++--------
+ Makefile.in                    | 76 ++++++++++++++++++++++++++--------
  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, 87 insertions(+), 43 deletions(-)
+ 13 files changed, 88 insertions(+), 44 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 8c687aed..11890078 100644
+index 8c687aed..b8306e1d 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -54,11 +54,12 @@ else
@@ -189,6 +189,18 @@ index 8c687aed..11890078 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
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index 8ca22fabee96..efb0d088d541 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From fd33f755275ec3323816ec0662e08232b91184bc Mon Sep 17 00:00:00 2001
+From eb72ec9ab042801e14ce931a25311a4530fa4f8e 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 e685126cc88f..a757997962a9 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 c6b5406b807db68d8564d5e33febfa0b80b95acb Mon Sep 17 00:00:00 2001
+From f7dc74e9828318f452716ca0087f5d44da0c5dcc 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 11890078..6cf7205d 100644
+index b8306e1d..64b817d4 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 c77b40becd53..82ea0d1b3e12 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 47d75a10c48153c355b023641ca350b8136551d3 Mon Sep 17 00:00:00 2001
+From 14789dfb348b6aa0a8f1a1b3608425c0aaeae506 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
diff --git a/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch
index 3334b502aa2d..398dfe6147eb 100644
--- a/0005-AUR-Strip-binaries-early.patch
+++ b/0005-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From 5932cb1847766535b4c8a6038319d01134b5538b Mon Sep 17 00:00:00 2001
+From cb4f6b273aafa5210e03a9281bd43efd88edd5d7 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 6cf7205d..fd8486fa 100644
+index 64b817d4..938b1104 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 f5ba19334e7b..43a613101c47 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From 228fe37d392087aacb1e40e81ac65918e728c05b Mon Sep 17 00:00:00 2001
+From 3150d4e1e70bcda2c4b35045c99a7f261146a33e 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
diff --git a/PKGBUILD b/PKGBUILD
index a2c345c48e42..18b0084699b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgver=9.0.20240503.2 #${_srctag//-/.}
 _geckover=2.47.4
 _monover=9.1.0
 _xaliaver=0.4.1
-pkgrel=1
+pkgrel=2
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, experimental branch"
 url="https://github.com/ValveSoftware/Proton"
@@ -262,9 +262,9 @@ sha256sums=('07a21f546d0ecfe28b409ea0aa402732a8d440ede2f49870059daf38989e46a8'
             'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
             '601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767'
             'a652c3289fb444efb2fbd8b5757484e21ffe6a537b3a3f9a0fbb04a9a10afcba'
-            '1c541c59b96d1b8e82fd17fa2b1d4bc929dce903e8b02abb9a45d69e415e9e43'
-            '2405158b694487c37e0ca7c4e02788c8c4fad47b6de4ea9999565ead124019c2'
-            'f1c48a7d19800f9e46568c6ba2e3600a7f21885cc8251a655e83f7cd38e0b48b'
-            '0fc622d47817dd0959e38e037d698fa843b515307511944b3021a9ff19e3cd3f'
-            'f6425db2bd252f7de452903a29f89183241bc317ee3140193b7d8343adb2f565'
-            'de138e48f6a4662c4877a7f76db9eaf42241b6784ea91a2583707a9842cde78b')
+            '722e1c7652235f5ec8cc7a01c8dd5cb3c990f3837b1c1ec0b91a8a0869af248b'
+            'c612b7c5838a4b13ecba55686b85e895666e6d5ea26439b91b6782af6a317348'
+            '8f3be38254ee8a5177f225b6bf78f88b0b9ebcea7ba607bae53dabaa07080a9e'
+            'bdd466b9c41cb9ab1337a4f6f9aca87d47499b42e6b291164f6da4258f9a6d26'
+            '0521aca754e25583cdb25318422642661e32e9fd6bd5bd53792f14df64b7613f'
+            '4bf4a18b283ab0e50f78691681635085400e5fc7e2fbf64af2e19acf49b8483e')