[proton-experimental] Version 9.0-20240301

9 files changed, 51 insertions, 46 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49562b9f931b..fe8b6598fbfc 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.20240221
-	pkgrel = 6
+	pkgver = 9.0.20240301
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	install = proton-experimental.install
@@ -131,7 +131,7 @@ pkgbase = proton-experimental
 	options = !lto
 	options = !debug
 	options = emptydirs
-	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-9.0-20240221
+	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-9.0-20240301
 	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.0.0/wine-mono-9.0.0-x86.tar.xz
@@ -141,20 +141,20 @@ pkgbase = proton-experimental
 	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
-	source = 0001-AUR-Enable-winewayland.patch
+	source = 0007-AUR-Enable-winewayland.patch
 	source = 0001-fshack-AMD-FSR-complete.patch
 	source = 4947.patch
 	sha256sums = SKIP
 	sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6
 	sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
 	sha256sums = d73d440c08ebd67c93fbd6534f4f1b4e98aa07342f9c7d98c8aaeb74755eb9cf
-	sha256sums = 1a7594e71ad34046226e6145570b2bd3f19b0145ec1e0f66dc4cbad3e83cc224
-	sha256sums = 25693e0d04c6e959cfe75eee69c0812f4ec8c4ef1183a0e4e40705bd501ddb85
-	sha256sums = d94e11af39dce07e09c3448b38cd3511931c6981fa18f136a2b3f3f448206438
-	sha256sums = 8c1518d07b7516fd09b189d9182174ea2fb7b5a4d83f6dda8b857cdf429b43fa
-	sha256sums = 115925bfa8e727013955fb9b27feb63462c6c40f45758d2204f8c7322af8e44a
-	sha256sums = 13921bc7b252d439b4c3355f4010d4c0dfe91eee0ec5cdd0363f19c01dbc8309
-	sha256sums = 4beba70f2209a497d6b4f8ad934a242a3314d1541b3d89ae702ad896cae3a869
+	sha256sums = be2292d5b2c586daf96b96ee010d07e04802d38f196c5bd4a50fe81c0a69e4f5
+	sha256sums = 894fe9815caa7a818c092dc0d0a2192b680c159c7950af6829ced6bcbc04423f
+	sha256sums = b3161b22d4d0a3c242a21aeeb7dea012082a5868d5a4f47adccaf4446e75c47a
+	sha256sums = dbdab9134e381c288dfbc6b3d279ecf623f37db3d133a3baea952909094bf6d8
+	sha256sums = 0709768d95454c7ee9cbe96d7023a5021ae38138708abefc257a3dfce68a3f74
+	sha256sums = bd50d8ed714d1457f3eac9a42a3731295de3c9a2f7257179b5f7c03b392b7e34
+	sha256sums = 60e9ef11176a6d1cd243269d5c930a28c2ac33375097144d2d023e283af8b1a5
 	sha256sums = 3d308f8e87361669267fa52b986c24f1dea1913156a045f43ea04e02f7444b18
 	sha256sums = 0f9ddda17319e3ef23ee847c0a740bf74847796d4b3cf61b05feb9aa3141b7c7
 
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index dd6f9cfdf39f..987421827c3e 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,7 +1,7 @@
-From dfa9096f4255b00b6b78a6ef2e847f7b7db82482 Mon Sep 17 00:00:00 2001
+From e4e18b02eb403117681eec19f71d2dfb653d9af7 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
+Subject: [PATCH 1/7] AUR Pkgbuild changes
 
 ---
  Makefile.in                    | 76 ++++++++++++++++++++++++++--------
@@ -465,7 +465,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 22422ab3..fd131e02 100755
+index 307cbbcc..6b2eddbd 100755
 --- a/proton
 +++ b/proton
 @@ -423,7 +423,6 @@ class Proton:
@@ -476,7 +476,7 @@ index 22422ab3..fd131e02 100755
  
      def path(self, d):
          return self.base_dir + d
-@@ -1494,8 +1493,6 @@ if __name__ == "__main__":
+@@ -1493,8 +1492,6 @@ if __name__ == "__main__":
  
      g_proton = Proton(os.path.dirname(sys.argv[0]))
  
@@ -485,7 +485,7 @@ index 22422ab3..fd131e02 100755
  
      g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
  
-@@ -1504,7 +1501,8 @@ if __name__ == "__main__":
+@@ -1503,7 +1500,8 @@ if __name__ == "__main__":
      g_session.init_wine()
  
      if g_proton.missing_default_prefix():
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index 81961c861fdc..4360976dd4c8 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,7 +1,7 @@
-From 782a77ef391501e43b5a8f68123326aa5170710f Mon Sep 17 00:00:00 2001
+From bd3e5797f85328e50732bc89c383b18ed7fe6e2f 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
+Subject: [PATCH 2/7] AUR Do not update cargo crates
 
 ---
  make/rules-cargo.mk | 2 --
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 42bd1e3b351e..4a93a052978a 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,7 +1,7 @@
-From b494a8fa1dddc381dc74f5496e6ab95e0290ffd4 Mon Sep 17 00:00:00 2001
+From 22d67d087892356966609869031bc35217bcae5c 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
+Subject: [PATCH 3/7] AUR Remove kaldi, openfst, vosk-api modules because of
  missing blas, lapack lib32 from Arch
 
 ---
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 4bddcc219345..60e2d889b42b 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,7 +1,7 @@
-From 9981c540159727f5a3999c2318c5f02864ffa8d1 Mon Sep 17 00:00:00 2001
+From 67f16584f60601d35abcd10635f4a0403e569e4c 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
+Subject: [PATCH 4/7] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
  correct location in the prefix
 
 For some unknown to me reason, 32bit vkd3d (not vkd3d-proton) always links
@@ -20,7 +20,7 @@ a runtime dependency.
  1 file changed, 9 insertions(+)
 
 diff --git a/proton b/proton
-index fd131e02..027e5650 100755
+index 6b2eddbd..89baeb8e 100755
 --- a/proton
 +++ b/proton
 @@ -922,6 +922,15 @@ class CompatData:
diff --git a/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch
index 0232a8ecdf4e..2b94abfc68c6 100644
--- a/0005-AUR-Strip-binaries-early.patch
+++ b/0005-AUR-Strip-binaries-early.patch
@@ -1,7 +1,7 @@
-From 4fb329df8d2086e68c2e27c6fbe63361cb37ffbb Mon Sep 17 00:00:00 2001
+From f902e3f2d41a74d52cf4a1d8c0f78e059c4fdf74 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
+Subject: [PATCH 5/7] AUR Strip binaries early
 
 ---
  Makefile.in | 2 +-
diff --git a/0006-AUR-Fix-hwnd-redefinition.patch b/0006-AUR-Fix-hwnd-redefinition.patch
index cf4002fced84..a7b8c06dff5e 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,7 +1,7 @@
-From ce239cce081703f8eb0dd6355e51dafd56a86d86 Mon Sep 17 00:00:00 2001
+From ff726d0d64086fe52e84ec4b8f4adcd314b7b45e 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
+Subject: [PATCH 6/7] AUR: Fix hwnd redefinition
 
 ---
  steam_helper/steam.cpp          | 4 ++++
diff --git a/0001-AUR-Enable-winewayland.patch b/0007-AUR-Enable-winewayland.patch
index 00321019421c..55ff72efd798 100644
--- a/0001-AUR-Enable-winewayland.patch
+++ b/0007-AUR-Enable-winewayland.patch
@@ -1,12 +1,12 @@
-From aa1b2ccd48dcee5f51fe662f2a7b2ab8a151a7cc Mon Sep 17 00:00:00 2001
+From 58045d3c4da226d6df5be7f0ba80bebeef7a0134 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Thu, 29 Feb 2024 15:28:48 +0200
-Subject: [PATCH] AUR Enable winewayland
+Subject: [PATCH 7/7] AUR Enable winewayland
 
 ---
  Makefile.in | 1 +
- proton      | 4 ++++
- 2 files changed, 5 insertions(+)
+ proton      | 8 ++++++++
+ 2 files changed, 9 insertions(+)
 
 diff --git a/Makefile.in b/Makefile.in
 index 99ee6e17..581b981c 100644
@@ -21,15 +21,19 @@ index 99ee6e17..581b981c 100644
    --with-mingw \
    --without-oss \
 diff --git a/proton b/proton
-index 027e5650..09e4fea7 100755
+index 89baeb8e..ca22cda3 100755
 --- a/proton
 +++ b/proton
-@@ -1525,6 +1525,10 @@ if __name__ == "__main__":
+@@ -1524,6 +1524,14 @@ if __name__ == "__main__":
      elif sys.argv[1] == "waitforexitandrun":
          #wait for wineserver to shut down
          g_session.run_proc([g_proton.wineserver_bin, "-w"])
++        winedrv = "x11"
++        if os.environ.get("PROTON_ENABLE_WAYLAND", False):
++            del os.environ["DISPLAY"]
++            winedrv = "wayland"
 +        g_session.run_proc(
-+            [g_proton.wine_bin, "reg.exe", "add", "HKCU\\Software\\Wine\\Drivers", "/v", "Graphics", "/d", "x11,wayland", "/f"]
++            [g_proton.wine_bin, "reg.exe", "add", "HKCU\\Software\\Wine\\Drivers", "/v", "Graphics", "/d", f"{winedrv}", "/f"]
 +        )
 +        g_session.run_proc([g_proton.wineserver_bin, "-w"])
          #then run
diff --git a/PKGBUILD b/PKGBUILD
index f350d593ac4a..81d26a7ccbe5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton-experimental
-_srctag=9.0-20240221
+_srctag=9.0-20240301
 _commit=
-pkgver=9.0.20240221 #${_srctag//-/.}
+pkgver=${_srctag//-/.}
 _geckover=2.47.4
 _monover=9.0.0
-pkgrel=6
+pkgrel=1
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, experimental branch"
 url="https://github.com/ValveSoftware/Proton"
@@ -96,7 +96,7 @@ source=(
     0006-AUR-Fix-hwnd-redefinition.patch
 )
 source+=(
-    0001-AUR-Enable-winewayland.patch
+    0007-AUR-Enable-winewayland.patch
     0001-fshack-AMD-FSR-complete.patch
     4947.patch
 )
@@ -171,7 +171,8 @@ prepare() {
     patch -p1 -i "$srcdir"/0005-AUR-Strip-binaries-early.patch
     patch -p1 -i "$srcdir"/0006-AUR-Fix-hwnd-redefinition.patch
 
-    patch -p1 -i "$srcdir"/0001-AUR-Enable-winewayland.patch
+    # Wine wayland is disabled, use at your own risk
+    patch -p1 -i "$srcdir"/0007-AUR-Enable-winewayland.patch
     pushd wine
         patch -p1 -i "$srcdir"/0001-fshack-AMD-FSR-complete.patch
         patch -p1 -i "$srcdir"/4947.patch
@@ -275,12 +276,12 @@ sha256sums=('SKIP'
             '2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6'
             'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
             'd73d440c08ebd67c93fbd6534f4f1b4e98aa07342f9c7d98c8aaeb74755eb9cf'
-            '1a7594e71ad34046226e6145570b2bd3f19b0145ec1e0f66dc4cbad3e83cc224'
-            '25693e0d04c6e959cfe75eee69c0812f4ec8c4ef1183a0e4e40705bd501ddb85'
-            'd94e11af39dce07e09c3448b38cd3511931c6981fa18f136a2b3f3f448206438'
-            '8c1518d07b7516fd09b189d9182174ea2fb7b5a4d83f6dda8b857cdf429b43fa'
-            '115925bfa8e727013955fb9b27feb63462c6c40f45758d2204f8c7322af8e44a'
-            '13921bc7b252d439b4c3355f4010d4c0dfe91eee0ec5cdd0363f19c01dbc8309'
-            '4beba70f2209a497d6b4f8ad934a242a3314d1541b3d89ae702ad896cae3a869'
+            'be2292d5b2c586daf96b96ee010d07e04802d38f196c5bd4a50fe81c0a69e4f5'
+            '894fe9815caa7a818c092dc0d0a2192b680c159c7950af6829ced6bcbc04423f'
+            'b3161b22d4d0a3c242a21aeeb7dea012082a5868d5a4f47adccaf4446e75c47a'
+            'dbdab9134e381c288dfbc6b3d279ecf623f37db3d133a3baea952909094bf6d8'
+            '0709768d95454c7ee9cbe96d7023a5021ae38138708abefc257a3dfce68a3f74'
+            'bd50d8ed714d1457f3eac9a42a3731295de3c9a2f7257179b5f7c03b392b7e34'
+            '60e9ef11176a6d1cd243269d5c930a28c2ac33375097144d2d023e283af8b1a5'
             '3d308f8e87361669267fa52b986c24f1dea1913156a045f43ea04e02f7444b18'
             '0f9ddda17319e3ef23ee847c0a740bf74847796d4b3cf61b05feb9aa3141b7c7')