proton-ge-custom: Version GE-Proton9-7

1 files changed, 31 insertions, 31 deletions

diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index b9c183970b3b..0d573a3e7c83 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,4 +1,4 @@
-From ec0126e8c1ac948d4823f4b086e24241fe3e441b Mon Sep 17 00:00:00 2001
+From fd6f1cf4e84e1e02514aa28de595583db861af45 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Tue, 7 Feb 2023 22:00:48 +0200
 Subject: [PATCH 1/7] AUR Pkgbuild changes
@@ -20,7 +20,7 @@ Subject: [PATCH 1/7] AUR Pkgbuild changes
  13 files changed, 88 insertions(+), 42 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index bee51bfa..42504deb 100644
+index c01116e5..b78e6643 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -54,11 +54,12 @@ else
@@ -62,7 +62,7 @@ index bee51bfa..42504deb 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 bee51bfa..42504deb 100644
  	-Dexamples=disabled \
  	-Dtests=disabled \
  	-Dbenchmarks=disabled \
-@@ -132,7 +142,10 @@ $(eval $(call rules-meson,gst_orc,64))
+@@ -133,7 +143,10 @@ $(eval $(call rules-meson,gst_orc,64))
  ##
  
  GSTREAMER_MESON_ARGS := \
@@ -81,7 +81,7 @@ index bee51bfa..42504deb 100644
  	-Dintrospection=disabled \
  	-Dgobject-cast-checks=disabled \
  	-Dglib-asserts=disabled \
-@@ -156,6 +169,11 @@ $(eval $(call rules-meson,gstreamer,64))
+@@ -157,6 +170,11 @@ $(eval $(call rules-meson,gstreamer,64))
  ## graphene
  ##
  
@@ -93,7 +93,7 @@ index bee51bfa..42504deb 100644
  $(eval $(call rules-source,graphene,$(SRCDIR)/graphene))
  $(eval $(call rules-meson,graphene,32))
  $(eval $(call rules-meson,graphene,64))
-@@ -166,6 +184,7 @@ $(eval $(call rules-meson,graphene,64))
+@@ -167,6 +185,7 @@ $(eval $(call rules-meson,graphene,64))
  ##
  
  GST_BASE_MESON_ARGS := \
@@ -101,7 +101,7 @@ index bee51bfa..42504deb 100644
  	-Dauto_features=disabled \
  	-Dintrospection=disabled \
  	-Dgobject-cast-checks=disabled \
-@@ -175,6 +194,7 @@ GST_BASE_MESON_ARGS := \
+@@ -176,6 +195,7 @@ GST_BASE_MESON_ARGS := \
  	-Dexamples=disabled \
  	-Dtests=disabled \
  	-Ddoc=disabled \
@@ -109,7 +109,7 @@ index bee51bfa..42504deb 100644
  	-Dadder=enabled \
  	-Dapp=enabled \
  	-Daudioconvert=enabled \
-@@ -208,6 +228,7 @@ $(eval $(call rules-meson,gst_base,64))
+@@ -209,6 +229,7 @@ $(eval $(call rules-meson,gst_base,64))
  ##
  
  GST_GOOD_MESON_ARGS := \
@@ -117,7 +117,7 @@ index bee51bfa..42504deb 100644
  	-Dauto_features=disabled \
  	-Dgobject-cast-checks=disabled \
  	-Dglib-asserts=disabled \
-@@ -254,6 +275,7 @@ $(eval $(call rules-meson,gst_good,64))
+@@ -255,6 +276,7 @@ $(eval $(call rules-meson,gst_good,64))
  
  FFMPEG_CONFIGURE_ARGS := \
  	--enable-shared \
@@ -125,7 +125,7 @@ index bee51bfa..42504deb 100644
  	--disable-static \
  	--disable-everything \
  	--disable-programs \
-@@ -284,6 +306,9 @@ FFMPEG_CONFIGURE_ARGS := \
+@@ -285,6 +307,9 @@ FFMPEG_CONFIGURE_ARGS := \
  	--enable-demuxer=xwma \
  	--disable-inline-asm
  
@@ -135,7 +135,7 @@ index bee51bfa..42504deb 100644
  $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
  $(eval $(call rules-configure,ffmpeg,32))
  $(eval $(call rules-configure,ffmpeg,64))
-@@ -328,6 +353,7 @@ $(OBJ)/.gst_plugins_rs-post-build32:
+@@ -329,6 +354,7 @@ $(OBJ)/.gst_plugins_rs-post-build32:
  ##
  
  GST_BAD_MESON_ARGS := \
@@ -143,7 +143,7 @@ index bee51bfa..42504deb 100644
  	-Dauto_features=disabled \
  	-Dintrospection=disabled \
  	-Dgobject-cast-checks=disabled \
-@@ -440,6 +466,7 @@ $(eval $(call rules-meson,gst_bad,64))
+@@ -441,6 +467,7 @@ $(eval $(call rules-meson,gst_bad,64))
  ##
  
  GST_UGLY_MESON_ARGS := \
@@ -151,7 +151,7 @@ index bee51bfa..42504deb 100644
  	-Dauto_features=disabled \
  	-Dgobject-cast-checks=disabled \
  	-Dglib-asserts=disabled \
-@@ -530,7 +557,7 @@ $(eval $(call rules-cmake,openxr,64))
+@@ -531,7 +558,7 @@ $(eval $(call rules-cmake,openxr,64))
  ## Note 32-bit is not supported by SteamVR, so we don't build it.
  ##
  
@@ -160,7 +160,7 @@ index bee51bfa..42504deb 100644
  WINEOPENXR_DEPENDS = wine openxr
  
  $(eval $(call rules-source,wineopenxr,$(SRCDIR)/wineopenxr))
-@@ -608,6 +635,9 @@ OPENFST_CONFIGURE_ARGS = \
+@@ -609,6 +636,9 @@ OPENFST_CONFIGURE_ARGS = \
    --with-pic \
    --disable-bin \
  
@@ -170,8 +170,8 @@ index bee51bfa..42504deb 100644
  $(eval $(call rules-source,openfst,$(SRCDIR)/openfst))
  $(eval $(call rules-autoconf,openfst,32))
  $(eval $(call rules-autoconf,openfst,64))
-@@ -670,7 +700,10 @@ WINE_SOURCE_ARGS = \
-   --exclude dlls/winevulkan/winevulkan.spec
+@@ -676,7 +706,10 @@ WINE_SOURCE_ARGS = \
+   --exclude server/trace.c \
  
  WINE_CONFIGURE_ARGS = \
 +  --with-x \
@@ -181,9 +181,9 @@ index bee51bfa..42504deb 100644
    --disable-tests
  
  WINE_CONFIGURE_ARGS32 = \
-@@ -729,10 +762,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)
+@@ -739,10 +772,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
@@ -196,7 +196,7 @@ index bee51bfa..42504deb 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -760,6 +797,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -770,6 +807,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
  
@@ -206,7 +206,7 @@ index bee51bfa..42504deb 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))
-@@ -788,6 +828,9 @@ D8VK_MESON_ARGS32 = --bindir=$(D8VK_DST32)/lib/wine/d8vk
+@@ -798,6 +838,9 @@ D8VK_MESON_ARGS32 = --bindir=$(D8VK_DST32)/lib/wine/d8vk
  D8VK_MESON_ARGS64 = --bindir=$(D8VK_DST64)/lib64/wine/d8vk
  D8VK_DEPENDS = glslang
  
@@ -216,7 +216,7 @@ index bee51bfa..42504deb 100644
  $(eval $(call rules-source,d8vk,$(SRCDIR)/d8vk))
  $(eval $(call rules-meson,d8vk,32,CROSS))
  $(eval $(call rules-meson,d8vk,64,CROSS))
-@@ -875,6 +918,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
+@@ -885,6 +928,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
  	VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
  endif
  
@@ -226,7 +226,7 @@ index bee51bfa..42504deb 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))
-@@ -1145,14 +1191,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -1155,14 +1201,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
@@ -244,7 +244,7 @@ index bee51bfa..42504deb 100644
  	mv $@.tmp $@
  
  $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -1162,12 +1208,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -1172,12 +1218,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)
@@ -260,7 +260,7 @@ index bee51bfa..42504deb 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) \
-@@ -1316,8 +1362,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1326,8 +1372,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 d8vk
@@ -271,7 +271,7 @@ index bee51bfa..42504deb 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
  
-@@ -1459,7 +1505,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1469,7 +1515,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
@@ -279,7 +279,7 @@ index bee51bfa..42504deb 100644
  	override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
  endif
  
-@@ -1474,9 +1519,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1484,9 +1529,6 @@ ifeq ($(CONTAINER_ENGINE),)
  	CONTAINER_ENGINE := docker
  endif
  
@@ -491,7 +491,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 6d417ab6..e79c5cae 100755
+index f01b52c5..74772066 100755
 --- a/proton
 +++ b/proton
 @@ -523,7 +523,6 @@ class Proton:
@@ -502,7 +502,7 @@ index 6d417ab6..e79c5cae 100755
  
      def path(self, d):
          return self.base_dir + d
-@@ -1704,8 +1703,6 @@ if __name__ == "__main__":
+@@ -1711,8 +1710,6 @@ if __name__ == "__main__":
  
      g_proton = Proton(os.path.dirname(sys.argv[0]))
  
@@ -511,7 +511,7 @@ index 6d417ab6..e79c5cae 100755
  
      g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
  
-@@ -1717,7 +1714,8 @@ if __name__ == "__main__":
+@@ -1724,7 +1721,8 @@ if __name__ == "__main__":
      os.environ["PROTON_DLL_COPY"] = "*"
  
      if g_proton.missing_default_prefix():
@@ -534,5 +534,5 @@ index beddcbbb..b6f36788 100644
 -  "compatmanager_layer_name" "proton"
  }
 -- 
-2.45.0
+2.45.2