proton: version 9.0-2

author: Stelios Tsampas 2024-06-12 23:14:33 +0300
committer: Stelios Tsampas 2024-06-12 23:14:52 +0300
commit: 15c4539316cca4f6851cfceeab098d498272a89a (patch)
tree: c9b80a10904c7dca27b55064da1d9c6045ed008b
parent: f265cca7972293357137083aeca1c45ad2a96697 (diff)
download: aur-15c4539316cca4f6851cfceeab098d498272a89a.tar.gz
7 files changed, 92 insertions, 80 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 36710bb449aa..a1307c6b97e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = proton
 	pkgdesc = Compatibility tool for Steam Play based on Wine and additional components
-	pkgver = 9.0.1
+	pkgver = 9.0.2
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/ValveSoftware/Proton
@@ -16,6 +16,7 @@ pkgbase = proton
 	makedepends = git
 	makedepends = wget
 	makedepends = rsync
+	makedepends = unzip
 	makedepends = mingw-w64-tools
 	makedepends = lld
 	makedepends = nasm
@@ -96,6 +97,8 @@ pkgbase = proton
 	depends = desktop-file-utils
 	depends = python
 	depends = steam-native-runtime
+	depends = wayland
+	depends = lib32-wayland
 	optdepends = giflib
 	optdepends = lib32-giflib
 	optdepends = gnutls
@@ -123,28 +126,31 @@ pkgbase = proton
 	optdepends = libgphoto2
 	noextract = wine-gecko-2.47.4-x86.tar.xz
 	noextract = wine-gecko-2.47.4-x86_64.tar.xz
-	noextract = wine-mono-8.1.0-x86.tar.xz
+	noextract = wine-mono-9.1.0-x86.tar.xz
+	noextract = xalia-0.4.2-net48-mono.zip
 	options = !staticlibs
 	options = !lto
 	options = !debug
 	options = emptydirs
-	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=proton-9.0-1
+	source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=proton-9.0-2
 	source = https://dl.winehq.org/wine/wine-gecko/2.47.4/wine-gecko-2.47.4-x86.tar.xz
 	source = https://dl.winehq.org/wine/wine-gecko/2.47.4/wine-gecko-2.47.4-x86_64.tar.xz
-	source = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-8.1.0/wine-mono-8.1.0-x86.tar.xz
+	source = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-9.1.0/wine-mono-9.1.0-x86.tar.xz
+	source = https://github.com/madewokherd/xalia/releases/download/xalia-0.4.2/xalia-0.4.2-net48-mono.zip
 	source = 0001-AUR-Pkgbuild-changes.patch
 	source = 0002-AUR-Do-not-update-cargo-crates.patch
 	source = 0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
 	source = 0004-AUR-Strip-binaries-early.patch
 	source = 0005-AUR-Fix-hwnd-redefinition.patch
-	sha256sums = ced1b467da5f7b4ff0cbc2082d4591346163c9f15a396d879447e5782b4a0e59
+	sha256sums = 2215370461d8beea8d8fda006d1fd206ec1407b90eeff6d3ede5990c2a403d91
 	sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6
 	sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
-	sha256sums = 4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4
-	sha256sums = f0c3b2490a6d037b72e49f88369aea78ffa6959d3607cbbc77167545c530a1fd
-	sha256sums = df84850beefb14e161e5f3c5b6c3ac0557c9b942d56c742c03f25a8ed7efaf0f
-	sha256sums = faebb4a50d6a135843b3737b7edfc3eb0d996c61066a146269f5019c5080bbed
-	sha256sums = 3b3d593083e03d2aa01b71418a0a14301401a3d4847713982a882cb0905f6e7b
-	sha256sums = acf16bd37b7004a31e3c1c640cf314c4e0e861d9512413d5b095a935540b412d
+	sha256sums = 601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767
+	sha256sums = 50ce2cc85162343e62340b0ca7994ceba94592ab395fb99711e94e108e991f0c
+	sha256sums = 70274a898d45516b90ee0a40a7bb56e84d60900be2adaa165f7a0f605c11d13f
+	sha256sums = f6a29f55aa845f95ed78e183a876d8caeffce3254e3fc61c8bf25f3c2bed483c
+	sha256sums = 47f7fec21f8f00b4af7ddd82643481232bd4fcbc5021d2f69797717d7a02a41e
+	sha256sums = 1d41b6e5140da5914a326327b17b1b34bb0d04a201da38bdbce87a04d2b75d32
+	sha256sums = 8187fea6a7daf9fed0e63292711d79166ffa2b0f110685e4b995f68469531cca
 
 pkgname = proton
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index d92d32b2352d..7e04d82bba45 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,10 +1,10 @@
-From ace470d41aa4d996a3e596596656df520896f155 Mon Sep 17 00:00:00 2001
+From e079e9c57628e1ed77d725e29311761d66828c00 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/5] AUR Pkgbuild changes
 
 ---
- Makefile.in                    | 73 ++++++++++++++++++++++++++--------
+ Makefile.in                    | 71 ++++++++++++++++++++++++++--------
  compatibilitytool.vdf.template |  2 +-
  configure.sh                   |  2 +
  make/rules-autoconf.mk         |  4 +-
@@ -17,13 +17,13 @@ Subject: [PATCH 1/5] AUR Pkgbuild changes
  make/rules-winemaker.mk        |  2 +-
  proton                         |  6 +--
  toolmanifest_runtime.vdf       |  3 --
- 13 files changed, 86 insertions(+), 43 deletions(-)
+ 13 files changed, 84 insertions(+), 43 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index ed307e8e..64058e51 100644
+index 44d0447e..3d75a148 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -50,11 +50,12 @@ else
+@@ -54,11 +54,12 @@ else
  endif
  
  CROSSLDFLAGS   += -Wl,--file-alignment,4096
@@ -38,7 +38,7 @@ index ed307e8e..64058e51 100644
  COMMON_FLAGS64 := -mcmodel=small
  CARGO_BUILD_ARGS += --release
  
-@@ -68,6 +69,14 @@ else
+@@ -72,6 +73,14 @@ else
  	BEAR :=
  endif
  
@@ -53,7 +53,7 @@ index ed307e8e..64058e51 100644
  $(DST_DIR):
  	mkdir -p $@
  
-@@ -78,7 +87,7 @@ all: all-dist | $(DST_DIR)
+@@ -85,7 +94,7 @@ all: all-dist | $(DST_DIR)
  all-dist: | $(DST_DIR)
  dist: all
  
@@ -62,7 +62,7 @@ index ed307e8e..64058e51 100644
  
  include $(SRC)/make/utility.mk
  include $(SRC)/make/rules-source.mk
-@@ -110,6 +119,7 @@ $(eval $(call rules-meson,dav1d,64))
+@@ -117,6 +126,7 @@ $(eval $(call rules-meson,dav1d,64))
  ##
  
  GST_ORC_MESON_ARGS := \
@@ -70,7 +70,7 @@ index ed307e8e..64058e51 100644
  	-Dorc-test=disabled
  
  $(eval $(call rules-source,gst_orc,$(SRCDIR)/gst-orc))
-@@ -122,7 +132,12 @@ $(eval $(call rules-meson,gst_orc,64))
+@@ -129,7 +139,12 @@ $(eval $(call rules-meson,gst_orc,64))
  ##
  
  GSTREAMER_MESON_ARGS := \
@@ -83,7 +83,7 @@ index ed307e8e..64058e51 100644
  	-Dbenchmarks=disabled \
  	-Dtools=disabled \
  	-Dbash-completion=disabled
-@@ -138,6 +153,11 @@ $(eval $(call rules-meson,gstreamer,64))
+@@ -145,6 +160,11 @@ $(eval $(call rules-meson,gstreamer,64))
  ## graphene
  ##
  
@@ -95,7 +95,7 @@ index ed307e8e..64058e51 100644
  $(eval $(call rules-source,graphene,$(SRCDIR)/graphene))
  $(eval $(call rules-meson,graphene,32))
  $(eval $(call rules-meson,graphene,64))
-@@ -148,7 +168,10 @@ $(eval $(call rules-meson,graphene,64))
+@@ -155,7 +175,10 @@ $(eval $(call rules-meson,graphene,64))
  ##
  
  GST_BASE_MESON_ARGS := \
@@ -106,7 +106,7 @@ index ed307e8e..64058e51 100644
  	-Dadder=enabled \
  	-Dapp=enabled \
  	-Daudioconvert=enabled \
-@@ -180,7 +203,9 @@ $(eval $(call rules-meson,gst_base,64))
+@@ -187,7 +210,9 @@ $(eval $(call rules-meson,gst_base,64))
  ##
  
  GST_GOOD_MESON_ARGS := \
@@ -116,7 +116,7 @@ index ed307e8e..64058e51 100644
  	-Daudioparsers=enabled \
  	-Dautodetect=enabled \
  	-Davi=enabled \
-@@ -210,11 +235,17 @@ $(eval $(call rules-meson,gst_good,64))
+@@ -217,12 +242,16 @@ $(eval $(call rules-meson,gst_good,64))
  
  FFMPEG_CONFIGURE_ARGS := \
  	--enable-shared \
@@ -125,16 +125,15 @@ index ed307e8e..64058e51 100644
  	--disable-everything \
  	--disable-programs \
  	--disable-doc \
+ 	--disable-inline-asm \
  
-+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_CONFIGURE_ARGS32 = --optflags="$(COMMON_FLAGS) $(COMMON_FLAGS32)"
 +
  $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg))
  $(eval $(call rules-configure,ffmpeg,32))
  $(eval $(call rules-configure,ffmpeg,64))
-@@ -331,7 +362,7 @@ $(eval $(call rules-cmake,openxr,64))
+@@ -339,7 +368,7 @@ $(eval $(call rules-cmake,openxr,64))
  ## Note 32-bit is not supported by SteamVR, so we don't build it.
  ##
  
@@ -143,7 +142,7 @@ index ed307e8e..64058e51 100644
  WINEOPENXR_DEPENDS = wine openxr
  
  $(eval $(call rules-source,wineopenxr,$(SRCDIR)/wineopenxr))
-@@ -394,8 +425,10 @@ WINE_SOURCE_ARGS = \
+@@ -402,8 +431,10 @@ WINE_SOURCE_ARGS = \
    --exclude dlls/winevulkan/winevulkan.spec
  
  WINE_CONFIGURE_ARGS = \
@@ -155,9 +154,9 @@ index ed307e8e..64058e51 100644
    --disable-tests
  
  WINE_CONFIGURE_ARGS32 = \
-@@ -450,10 +483,14 @@ $(eval $(call rules-makedep,vrclient,64))
- ## dxvk
- ##
+@@ -462,10 +493,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)
  
 +DXVK_MESON_ARGS = --force-fallback-for=libdisplay-info
  DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
@@ -170,7 +169,7 @@ index ed307e8e..64058e51 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -481,6 +518,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -493,6 +528,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
  
@@ -180,7 +179,7 @@ index ed307e8e..64058e51 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))
-@@ -555,6 +595,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
+@@ -572,6 +610,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
  	VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
  endif
  
@@ -190,7 +189,7 @@ index ed307e8e..64058e51 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))
-@@ -851,14 +894,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -842,14 +883,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
@@ -208,7 +207,7 @@ index ed307e8e..64058e51 100644
  	mv $@.tmp $@
  
  $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -868,12 +911,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -859,12 +900,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)
@@ -224,7 +223,7 @@ index ed307e8e..64058e51 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) \
-@@ -999,8 +1042,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1013,8 +1054,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
@@ -235,7 +234,7 @@ index ed307e8e..64058e51 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
  
-@@ -1132,7 +1175,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1146,7 +1187,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
@@ -243,7 +242,7 @@ index ed307e8e..64058e51 100644
  	override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
  endif
  
-@@ -1147,9 +1189,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1161,9 +1201,6 @@ ifeq ($(CONTAINER_ENGINE),)
  	CONTAINER_ENGINE := docker
  endif
  
@@ -335,11 +334,11 @@ index 520d88ac..ab898810 100644
  endef
  
 diff --git a/make/rules-common.mk b/make/rules-common.mk
-index 00a1b4ff..548782ce 100644
+index 778c64e5..ae8be603 100644
 --- a/make/rules-common.mk
 +++ b/make/rules-common.mk
-@@ -112,7 +112,11 @@ $(2)_LIBFLAGS$(3) = $$(foreach d,$$($(2)_DEPS$(3)),-L$$($$(d)_LIBDIR$(3))) \
- # native version doesn't exist.
+@@ -115,7 +115,11 @@ $(2)_LIBFLAGS$(3) = $$(foreach d,$$($(2)_DEPS$(3)),-L$$($$(d)_LIBDIR$(3))) \
+ 
  
  $(2)_ENV$(3) = \
 +    WINEDEBUG="-all" \
@@ -350,7 +349,7 @@ index 00a1b4ff..548782ce 100644
      CCACHE_BASEDIR="$$(CCACHE_BASEDIR)" \
      STRIP="$$(STRIP)" \
      AR="$$(TARGET_$(4)$(3))-ar" \
-@@ -126,7 +130,7 @@ $(2)_ENV$(3) = \
+@@ -129,7 +133,7 @@ $(2)_ENV$(3) = \
      PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_BINDIR$(3))),,:):$$$$PATH" \
      LD_LIBRARY_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_LIBDIR$(3))),,:)$$$$LD_LIBRARY_PATH" \
      PKG_CONFIG_PATH="$$(call list-join,:,$$(foreach d,$$($(2)_DEPS$(3)),$$($$(d)_LIBDIR$(3))/pkgconfig))" \
@@ -359,7 +358,7 @@ index 00a1b4ff..548782ce 100644
      CFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
      CPPFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
      CXXFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3)) -std=c++17" \
-@@ -150,7 +154,7 @@ $(2)_ENV$(3) += \
+@@ -154,7 +158,7 @@ $(2)_ENV$(3) += \
      CROSSCPPFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CPPFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3))" \
      CROSSCXXFLAGS="$$($(2)_INCFLAGS$(3)) $$($(2)_CXXFLAGS) $$(COMMON_FLAGS) $$(COMMON_FLAGS$(3)) -std=c++17" \
      CROSSLDFLAGS="$$($(2)_LIBFLAGS$(3)) $$($(2)_LDFLAGS$(3)) $$($(2)_LDFLAGS) $$(CROSSLDFLAGS)" \
@@ -368,8 +367,8 @@ index 00a1b4ff..548782ce 100644
  
  endif
  
-@@ -163,14 +167,14 @@ else
- install-strip = objcopy --file-alignment=4096 --strip-debug $(1) $(2)/$(notdir $(1)) && rm -f $(2)/$(notdir $(1)).debug
+@@ -167,14 +171,14 @@ else
+ install-strip = objcopy -p --file-alignment=4096 --strip-debug $(1) $(2)/$(notdir $(1)) && rm -f $(2)/$(notdir $(1)).debug
  endif
  
 -TARGET_32 := i686-linux-gnu
@@ -455,10 +454,10 @@ 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 f3e24c94..ed1664e1 100755
+index 0c8e1ca3..d641562a 100755
 --- a/proton
 +++ b/proton
-@@ -423,7 +423,6 @@ class Proton:
+@@ -424,7 +424,6 @@ class Proton:
          self.wine_bin = self.bin_dir + "wine"
          self.wine64_bin = self.bin_dir + "wine64"
          self.wineserver_bin = self.bin_dir + "wineserver"
@@ -466,7 +465,7 @@ index f3e24c94..ed1664e1 100755
  
      def path(self, d):
          return self.base_dir + d
-@@ -1530,8 +1529,6 @@ if __name__ == "__main__":
+@@ -1552,8 +1551,6 @@ if __name__ == "__main__":
  
      g_proton = Proton(os.path.dirname(sys.argv[0]))
  
@@ -475,7 +474,7 @@ index f3e24c94..ed1664e1 100755
  
      g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
  
-@@ -1540,7 +1537,8 @@ if __name__ == "__main__":
+@@ -1562,7 +1559,8 @@ if __name__ == "__main__":
      g_session.init_wine()
  
      if g_proton.missing_default_prefix():
@@ -498,5 +497,5 @@ index beddcbbb..b6f36788 100644
 -  "compatmanager_layer_name" "proton"
  }
 -- 
-2.45.0
+2.45.2
 
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index 7a2cf2c8aad9..56d5aea9934f 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From 4ff553875d58143f54afae39353a6d3a2793a779 Mon Sep 17 00:00:00 2001
+From b1785e51dfc0286134d2080a12f79ddf84592c6c 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/5] AUR Do not update cargo crates
@@ -21,5 +21,5 @@ index 00fa99fc..225ab528 100644
  	      -j$$(SUBJOBS) --locked --offline --verbose \
  	      --target "$$(CARGO_TARGET_$(3))" \
 -- 
-2.45.0
+2.45.2
 
diff --git a/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch b/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
index 4d02c966ba8b..5fa23be8c7d9 100644
--- a/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
+++ b/0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
@@ -1,4 +1,4 @@
-From 4fee0f8392048eff659e19551d869e2f02fe9a1d Mon Sep 17 00:00:00 2001
+From 3f0c81c896f1b53b37bc549775585fa9a4987124 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 12 Jul 2023 03:16:34 +0300
 Subject: [PATCH 3/5] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
@@ -20,10 +20,10 @@ a runtime dependency.
  1 file changed, 9 insertions(+)
 
 diff --git a/proton b/proton
-index ed1664e1..1f98cb68 100755
+index d641562a..0f17b2ea 100755
 --- a/proton
 +++ b/proton
-@@ -922,6 +922,15 @@ class CompatData:
+@@ -923,6 +923,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)
@@ -40,5 +40,5 @@ index ed1664e1..1f98cb68 100755
                  if use_wined3d:
                      dxvkfiles = []
 -- 
-2.45.0
+2.45.2
 
diff --git a/0004-AUR-Strip-binaries-early.patch b/0004-AUR-Strip-binaries-early.patch
index 33998a8615e7..5f76cdf86b98 100644
--- a/0004-AUR-Strip-binaries-early.patch
+++ b/0004-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From 5ac2b163ecd5068acf0973939eb21638ac6f2c24 Mon Sep 17 00:00:00 2001
+From 1c7b73b2a035c710009ab3754b2c5ab489b4e58b Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 23 Aug 2023 19:31:35 +0300
 Subject: [PATCH 4/5] AUR Strip binaries early
@@ -8,10 +8,10 @@ Subject: [PATCH 4/5] AUR Strip binaries early
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 64058e51..89fe3fe6 100644
+index 3d75a148..fbc24d2e 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -54,7 +54,7 @@ CFLAGS         ?= -O2 -march=nocona -mtune=core-avx2
+@@ -58,7 +58,7 @@ CFLAGS         ?= -O2 -march=nocona -mtune=core-avx2
  OPTIMIZE_FLAGS := $(CFLAGS) -mfpmath=sse
  SANITY_FLAGS   := -fwrapv -fno-strict-aliasing
  DEBUG_FLAGS    := -ggdb -ffunction-sections -fdata-sections -fno-omit-frame-pointer
@@ -21,5 +21,5 @@ index 64058e51..89fe3fe6 100644
  COMMON_FLAGS64 := -mcmodel=small
  CARGO_BUILD_ARGS += --release
 -- 
-2.45.0
+2.45.2
 
diff --git a/0005-AUR-Fix-hwnd-redefinition.patch b/0005-AUR-Fix-hwnd-redefinition.patch
index 70599e833959..b87b49af20aa 100644
--- a/0005-AUR-Fix-hwnd-redefinition.patch
+++ b/0005-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From 35b789879967ee77f5b044978f063a27800628d8 Mon Sep 17 00:00:00 2001
+From 9bcb5b327f9aaa1e3c3e71ee4c287b1c1229b657 Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Thu, 28 Sep 2023 14:16:04 +0300
 Subject: [PATCH 5/5] AUR: Fix hwnd redefinition
@@ -9,16 +9,17 @@ Subject: [PATCH 5/5] AUR: Fix hwnd redefinition
  2 files changed, 6 insertions(+)
 
 diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp
-index 38712c62..46f6e187 100644
+index 1eb55b87..a94cc968 100644
 --- a/steam_helper/steam.cpp
 +++ b/steam_helper/steam.cpp
-@@ -34,10 +34,14 @@
+@@ -34,11 +34,15 @@
  
  #include "ntstatus.h"
  #define WIN32_NO_STATUS
 +extern "C" {
  #include <windows.h>
 +}
+ #include <winsvc.h>
  #include <winternl.h>
  #include <shellapi.h>
 +extern "C" {
@@ -43,5 +44,5 @@ index 7d6b4f66..c5533d79 100644
  #undef min
  #undef max
 -- 
-2.45.0
+2.45.2
 
diff --git a/PKGBUILD b/PKGBUILD
index 603377a2871c..aeded3cd48cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton
-_srctag=9.0-1
+_srctag=9.0-2
 _commit=
 pkgver=${_srctag//-/.}
 _geckover=2.47.4
-_monover=8.1.0
+_monover=9.1.0
+_xaliaver=0.4.2
 pkgrel=1
 epoch=1
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components"
@@ -34,9 +35,12 @@ depends=(
   python
   steam-native-runtime
 )
+depends+=(
+  wayland          lib32-wayland
+)
 
 makedepends=(autoconf bison perl flex mingw-w64-gcc
-  git wget rsync mingw-w64-tools lld nasm
+  git wget rsync unzip mingw-w64-tools lld nasm
   meson cmake fontforge afdko python-pefile
   glslang vulkan-headers
   clang
@@ -82,6 +86,7 @@ source=(
     proton::git+https://github.com/ValveSoftware/Proton.git#tag=proton-${_srctag}
     https://dl.winehq.org/wine/wine-gecko/${_geckover}/wine-gecko-${_geckover}-x86{,_64}.tar.xz
     https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${_monover}/wine-mono-${_monover}-x86.tar.xz
+    https://github.com/madewokherd/xalia/releases/download/xalia-${_xaliaver}/xalia-${_xaliaver}-net48-mono.zip
     0001-AUR-Pkgbuild-changes.patch
     0002-AUR-Do-not-update-cargo-crates.patch
     0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch
@@ -91,6 +96,7 @@ source=(
 noextract=(
     wine-gecko-${_geckover}-{x86,x86_64}.tar.xz
     wine-mono-${_monover}-x86.tar.xz
+    xalia-${_xaliaver}-net48-mono.zip
 )
 
 _make_wrappers () {
@@ -137,12 +143,13 @@ prepare() {
     [ ! -d contrib ] && mkdir -p contrib
     mv "$srcdir"/wine-gecko-${_geckover}-x86{,_64}.tar.xz contrib/
     mv "$srcdir"/wine-mono-${_monover}-x86.tar.xz contrib/
+    mv "$srcdir"/xalia-${_xaliaver}-net48-mono.zip contrib/
 
     # Explicitly set origin URL for submodules using relative paths
     git remote set-url origin https://github.com/ValveSoftware/Proton.git
     git submodule update --init --filter=tree:0 --recursive
 
-    for rustlib in gst-plugins-rs media-converter; do
+    for rustlib in gst-plugins-rs; do
     pushd $rustlib
         export RUSTUP_TOOLCHAIN=stable
         export CARGO_HOME="${SRCDEST}"/proton-cargo
@@ -211,8 +218,7 @@ package() {
     # For some unknown to me reason, 32bit vkd3d (not vkd3d-proton) always links
     # to libgcc_s_dw2-1.dll no matter what linker options I tried.
     # Copy the required dlls into the package, they will be copied later into the prefix
-    # by the patched proton script. Bundling the helps to avoid making mingw-w64-gcc package
-    # a runtime dependency.
+    # by the patched proton script. Bundle them to not depend on mingw-w64-gcc being installed.
     cp /usr/i686-w64-mingw32/bin/{libgcc_s_dw2-1.dll,libwinpthread-1.dll} \
         "$_compatdir/${pkgname}"/files/lib/vkd3d/
     cp /usr/x86_64-w64-mingw32/bin/{libgcc_s_seh-1.dll,libwinpthread-1.dll} \
@@ -245,13 +251,13 @@ package() {
         $(find "$_monodir" -iname "*x86_64.dll" -or -iname "*x86_64.exe")
 }
 
-sha256sums=('ced1b467da5f7b4ff0cbc2082d4591346163c9f15a396d879447e5782b4a0e59'
+sha256sums=('2215370461d8beea8d8fda006d1fd206ec1407b90eeff6d3ede5990c2a403d91'
             '2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6'
             'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
-            '4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4'
-            'f0c3b2490a6d037b72e49f88369aea78ffa6959d3607cbbc77167545c530a1fd'
-            'df84850beefb14e161e5f3c5b6c3ac0557c9b942d56c742c03f25a8ed7efaf0f'
-            'faebb4a50d6a135843b3737b7edfc3eb0d996c61066a146269f5019c5080bbed'
-            '3b3d593083e03d2aa01b71418a0a14301401a3d4847713982a882cb0905f6e7b'
-            'acf16bd37b7004a31e3c1c640cf314c4e0e861d9512413d5b095a935540b412d')
-
+            '601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767'
+            '50ce2cc85162343e62340b0ca7994ceba94592ab395fb99711e94e108e991f0c'
+            '70274a898d45516b90ee0a40a7bb56e84d60900be2adaa165f7a0f605c11d13f'
+            'f6a29f55aa845f95ed78e183a876d8caeffce3254e3fc61c8bf25f3c2bed483c'
+            '47f7fec21f8f00b4af7ddd82643481232bd4fcbc5021d2f69797717d7a02a41e'
+            '1d41b6e5140da5914a326327b17b1b34bb0d04a201da38bdbce87a04d2b75d32'
+            '8187fea6a7daf9fed0e63292711d79166ffa2b0f110685e4b995f68469531cca')
author	Stelios Tsampas	2024-06-12 23:14:33 +0300
committer	Stelios Tsampas	2024-06-12 23:14:52 +0300
commit	15c4539316cca4f6851cfceeab098d498272a89a (patch)
tree	c9b80a10904c7dca27b55064da1d9c6045ed008b
parent	f265cca7972293357137083aeca1c45ad2a96697 (diff)
download	aur-15c4539316cca4f6851cfceeab098d498272a89a.tar.gz