[proton-experimental] For fallback for libdisplay-info

8 files changed, 39 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec689154548c..0ed820097379 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.20240205
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	install = proton-experimental.install
@@ -143,11 +143,11 @@ pkgbase = proton-experimental
 	sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6
 	sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
 	sha256sums = 4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4
-	sha256sums = 689caab80d585d5d22262a71eb8cee5db695d92384088a72203ad5f0a3bc2637
-	sha256sums = e8fcd752b269595722cfb986d4a977c605681c6eb7fe009946ade746581ad8b2
-	sha256sums = 2dc90663f5475150538d2c1a33e6d6dbd9cde78c0009c8cd55d0c815567c4d76
-	sha256sums = d30a79af720e721295bfded9be714d085b46894dbe81f78b78db9ed6e2641818
-	sha256sums = 2a5d3dabc4f5e94ee285bc3475298ac9364c31ad59d69bcc2394ced79a6674c0
-	sha256sums = 1be6147da088788e73c704eebfe6f79420dbc0cfb3fbeb96e44d559b3427f669
+	sha256sums = facdd6c59e93f5f0877ba1e68a1f5f90f8cd8333e6fba863760ddfa49330753c
+	sha256sums = 0ad87e3ca616120ec490361df41e24b445a62ad4f9652b048d156c4859f4a2f6
+	sha256sums = e76d56f97a795f143ecd718229b9af8a5e2a4d1daffa6e35a26bc68c1c22f68e
+	sha256sums = a5429443e20a2b5d5f1e90626741b264bac036556202f99c691637815785c989
+	sha256sums = 73fabb8d30e174e57ac864a5ec7a3bc6bcd0fd917db4094d3b9ad807ca69a411
+	sha256sums = db9f7cca780b4e4225e1cc75501cd348878112936cdc5c832caa8e4dd6614e1a
 
 pkgname = proton-experimental
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 0476d8c41fe9..92d26d7b19ab 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,26 +1,26 @@
-From d10b62dac4fe677fd00c5d406196b5a212e0de2f Mon Sep 17 00:00:00 2001
+From 3056186c67e1708550d8321843650a106a88d776 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                    | 75 ++++++++++++++++++++++++++--------
  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(+), 42 deletions(-)
+ 13 files changed, 89 insertions(+), 42 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 7ec939df..32211119 100644
+index 7ec939df..3636f22c 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -50,11 +50,12 @@ else
@@ -164,7 +164,12 @@ index 7ec939df..32211119 100644
    --disable-tests
  
  WINE_CONFIGURE_ARGS32 = \
-@@ -527,6 +564,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
+@@ -523,10 +560,14 @@ $(eval $(call rules-makedep,vrclient,64))
+ ## dxvk
+ ##
+ 
++DXVK_MESON_ARGS = --force-fallback-for=libdisplay-info
+ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
  DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
  DXVK_DEPENDS = glslang
  
@@ -174,7 +179,7 @@ index 7ec939df..32211119 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -554,6 +594,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -554,6 +595,9 @@ $(OBJ)/.dxvk-post-build32:
  DXVK_NVAPI_MESON_ARGS32 = --bindir=$(DXVK_NVAPI_DST32)/lib/wine/nvapi
  DXVK_NVAPI_MESON_ARGS64 = --bindir=$(DXVK_NVAPI_DST64)/lib64/wine/nvapi
  
@@ -184,7 +189,7 @@ index 7ec939df..32211119 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))
-@@ -628,6 +671,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
+@@ -628,6 +672,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
  	VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
  endif
  
@@ -194,7 +199,7 @@ index 7ec939df..32211119 100644
  $(eval $(call rules-source,vkd3d-proton,$(SRCDIR)/vkd3d-proton))
  $(eval $(call rules-meson,vkd3d-proton,32,CROSS))
  $(eval $(call rules-meson,vkd3d-proton,64,CROSS))
-@@ -924,14 +970,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -924,14 +971,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
  	mkdir -p $(FONTS_OBJ)/source-han
  	# Do not immediately create the target file, so that make is interrupted
  	# it will restart again
@@ -212,7 +217,7 @@ index 7ec939df..32211119 100644
  	mv $@.tmp $@
  
  $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -941,12 +987,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -941,12 +988,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
  	ttx -o $@ -m $($(notdir $@)_FONT) $(FONTS_OBJ)/ume-gothic/$(notdir $(basename $($(notdir $@)_NAMETABLE_PATCH))).ttx
  
  $(simsun.ttc): $(simsun.ttf) $(nsimsun.ttf)
@@ -228,7 +233,7 @@ index 7ec939df..32211119 100644
  
  $(micross.ttf): $(FONTS)/scripts/merge.py $(noto_sans.ttf) $(noto_sans_arabic.ttf) $(noto_sans_armenian.ttf) $(noto_sans_bengali.ttf) $(noto_sans_coptic.ttf) \
  		$(noto_sans_georgian.ttf) $(noto_sans_gujarati.ttf) $(noto_sans_hebrew.ttf) $(noto_sans_khmer.ttf) $(noto_sans_tamil.ttf) \
-@@ -1072,8 +1118,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1072,8 +1119,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
  ##
  
  default_pfx: wine gst_good gst_libav gst_plugins_rs lsteamclient steamexe vrclient wineopenxr dxvk dxvk-nvapi vkd3d-proton
@@ -239,7 +244,7 @@ index 7ec939df..32211119 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
  
-@@ -1205,7 +1251,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1205,7 +1252,6 @@ ifeq ($(ENABLE_CCACHE),1)
  	export CCACHE_DIR := $(if $(CCACHE_DIR),$(CCACHE_DIR),$(HOME)/.ccache)
  	override DOCKER_OPTS := -v $(CCACHE_DIR):$(CCACHE_DIR)$(CONTAINER_MOUNT_OPTS) $(CCACHE_ENV) -e CCACHE_DIR=$(CCACHE_DIR) $(DOCKER_OPTS)
  else
@@ -247,7 +252,7 @@ index 7ec939df..32211119 100644
  	override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
  endif
  
-@@ -1220,9 +1265,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1220,9 +1266,6 @@ ifeq ($(CONTAINER_ENGINE),)
  	CONTAINER_ENGINE := docker
  endif
  
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index b9235332a165..160e01340447 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From 79daca152dc772c5c33de9a7803fb473b26fac27 Mon Sep 17 00:00:00 2001
+From 8f433c2161a800e24dcc7c5dd9adb48dad2d6745 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 4b586754369b..cf0eb677420c 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 6261003a84aabb1218f969e03a9126986a2d97a5 Mon Sep 17 00:00:00 2001
+From 9c69ddbb3082515a94761f1aef10542d4a92c3ac 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 32211119..1f196b49 100644
+index 3636f22c..ea505e39 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -403,86 +403,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 d5aeda3dd76c..8a0a18850195 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 6b00a459f6a907ea1a075319689225bc924c5208 Mon Sep 17 00:00:00 2001
+From 70c31f5f82163bbf18cb8338e14f80b9de78b620 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 9a45895b6545..65f9b964456f 100644
--- a/0005-AUR-Strip-binaries-early.patch
+++ b/0005-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From aa5353ce5cd17971ddb7548c0a19334ea16e40a3 Mon Sep 17 00:00:00 2001
+From c8de8d2e84662b3eca41111d84a3d74bc363a955 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 1f196b49..b70e1e48 100644
+index ea505e39..892d78b1 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 ebbafaa8589b..5579d9f8ba3c 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From cd760beea4ee15c3a435120b2bb71176200d3358 Mon Sep 17 00:00:00 2001
+From 9def0147d49fc860d0ba590bd1e7f90fe8a8e410 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 32b73034056a..c1f5a1d23d9a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=
 pkgver=8.0.20240205 #${_srctag//-/.}
 _geckover=2.47.4
 _monover=8.1.0
-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"
@@ -261,9 +261,9 @@ sha256sums=('SKIP'
             '2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6'
             'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
             '4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4'
-            '689caab80d585d5d22262a71eb8cee5db695d92384088a72203ad5f0a3bc2637'
-            'e8fcd752b269595722cfb986d4a977c605681c6eb7fe009946ade746581ad8b2'
-            '2dc90663f5475150538d2c1a33e6d6dbd9cde78c0009c8cd55d0c815567c4d76'
-            'd30a79af720e721295bfded9be714d085b46894dbe81f78b78db9ed6e2641818'
-            '2a5d3dabc4f5e94ee285bc3475298ac9364c31ad59d69bcc2394ced79a6674c0'
-            '1be6147da088788e73c704eebfe6f79420dbc0cfb3fbeb96e44d559b3427f669')
+            'facdd6c59e93f5f0877ba1e68a1f5f90f8cd8333e6fba863760ddfa49330753c'
+            '0ad87e3ca616120ec490361df41e24b445a62ad4f9652b048d156c4859f4a2f6'
+            'e76d56f97a795f143ecd718229b9af8a5e2a4d1daffa6e35a26bc68c1c22f68e'
+            'a5429443e20a2b5d5f1e90626741b264bac036556202f99c691637815785c989'
+            '73fabb8d30e174e57ac864a5ec7a3bc6bcd0fd917db4094d3b9ad807ca69a411'
+            'db9f7cca780b4e4225e1cc75501cd348878112936cdc5c832caa8e4dd6614e1a')