proton-experimental: version 9.0-20240619

1 files changed, 26 insertions, 26 deletions

diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 4ffb7a3703ba..1fa76bfc43c4 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,4 +1,4 @@
-From cd96349f1b666037bce73a70eb8a542a5c0db98f Mon Sep 17 00:00:00 2001
+From f0cae69eef2d33572843b61d58a7b4eb3ed00103 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
@@ -20,7 +20,7 @@ Subject: [PATCH 1/6] AUR Pkgbuild changes
  13 files changed, 87 insertions(+), 43 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index bbbef5ee..11eb5ca7 100644
+index f04d4136..71828ce6 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -54,11 +54,12 @@ else
@@ -62,7 +62,7 @@ index bbbef5ee..11eb5ca7 100644
  
  include $(SRC)/make/utility.mk
  include $(SRC)/make/rules-source.mk
-@@ -117,6 +126,7 @@ $(eval $(call rules-meson,dav1d,64))
+@@ -118,6 +127,7 @@ $(eval $(call rules-meson,dav1d,64))
  ##
  
  GST_ORC_MESON_ARGS := \
@@ -70,7 +70,7 @@ index bbbef5ee..11eb5ca7 100644
  	-Dorc-test=disabled
  
  $(eval $(call rules-source,gst_orc,$(SRCDIR)/gst-orc))
-@@ -129,7 +139,12 @@ $(eval $(call rules-meson,gst_orc,64))
+@@ -130,7 +140,12 @@ $(eval $(call rules-meson,gst_orc,64))
  ##
  
  GSTREAMER_MESON_ARGS := \
@@ -83,7 +83,7 @@ index bbbef5ee..11eb5ca7 100644
  	-Dbenchmarks=disabled \
  	-Dtools=disabled \
  	-Dbash-completion=disabled
-@@ -145,6 +160,11 @@ $(eval $(call rules-meson,gstreamer,64))
+@@ -146,6 +161,11 @@ $(eval $(call rules-meson,gstreamer,64))
  ## graphene
  ##
  
@@ -95,7 +95,7 @@ index bbbef5ee..11eb5ca7 100644
  $(eval $(call rules-source,graphene,$(SRCDIR)/graphene))
  $(eval $(call rules-meson,graphene,32))
  $(eval $(call rules-meson,graphene,64))
-@@ -155,7 +175,10 @@ $(eval $(call rules-meson,graphene,64))
+@@ -156,7 +176,10 @@ $(eval $(call rules-meson,graphene,64))
  ##
  
  GST_BASE_MESON_ARGS := \
@@ -106,7 +106,7 @@ index bbbef5ee..11eb5ca7 100644
  	-Dadder=enabled \
  	-Dapp=enabled \
  	-Daudioconvert=enabled \
-@@ -187,7 +210,9 @@ $(eval $(call rules-meson,gst_base,64))
+@@ -188,7 +211,9 @@ $(eval $(call rules-meson,gst_base,64))
  ##
  
  GST_GOOD_MESON_ARGS := \
@@ -116,7 +116,7 @@ index bbbef5ee..11eb5ca7 100644
  	-Daudioparsers=enabled \
  	-Dautodetect=enabled \
  	-Davi=enabled \
-@@ -217,12 +242,16 @@ $(eval $(call rules-meson,gst_good,64))
+@@ -218,12 +243,16 @@ $(eval $(call rules-meson,gst_good,64))
  
  FFMPEG_CONFIGURE_ARGS := \
  	--enable-shared \
@@ -133,7 +133,7 @@ index bbbef5ee..11eb5ca7 100644
  $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
  $(eval $(call rules-configure,ffmpeg,32))
  $(eval $(call rules-configure,ffmpeg,64))
-@@ -339,7 +368,7 @@ $(eval $(call rules-cmake,openxr,64))
+@@ -340,7 +369,7 @@ $(eval $(call rules-cmake,openxr,64))
  ## Note 32-bit is not supported by SteamVR, so we don't build it.
  ##
  
@@ -142,7 +142,7 @@ index bbbef5ee..11eb5ca7 100644
  WINEOPENXR_DEPENDS = wine openxr
  
  $(eval $(call rules-source,wineopenxr,$(SRCDIR)/wineopenxr))
-@@ -417,6 +446,9 @@ OPENFST_CONFIGURE_ARGS = \
+@@ -418,6 +447,9 @@ OPENFST_CONFIGURE_ARGS = \
    --with-pic \
    --disable-bin \
  
@@ -152,8 +152,8 @@ index bbbef5ee..11eb5ca7 100644
  $(eval $(call rules-source,openfst,$(SRCDIR)/openfst))
  $(eval $(call rules-autoconf,openfst,32))
  $(eval $(call rules-autoconf,openfst,64))
-@@ -479,8 +511,10 @@ WINE_SOURCE_ARGS = \
-   --exclude dlls/winevulkan/winevulkan.spec
+@@ -485,8 +517,10 @@ WINE_SOURCE_ARGS = \
+   --exclude server/trace.c \
  
  WINE_CONFIGURE_ARGS = \
 -  --enable-werror \
@@ -164,9 +164,9 @@ index bbbef5ee..11eb5ca7 100644
    --disable-tests
  
  WINE_CONFIGURE_ARGS32 = \
-@@ -539,10 +573,14 @@ $(eval $(call rules-makedep,vrclient,64))
- DXVK_SOURCE_DATE_EPOCH32 := $(shell expr $(BASE_SOURCE_DATE_EPOCH32) - 1)
- DXVK_SOURCE_DATE_EPOCH64 := $(shell expr $(BASE_SOURCE_DATE_EPOCH64) - 1)
+@@ -548,10 +582,14 @@ DXVK_SOURCE_DATE_EPOCH64 := $(shell expr $(BASE_SOURCE_DATE_EPOCH64) - 1)
+ DXVK_SOURCE_ARGS = \
+   --exclude version.h.in \
  
 +DXVK_MESON_ARGS = --force-fallback-for=libdisplay-info
  DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
@@ -179,7 +179,7 @@ index bbbef5ee..11eb5ca7 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -570,6 +608,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -579,6 +617,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
  
@@ -189,7 +189,7 @@ index bbbef5ee..11eb5ca7 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))
-@@ -649,6 +690,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
+@@ -658,6 +699,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
  	VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
  endif
  
@@ -199,7 +199,7 @@ index bbbef5ee..11eb5ca7 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))
-@@ -919,14 +963,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -928,14 +972,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
@@ -217,7 +217,7 @@ index bbbef5ee..11eb5ca7 100644
  	mv $@.tmp $@
  
  $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -936,12 +980,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -945,12 +989,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)
@@ -233,7 +233,7 @@ index bbbef5ee..11eb5ca7 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) \
-@@ -1090,8 +1134,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1099,8 +1143,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
@@ -244,7 +244,7 @@ index bbbef5ee..11eb5ca7 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
  
-@@ -1223,7 +1267,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1232,7 +1276,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
@@ -252,7 +252,7 @@ index bbbef5ee..11eb5ca7 100644
  	override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
  endif
  
-@@ -1238,9 +1281,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1247,9 +1290,6 @@ ifeq ($(CONTAINER_ENGINE),)
  	CONTAINER_ENGINE := docker
  endif
  
@@ -464,7 +464,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 0aa176b8..5ed98c3c 100755
+index 345b17cc..ebb03b0c 100755
 --- a/proton
 +++ b/proton
 @@ -424,7 +424,6 @@ class Proton:
@@ -475,7 +475,7 @@ index 0aa176b8..5ed98c3c 100755
  
      def path(self, d):
          return self.base_dir + d
-@@ -1546,8 +1545,6 @@ if __name__ == "__main__":
+@@ -1560,8 +1559,6 @@ if __name__ == "__main__":
  
      g_proton = Proton(os.path.dirname(sys.argv[0]))
  
@@ -484,7 +484,7 @@ index 0aa176b8..5ed98c3c 100755
  
      g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
  
-@@ -1556,7 +1553,8 @@ if __name__ == "__main__":
+@@ -1570,7 +1567,8 @@ if __name__ == "__main__":
      g_session.init_wine()
  
      if g_proton.missing_default_prefix():
@@ -507,5 +507,5 @@ index beddcbbb..b6f36788 100644
 -  "compatmanager_layer_name" "proton"
  }
 -- 
-2.45.1
+2.45.2