[proton-experimental] Update and re-enable march and mtune, disable AVX for x64 too

8 files changed, 34 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1fe2e86f1cb..9aebc80d7e20 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 = 8.0.20231219
-	pkgrel = 3
+	pkgver = 8.0.20240111.3
+	pkgrel = 1
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	install = proton-experimental.install
@@ -162,7 +162,7 @@ pkgbase = proton-experimental
 	options = !lto
 	options = !debug
 	options = emptydirs
-	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-8.0-20231219
+	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-8.0-20240111c
 	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-8.1.0/wine-mono-8.1.0-x86.tar.xz
@@ -176,11 +176,11 @@ pkgbase = proton-experimental
 	sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6
 	sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
 	sha256sums = 4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4
-	sha256sums = 9dffdab7d53dc81ab82ba86d1f4baa8f85b1fe0410ece76b89295b09aab7fbe0
-	sha256sums = f16e8271169cbaca1111e925a02bd0d1dfcfd6a0941435b724734b626689f6c6
-	sha256sums = 42c869c47a3079087125efa94d786c5942cbd518a7ab087770a5c19d2007e0d6
-	sha256sums = 0892daec01d88ae497d1389673931f5aa1a93de56b24eeee6a6beaefcee8943c
-	sha256sums = c589f9bf60c27033680036a048374632001eddf8a9ca2277c7ed5893263c2ac9
-	sha256sums = eefb327133ee164db6d8002a851b8fad72f9fc2e669f1d58901ebdadbc240823
+	sha256sums = 0ee535ea77c14b0b1953e5456f1c38659d6eabab2c4afe347e321400edab6daf
+	sha256sums = 1dbff94c55d48eb878b0ee713dd2bc2ffc23243c7e04a0c941dd1b05430940c7
+	sha256sums = b2e4af3738313c64fb86224398696628e138341b603e3c4f8a5193d1d603c962
+	sha256sums = abf849ef1da423cd1cbbc53925a77fb2c47a74f682448a87ff067edcd4453729
+	sha256sums = 66fea034536c4183e25838b1133a8b397b6cd6645be3260740040f50bd216bb9
+	sha256sums = 6d7902abcbccc850db96a362f5f42eecd4c8b8b71cd8cedfc3b880f91536a9c7
 
 pkgname = proton-experimental
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index bc3245f8673d..a8baa3969eb9 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,4 +1,4 @@
-From 51d4010480d581842ac324415f24b4b8a6a657d2 Mon Sep 17 00:00:00 2001
+From 78bb23d7dae4b4d863e7fcdbccc2da501fa19d01 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
@@ -459,7 +459,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 f93f545f..e4713eec 100755
+index 66340546..c9a373ea 100755
 --- a/proton
 +++ b/proton
 @@ -423,7 +423,6 @@ class Proton:
@@ -470,7 +470,7 @@ index f93f545f..e4713eec 100755
  
      def path(self, d):
          return self.base_dir + d
-@@ -1742,8 +1741,6 @@ if __name__ == "__main__":
+@@ -1751,8 +1750,6 @@ if __name__ == "__main__":
  
      g_proton = Proton(os.path.dirname(sys.argv[0]))
  
@@ -479,7 +479,7 @@ index f93f545f..e4713eec 100755
  
      g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
  
-@@ -1752,7 +1749,8 @@ if __name__ == "__main__":
+@@ -1761,7 +1758,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 1cea2d770ef4..87eb7ed5f663 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From 81224ebacaefd19d894afbcde000bda0745ec32b Mon Sep 17 00:00:00 2001
+From 41b28a57fc3b191ae3755ac277e99810776e7f78 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 bf507d964f0d..b5cab311f2ab 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 4141a175920b6bb81d589141a04185b9a25509a8 Mon Sep 17 00:00:00 2001
+From f8afc0cf5972211a9c3a353a9c11b9a54c632e32 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
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 84dbfd247d65..7ca9d3a9b661 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 98c97d55154566292875f73c05e0062a95dee02b Mon Sep 17 00:00:00 2001
+From 261862f2c93fdad045c6c44e3114e6ea4001eae0 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,10 +20,10 @@ a runtime dependency.
  1 file changed, 9 insertions(+)
 
 diff --git a/proton b/proton
-index e4713eec..b489aa96 100755
+index c9a373ea..d7dc3dfa 100755
 --- a/proton
 +++ b/proton
-@@ -918,6 +918,15 @@ class CompatData:
+@@ -921,6 +921,15 @@ class CompatData:
                          prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
                  try_copy(g_proton.lib_dir + "vkd3d/libvkd3d-shader-1.dll", "drive_c/windows/syswow64",
                          prefix=self.prefix_dir, track_file=tracked_files, link_debug=True)
diff --git a/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch
index 9304582109f6..29a63abf284c 100644
--- a/0005-AUR-Strip-binaries-early.patch
+++ b/0005-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From 230c3144ea0894e9b0e692cef5b913801b967ff7 Mon Sep 17 00:00:00 2001
+From d6561291e8168ee3c026e4206d91d4ea90ba4fc3 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
diff --git a/0006-AUR-Fix-hwnd-redefinition.patch b/0006-AUR-Fix-hwnd-redefinition.patch
index 11a08f5cd03f..b071e77681ee 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From d898a375310be217a70b818b772ccdd375716b85 Mon Sep 17 00:00:00 2001
+From e748bac8d1bd1b60dddb68840790ad4f5ecfef3c 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 7b21e82c1074..e4b659b7e43f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton-experimental
-_srctag=8.0-20231219
+_srctag=8.0-20240111c
 _commit=
-pkgver=8.0.20231219 #${_srctag//-/.}
+pkgver=8.0.20240111.3 #${_srctag//-/.}
 _geckover=2.47.4
 _monover=8.1.0
-pkgrel=3
+pkgrel=1
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, experimental branch"
 url="https://github.com/ValveSoftware/Proton"
@@ -175,9 +175,9 @@ build() {
         --proton-sdk-image="" \
         --build-name="${pkgname}"
 
-#    local -a split=($CFLAGS)
-#    local -A flags
-#    for opt in "${split[@]}"; do flags["${opt%%=*}"]="${opt##*=}"; done
+    local -a split=($CFLAGS)
+    local -A flags
+    for opt in "${split[@]}"; do flags["${opt%%=*}"]="${opt##*=}"; done
     local march="${flags["-march"]:-nocona}"
     local mtune="${flags["-mtune"]:-core-avx2}"
 
@@ -197,8 +197,8 @@ build() {
     # https://bugs.winehq.org/show_bug.cgi?id=43516
     # AVX is "hard" disabled for 32bit in any case.
     # AVX2 for both 32bit and 64bit is disabled below.
-    CFLAGS+=" -mno-avx2"
-    CXXFLAGS+=" -mno-avx2"
+    CFLAGS+=" -mno-avx2 -mno-avx"
+    CXXFLAGS+=" -mno-avx2 -mno-avx"
 
     export CFLAGS CXXFLAGS RUSTFLAGS LDFLAGS
 
@@ -262,10 +262,10 @@ sha256sums=('SKIP'
             '2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6'
             'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
             '4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4'
-            '9dffdab7d53dc81ab82ba86d1f4baa8f85b1fe0410ece76b89295b09aab7fbe0'
-            'f16e8271169cbaca1111e925a02bd0d1dfcfd6a0941435b724734b626689f6c6'
-            '42c869c47a3079087125efa94d786c5942cbd518a7ab087770a5c19d2007e0d6'
-            '0892daec01d88ae497d1389673931f5aa1a93de56b24eeee6a6beaefcee8943c'
-            'c589f9bf60c27033680036a048374632001eddf8a9ca2277c7ed5893263c2ac9'
-            'eefb327133ee164db6d8002a851b8fad72f9fc2e669f1d58901ebdadbc240823')
+            '0ee535ea77c14b0b1953e5456f1c38659d6eabab2c4afe347e321400edab6daf'
+            '1dbff94c55d48eb878b0ee713dd2bc2ffc23243c7e04a0c941dd1b05430940c7'
+            'b2e4af3738313c64fb86224398696628e138341b603e3c4f8a5193d1d603c962'
+            'abf849ef1da423cd1cbbc53925a77fb2c47a74f682448a87ff067edcd4453729'
+            '66fea034536c4183e25838b1133a8b397b6cd6645be3260740040f50bd216bb9'
+            '6d7902abcbccc850db96a362f5f42eecd4c8b8b71cd8cedfc3b880f91536a9c7')