[proton-experimental] Enable avx/avx2

9 files changed, 33 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c35e770b2f11..be0055c4bca1 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.20240301
-	pkgrel = 2
+	pkgrel = 3
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	install = proton-experimental.install
@@ -148,13 +148,13 @@ pkgbase = proton-experimental
 	sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6
 	sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
 	sha256sums = d73d440c08ebd67c93fbd6534f4f1b4e98aa07342f9c7d98c8aaeb74755eb9cf
-	sha256sums = be2292d5b2c586daf96b96ee010d07e04802d38f196c5bd4a50fe81c0a69e4f5
-	sha256sums = 894fe9815caa7a818c092dc0d0a2192b680c159c7950af6829ced6bcbc04423f
-	sha256sums = b3161b22d4d0a3c242a21aeeb7dea012082a5868d5a4f47adccaf4446e75c47a
-	sha256sums = dbdab9134e381c288dfbc6b3d279ecf623f37db3d133a3baea952909094bf6d8
-	sha256sums = 0709768d95454c7ee9cbe96d7023a5021ae38138708abefc257a3dfce68a3f74
-	sha256sums = bd50d8ed714d1457f3eac9a42a3731295de3c9a2f7257179b5f7c03b392b7e34
-	sha256sums = ffde8e3c1c453c54e941958fba5a3c199880d9a1954e0cd35d0e7b5343998f56
+	sha256sums = f32cd6bfcc189a172ef7c0336264d24b870eef88c4e0feca3620b1411fbecb44
+	sha256sums = bf93c46e251d16c81688a843cbd0e0d3e5dd618139af050470d8597725c45e40
+	sha256sums = ecf97bbbfae0d9d8edef635189ab47d85d93b363fd6e71a9f3616469fdf9f309
+	sha256sums = 73e74744f09db1ecee9866cd0131a27c6634cd68175d5db39a8d865bedf11117
+	sha256sums = b858409f6cab4b901becbdf5b029174e7f07516d0431664dcf3f245648e2a3f5
+	sha256sums = 79ef58fa41ab5f5b97897f083790a52abbcd2d0611104050e61b4a78fb049af1
+	sha256sums = 05d66721a83cf4e6939bd082edd54fe0e025713a4b951b68fdf61bc9c79e4f06
 	sha256sums = 3d308f8e87361669267fa52b986c24f1dea1913156a045f43ea04e02f7444b18
 	sha256sums = 0f9ddda17319e3ef23ee847c0a740bf74847796d4b3cf61b05feb9aa3141b7c7
 
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 987421827c3e..add446eca32a 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,4 +1,4 @@
-From e4e18b02eb403117681eec19f71d2dfb653d9af7 Mon Sep 17 00:00:00 2001
+From 198ff97d9760fc05fd7f1d207efd997667f4417e 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/7] AUR Pkgbuild changes
@@ -20,7 +20,7 @@ Subject: [PATCH 1/7] AUR Pkgbuild changes
  13 files changed, 89 insertions(+), 43 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index b88483f7..822f0382 100644
+index b88483f7..a4ccd4e0 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -50,11 +50,12 @@ else
@@ -128,8 +128,8 @@ index b88483f7..822f0382 100644
  
 +FFMPEG_LTO_OPTS64 := --disable-inline-asm
 +FFMPEG_LTO_OPTS32 := --disable-inline-asm
-+FFMPEG_CONFIGURE_ARGS64 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS64)" $(FFMPEG_LTO_OPTS64)
-+FFMPEG_CONFIGURE_ARGS32 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS32)" $(FFMPEG_LTO_OPTS32)
++FFMPEG_CONFIGURE_ARGS64 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS64) $(FFMPEG_LTO_OPTS64)"
++FFMPEG_CONFIGURE_ARGS32 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS32) $(FFMPEG_LTO_OPTS32)"
 +
  $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
  $(eval $(call rules-configure,ffmpeg,32))
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index 4360976dd4c8..ed2adea30b6c 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From bd3e5797f85328e50732bc89c383b18ed7fe6e2f Mon Sep 17 00:00:00 2001
+From da1738f62278ad06ed20ec9dc45cd37ecb29e8ac 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/7] 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 4a93a052978a..457618dfb12f 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 22d67d087892356966609869031bc35217bcae5c Mon Sep 17 00:00:00 2001
+From e322bee3a668aae7d2bfae2abba2a69271263470 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/7] AUR Remove kaldi, openfst, vosk-api modules because of
@@ -9,7 +9,7 @@ Subject: [PATCH 3/7] 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 822f0382..7aefa09f 100644
+index a4ccd4e0..fc71a5d1 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -404,86 +404,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 60e2d889b42b..25fef518ee17 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 67f16584f60601d35abcd10635f4a0403e569e4c Mon Sep 17 00:00:00 2001
+From 3a0968c9b642c40b901014726d3a32b459aab87e 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/7] 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 2b94abfc68c6..29005e2a1a00 100644
--- a/0005-AUR-Strip-binaries-early.patch
+++ b/0005-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From f902e3f2d41a74d52cf4a1d8c0f78e059c4fdf74 Mon Sep 17 00:00:00 2001
+From 6ec6617bd7d0b24f0101b6001a764193cd48d017 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/7] AUR Strip binaries early
@@ -8,7 +8,7 @@ Subject: [PATCH 5/7] AUR Strip binaries early
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 7aefa09f..99ee6e17 100644
+index fc71a5d1..a80e5262 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -54,7 +54,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 a7b8c06dff5e..4a71d297c35c 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From ff726d0d64086fe52e84ec4b8f4adcd314b7b45e Mon Sep 17 00:00:00 2001
+From 44f51474947445efb1ed04cd7b69938151139a91 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/7] AUR: Fix hwnd redefinition
diff --git a/0007-AUR-Enable-winewayland.patch b/0007-AUR-Enable-winewayland.patch
index 123b8955632d..b8c6a11ab2ba 100644
--- a/0007-AUR-Enable-winewayland.patch
+++ b/0007-AUR-Enable-winewayland.patch
@@ -1,4 +1,4 @@
-From bc6c21fe707cccbdc9bd14a517e8aa7bdf0b85c2 Mon Sep 17 00:00:00 2001
+From 4569aceed6267eaeffa0fd1f9f6e4c510a548076 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Thu, 29 Feb 2024 15:28:48 +0200
 Subject: [PATCH 7/7] AUR Enable winewayland
@@ -9,7 +9,7 @@ Subject: [PATCH 7/7] AUR Enable winewayland
  2 files changed, 9 insertions(+)
 
 diff --git a/Makefile.in b/Makefile.in
-index 99ee6e17..581b981c 100644
+index a80e5262..ede0804a 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -426,6 +426,7 @@ WINE_SOURCE_ARGS = \
diff --git a/PKGBUILD b/PKGBUILD
index 31b9155e7080..f98fe05ec166 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=
 pkgver=${_srctag//-/.}
 _geckover=2.47.4
 _monover=9.0.0
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, experimental branch"
 url="https://github.com/ValveSoftware/Proton"
@@ -211,8 +211,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 -mno-avx"
-    CXXFLAGS+=" -mno-avx2 -mno-avx"
+    #CFLAGS+=" -mno-avx2 -mno-avx"
+    #CXXFLAGS+=" -mno-avx2 -mno-avx"
 
     export CFLAGS CXXFLAGS RUSTFLAGS LDFLAGS
 
@@ -220,7 +220,8 @@ build() {
     export CARGO_HOME="${SRCDEST}"/proton-cargo
     export WINEESYNC=0
     export WINEFSYNC=0
-    export DISPLAY=
+    unset DISPLAY
+
     SUBJOBS=$([[ "$MAKEFLAGS" =~ -j\ *([1-9][0-9]*) ]] && echo "${BASH_REMATCH[1]}" || echo "$(nproc)") \
         make -j1 dist
 }
@@ -276,12 +277,12 @@ sha256sums=('SKIP'
             '2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6'
             'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
             'd73d440c08ebd67c93fbd6534f4f1b4e98aa07342f9c7d98c8aaeb74755eb9cf'
-            'be2292d5b2c586daf96b96ee010d07e04802d38f196c5bd4a50fe81c0a69e4f5'
-            '894fe9815caa7a818c092dc0d0a2192b680c159c7950af6829ced6bcbc04423f'
-            'b3161b22d4d0a3c242a21aeeb7dea012082a5868d5a4f47adccaf4446e75c47a'
-            'dbdab9134e381c288dfbc6b3d279ecf623f37db3d133a3baea952909094bf6d8'
-            '0709768d95454c7ee9cbe96d7023a5021ae38138708abefc257a3dfce68a3f74'
-            'bd50d8ed714d1457f3eac9a42a3731295de3c9a2f7257179b5f7c03b392b7e34'
-            'ffde8e3c1c453c54e941958fba5a3c199880d9a1954e0cd35d0e7b5343998f56'
+            'f32cd6bfcc189a172ef7c0336264d24b870eef88c4e0feca3620b1411fbecb44'
+            'bf93c46e251d16c81688a843cbd0e0d3e5dd618139af050470d8597725c45e40'
+            'ecf97bbbfae0d9d8edef635189ab47d85d93b363fd6e71a9f3616469fdf9f309'
+            '73e74744f09db1ecee9866cd0131a27c6634cd68175d5db39a8d865bedf11117'
+            'b858409f6cab4b901becbdf5b029174e7f07516d0431664dcf3f245648e2a3f5'
+            '79ef58fa41ab5f5b97897f083790a52abbcd2d0611104050e61b4a78fb049af1'
+            '05d66721a83cf4e6939bd082edd54fe0e025713a4b951b68fdf61bc9c79e4f06'
             '3d308f8e87361669267fa52b986c24f1dea1913156a045f43ea04e02f7444b18'
             '0f9ddda17319e3ef23ee847c0a740bf74847796d4b3cf61b05feb9aa3141b7c7')