[proton] Update patches

6 files changed, 44 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ec070a674203..56d82b2d89c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = proton
 	pkgdesc = Compatibility tool for Steam Play based on Wine and additional components
 	pkgver = 8.0.2.3
-	pkgrel = 8
+	pkgrel = 9
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
 	install = proton.install
@@ -219,9 +219,9 @@ pkgbase = proton
 	sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3
 	sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75
 	sha256sums = 1286afc67b0a329f5e2d98d9e803ca5906a841ad5486e9b3b1fefa1124b15622
-	sha256sums = edbbcc93ef53a81150baa409b9c55e756edef6dcda4dd0b79f8fdcaae743aac9
-	sha256sums = 9c107461440cb8cd7d54f994b235dc0be6a11370e0a60578523633c07024c976
-	sha256sums = 71a8337c43da04f50246d779c1cfdcbe88d2a74a7c02fd8953671932b234850c
+	sha256sums = 353dc247853634613803706729e060bed6e7af7eb33e1dc0dfb1bc44b71518c1
+	sha256sums = 83f66f5eb2bc9d2c29febdc4ad4e34ea971a24a754f3fb5e28426eb6a038f80f
+	sha256sums = c1655a32751a266247dcce7214b9176763b22ab6fa3ec0622675562ef79ec4a7
 	sha256sums = 20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f
 
 pkgname = proton
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 2f3105118d34..c924f2810fd4 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,10 +1,10 @@
-From 7009f8d1a4674b7ff7fc1c545aa4506e7d743e87 Mon Sep 17 00:00:00 2001
+From 76edbeb0192b761d6c299073b4826e8a7ccf2147 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Tue, 7 Feb 2023 21:58:22 +0200
-Subject: [PATCH] AUR Pkgbuild changes
+Subject: [PATCH 1/3] AUR Pkgbuild changes
 
 ---
- Makefile.in                    | 71 ++++++++++++++++++++++++++--------
+ Makefile.in                    | 70 ++++++++++++++++++++++++++--------
  compatibilitytool.vdf.template |  2 +-
  configure.sh                   |  2 +
  make/rules-autoconf.mk         |  4 +-
@@ -16,21 +16,13 @@ Subject: [PATCH] AUR Pkgbuild changes
  make/rules-winemaker.mk        |  2 +-
  proton                         |  6 +--
  toolmanifest_runtime.vdf       |  3 --
- 12 files changed, 83 insertions(+), 40 deletions(-)
+ 12 files changed, 83 insertions(+), 39 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index fc46bafc..55e0d465 100644
+index fc46bafc..3f015828 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -24,7 +24,6 @@ SHELL := /bin/bash
- #   BUILD_NAME      - Name of the build for manifests etc.
- #   STEAMRT_IMAGE   - Name of the docker image to use for building
- 
--STEAMRT_IMAGE ?= registry.gitlab.steamos.cloud/proton/sniper/sdk:0.20221017.1-0
- 
- ifeq ($(SRCDIR),)
- 	foo := $(error SRCDIR not set, do not include Makefile.in directly, run ./configure.sh to generate Makefile)
-@@ -50,14 +49,23 @@ else
+@@ -50,14 +50,23 @@ else
  endif
  
  CROSSLDFLAGS   += -Wl,--file-alignment,4096
@@ -56,7 +48,7 @@ index fc46bafc..55e0d465 100644
  $(DST_DIR):
  	mkdir -p $@
  
-@@ -68,7 +76,7 @@ all: all-dist | $(DST_DIR)
+@@ -68,7 +77,7 @@ all: all-dist | $(DST_DIR)
  all-dist: | $(DST_DIR)
  dist: all
  
@@ -65,7 +57,7 @@ index fc46bafc..55e0d465 100644
  
  include $(SRC)/make/utility.mk
  include $(SRC)/make/rules-source.mk
-@@ -99,6 +107,7 @@ $(eval $(call rules-meson,dav1d,64))
+@@ -99,6 +108,7 @@ $(eval $(call rules-meson,dav1d,64))
  ##
  
  GST_ORC_MESON_ARGS := \
@@ -73,7 +65,7 @@ index fc46bafc..55e0d465 100644
  	-Dorc-test=disabled
  
  $(eval $(call rules-source,gst_orc,$(SRCDIR)/gst-orc))
-@@ -111,9 +120,14 @@ $(eval $(call rules-meson,gst_orc,64))
+@@ -111,9 +121,14 @@ $(eval $(call rules-meson,gst_orc,64))
  ##
  
  GSTREAMER_MESON_ARGS := \
@@ -88,7 +80,7 @@ index fc46bafc..55e0d465 100644
  	-Dbash-completion=disabled
  
  GSTREAMER_DEPENDS = gst_orc
-@@ -127,6 +141,11 @@ $(eval $(call rules-meson,gstreamer,64))
+@@ -127,6 +142,11 @@ $(eval $(call rules-meson,gstreamer,64))
  ## graphene
  ##
  
@@ -100,7 +92,7 @@ index fc46bafc..55e0d465 100644
  $(eval $(call rules-source,graphene,$(SRCDIR)/graphene))
  $(eval $(call rules-meson,graphene,32))
  $(eval $(call rules-meson,graphene,64))
-@@ -137,6 +156,9 @@ $(eval $(call rules-meson,graphene,64))
+@@ -137,6 +157,9 @@ $(eval $(call rules-meson,graphene,64))
  ##
  
  GST_BASE_MESON_ARGS := \
@@ -110,7 +102,7 @@ index fc46bafc..55e0d465 100644
  	-Dauto_features=disabled \
  	-Dadder=enabled \
  	-Dapp=enabled \
-@@ -170,6 +192,8 @@ $(eval $(call rules-meson,gst_base,64))
+@@ -170,6 +193,8 @@ $(eval $(call rules-meson,gst_base,64))
  ##
  
  GST_GOOD_MESON_ARGS := \
@@ -119,7 +111,7 @@ index fc46bafc..55e0d465 100644
  	-Dauto_features=disabled \
  	-Daudioparsers=enabled \
  	-Dautodetect=enabled \
-@@ -200,11 +224,17 @@ $(eval $(call rules-meson,gst_good,64))
+@@ -200,11 +225,17 @@ $(eval $(call rules-meson,gst_good,64))
  
  FFMPEG_CONFIGURE_ARGS := \
  	--enable-shared \
@@ -137,7 +129,7 @@ index fc46bafc..55e0d465 100644
  $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
  $(eval $(call rules-configure,ffmpeg,32))
  $(eval $(call rules-configure,ffmpeg,64))
-@@ -396,7 +426,11 @@ WINE_SOURCE_ARGS = \
+@@ -396,7 +427,11 @@ WINE_SOURCE_ARGS = \
    --exclude dlls/winevulkan/winevulkan.spec
  
  WINE_CONFIGURE_ARGS = \
@@ -149,7 +141,7 @@ index fc46bafc..55e0d465 100644
    --disable-tests
  
  WINE_CONFIGURE_ARGS32 = \
-@@ -466,6 +500,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
+@@ -466,6 +501,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
  DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
  DXVK_DEPENDS = glslang
  
@@ -159,7 +151,7 @@ index fc46bafc..55e0d465 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -488,6 +525,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -488,6 +526,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
  
@@ -169,7 +161,7 @@ index fc46bafc..55e0d465 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))
-@@ -558,6 +598,9 @@ VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton
+@@ -558,6 +599,9 @@ VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton
  VKD3D_PROTON_MESON_ARGS64 = --bindir=$(VKD3D_PROTON_DST64)/lib64/wine/vkd3d-proton
  VKD3D_PROTON_DEPENDS = glslang
  
@@ -179,7 +171,7 @@ index fc46bafc..55e0d465 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))
-@@ -813,14 +856,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -813,14 +857,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
@@ -197,7 +189,7 @@ index fc46bafc..55e0d465 100644
  	mv $@.tmp $@
  
  $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -830,12 +873,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -830,12 +874,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)
@@ -213,7 +205,7 @@ index fc46bafc..55e0d465 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) \
-@@ -961,8 +1004,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -961,8 +1005,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
@@ -224,7 +216,7 @@ index fc46bafc..55e0d465 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
  
-@@ -1103,7 +1146,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1103,7 +1147,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
@@ -232,7 +224,7 @@ index fc46bafc..55e0d465 100644
  	override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
  endif
  
-@@ -1118,9 +1160,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1118,9 +1161,6 @@ ifeq ($(CONTAINER_ENGINE),)
  	CONTAINER_ENGINE := docker
  endif
  
@@ -428,7 +420,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 3a7c9073..bbd7bfc0 100755
+index 7b8fed6c..f337e57c 100755
 --- a/proton
 +++ b/proton
 @@ -423,7 +423,6 @@ class Proton:
@@ -439,7 +431,7 @@ index 3a7c9073..bbd7bfc0 100755
  
      def path(self, d):
          return self.base_dir + d
-@@ -1610,8 +1609,6 @@ if __name__ == "__main__":
+@@ -1621,8 +1620,6 @@ if __name__ == "__main__":
  
      g_proton = Proton(os.path.dirname(sys.argv[0]))
  
@@ -448,7 +440,7 @@ index 3a7c9073..bbd7bfc0 100755
  
      g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
  
-@@ -1620,7 +1617,8 @@ if __name__ == "__main__":
+@@ -1631,7 +1628,8 @@ if __name__ == "__main__":
      g_session.init_wine()
  
      if g_proton.missing_default_prefix():
@@ -471,5 +463,5 @@ index beddcbbb..b6f36788 100644
 -  "compatmanager_layer_name" "proton"
  }
 -- 
-2.40.0
+2.41.0
 
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index 207392221659..743ad2dd254d 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,17 +1,17 @@
-From 6ec4db701be89b95218be1f64a04892ed6b906bd Mon Sep 17 00:00:00 2001
+From e803f1659dc3f2c42cb30b1389c66d427725d678 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/2] AUR Do not update cargo crates
+Subject: [PATCH 2/3] AUR Do not update cargo crates
 
 ---
  make/rules-cargo.mk | 2 --
  1 file changed, 2 deletions(-)
 
 diff --git a/make/rules-cargo.mk b/make/rules-cargo.mk
-index 5ebcf009..4f5c3162 100644
+index 45bd7381..11e36c1d 100644
 --- a/make/rules-cargo.mk
 +++ b/make/rules-cargo.mk
-@@ -14,8 +14,6 @@ $$(OBJ)/.$(1)-configure$(3):
+@@ -13,8 +13,6 @@ $$(OBJ)/.$(1)-configure$(3):
  $$(OBJ)/.$(1)-build$(3):
  	@echo ":: building $(3)bit $(1)..." >&2
  	cd $$($(2)_SRC) && env $$($(2)_ENV$(3)) \
@@ -21,5 +21,5 @@ index 5ebcf009..4f5c3162 100644
  	      -j$$(SUBJOBS) --locked --offline --verbose \
  	      --target "$$(CARGO_TARGET_$(3))" \
 -- 
-2.40.0
+2.41.0
 
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 eeb65106957b..1370897d753e 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,7 +1,7 @@
-From 8c9dd5d0c85c862301fa3c3b69cab100cbcd8d95 Mon Sep 17 00:00:00 2001
+From 368a49743bcd9ed7b9a4f2dc2b49a117bbe1654a 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/4] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
+Subject: [PATCH 3/3] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
  correct location in the prefix
 
 For some unknown to me reason, 32bit vkd3d (not vkd3d-proton) always links
@@ -20,10 +20,10 @@ a runtime dependency.
  1 file changed, 9 insertions(+)
 
 diff --git a/proton b/proton
-index c581144f..9b6047c9 100755
+index f337e57c..72274575 100755
 --- a/proton
 +++ b/proton
-@@ -1083,6 +1083,15 @@ class CompatData:
+@@ -911,6 +911,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/PKGBUILD b/PKGBUILD
index b24937b74ddd..6b1c96830c3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=
 pkgver=8.0.2.3  # pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=7.4.1
-pkgrel=8
+pkgrel=9
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components"
 url="https://github.com/ValveSoftware/Proton"
@@ -366,9 +366,9 @@ sha256sums=('SKIP'
             '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
             '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
             '1286afc67b0a329f5e2d98d9e803ca5906a841ad5486e9b3b1fefa1124b15622'
-            'edbbcc93ef53a81150baa409b9c55e756edef6dcda4dd0b79f8fdcaae743aac9'
-            '9c107461440cb8cd7d54f994b235dc0be6a11370e0a60578523633c07024c976'
-            '71a8337c43da04f50246d779c1cfdcbe88d2a74a7c02fd8953671932b234850c'
+            '353dc247853634613803706729e060bed6e7af7eb33e1dc0dfb1bc44b71518c1'
+            '83f66f5eb2bc9d2c29febdc4ad4e34ea971a24a754f3fb5e28426eb6a038f80f'
+            'c1655a32751a266247dcce7214b9176763b22ab6fa3ec0622675562ef79ec4a7'
             '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f')
 # Optional patches
 sha256sums+=(
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index be3bbfc1001b..dd2d984cb5ca 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -6,7 +6,7 @@ _commit=
 pkgver=8.0.2.3  # pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=7.4.1
-pkgrel=8
+pkgrel=9
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components"
 url="https://github.com/ValveSoftware/Proton"