diff options
author | Stelios Tsampas | 2024-05-04 10:32:14 +0300 |
---|---|---|
committer | Stelios Tsampas | 2024-05-04 10:32:14 +0300 |
commit | f265cca7972293357137083aeca1c45ad2a96697 (patch) | |
tree | 6bd0cd90183c2e31f2d32f794cc708311e587841 | |
parent | fee2458daf3670481a6e5c9cb24a3695401682d3 (diff) | |
download | aur-f265cca7972293357137083aeca1c45ad2a96697.tar.gz |
[proton] Version 9.0-1
-rw-r--r-- | .SRCINFO | 30 | ||||
-rw-r--r-- | 0001-AUR-Pkgbuild-changes.patch | 88 | ||||
-rw-r--r-- | 0002-AUR-Do-not-update-cargo-crates.patch | 4 | ||||
-rw-r--r-- | 0003-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch | 8 | ||||
-rw-r--r-- | 0004-AUR-Strip-binaries-early.patch | 6 | ||||
-rw-r--r-- | 0005-AUR-Fix-hwnd-redefinition.patch | 41 | ||||
-rw-r--r-- | PKGBUILD | 31 |
7 files changed, 124 insertions, 84 deletions
@@ -1,7 +1,7 @@ pkgbase = proton pkgdesc = Compatibility tool for Steam Play based on Wine and additional components - pkgver = 8.0.5.3 - pkgrel = 7 + pkgver = 9.0.1 + pkgrel = 1 epoch = 1 url = https://github.com/ValveSoftware/Proton install = proton.install @@ -121,30 +121,30 @@ pkgbase = proton optdepends = vulkan-icd-loader optdepends = lib32-vulkan-icd-loader optdepends = libgphoto2 - noextract = wine-gecko-2.47.3-x86.tar.xz - noextract = wine-gecko-2.47.3-x86_64.tar.xz + 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 options = !staticlibs options = !lto options = !debug options = emptydirs - source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=proton-8.0-5c - source = https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86.tar.xz - source = https://dl.winehq.org/wine/wine-gecko/2.47.3/wine-gecko-2.47.3-x86_64.tar.xz + source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=proton-9.0-1 + 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 = 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 = SKIP - sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3 - sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75 + sha256sums = ced1b467da5f7b4ff0cbc2082d4591346163c9f15a396d879447e5782b4a0e59 + sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6 + sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814 sha256sums = 4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4 - sha256sums = a5e8405ba1493904218165ee93cb9a05fa38132406b4cb8210a435829a3e3a90 - sha256sums = 8ff5a6adf7c048b30477e3b63a42fb65248936ab806dd35c5b95fe5f163ad6f8 - sha256sums = 01ce9791c768ca861c0ea5ae34c95b92647886e9ebebd46b89dd459961646d18 - sha256sums = 7b054514740f4f042cc68a97b10d32fead2123c2b9756887e59f66d6f703069f - sha256sums = 5ec6cd2229a4a6ca66af1e669fa581667d459da3cc1c826828e4d9d91b2a9fc8 + sha256sums = f0c3b2490a6d037b72e49f88369aea78ffa6959d3607cbbc77167545c530a1fd + sha256sums = df84850beefb14e161e5f3c5b6c3ac0557c9b942d56c742c03f25a8ed7efaf0f + sha256sums = faebb4a50d6a135843b3737b7edfc3eb0d996c61066a146269f5019c5080bbed + sha256sums = 3b3d593083e03d2aa01b71418a0a14301401a3d4847713982a882cb0905f6e7b + sha256sums = acf16bd37b7004a31e3c1c640cf314c4e0e861d9512413d5b095a935540b412d pkgname = proton diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch index f338873b7dce..d92d32b2352d 100644 --- a/0001-AUR-Pkgbuild-changes.patch +++ b/0001-AUR-Pkgbuild-changes.patch @@ -1,10 +1,10 @@ -From 7e41c75f65b363a6fda582d21ce7629a0250bc9b Mon Sep 17 00:00:00 2001 +From ace470d41aa4d996a3e596596656df520896f155 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas <loathingkernel@gmail.com> -Date: Tue, 7 Feb 2023 21:58:22 +0200 +Date: Wed, 26 Apr 2023 14:22:23 +0300 Subject: [PATCH 1/5] AUR Pkgbuild changes --- - Makefile.in | 69 ++++++++++++++++++++++++++-------- + Makefile.in | 73 ++++++++++++++++++++++++++-------- compatibilitytool.vdf.template | 2 +- configure.sh | 2 + make/rules-autoconf.mk | 4 +- @@ -12,14 +12,15 @@ Subject: [PATCH 1/5] AUR Pkgbuild changes make/rules-cmake.mk | 4 +- 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 -- - 12 files changed, 82 insertions(+), 39 deletions(-) + 13 files changed, 86 insertions(+), 43 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 07b69afc..e5350bf8 100644 +index ed307e8e..64058e51 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,11 +50,12 @@ else @@ -61,7 +62,7 @@ index 07b69afc..e5350bf8 100644 include $(SRC)/make/utility.mk include $(SRC)/make/rules-source.mk -@@ -109,6 +118,7 @@ $(eval $(call rules-meson,dav1d,64)) +@@ -110,6 +119,7 @@ $(eval $(call rules-meson,dav1d,64)) ## GST_ORC_MESON_ARGS := \ @@ -69,7 +70,7 @@ index 07b69afc..e5350bf8 100644 -Dorc-test=disabled $(eval $(call rules-source,gst_orc,$(SRCDIR)/gst-orc)) -@@ -121,7 +131,12 @@ $(eval $(call rules-meson,gst_orc,64)) +@@ -122,7 +132,12 @@ $(eval $(call rules-meson,gst_orc,64)) ## GSTREAMER_MESON_ARGS := \ @@ -82,7 +83,7 @@ index 07b69afc..e5350bf8 100644 -Dbenchmarks=disabled \ -Dtools=disabled \ -Dbash-completion=disabled -@@ -137,6 +152,11 @@ $(eval $(call rules-meson,gstreamer,64)) +@@ -138,6 +153,11 @@ $(eval $(call rules-meson,gstreamer,64)) ## graphene ## @@ -94,7 +95,7 @@ index 07b69afc..e5350bf8 100644 $(eval $(call rules-source,graphene,$(SRCDIR)/graphene)) $(eval $(call rules-meson,graphene,32)) $(eval $(call rules-meson,graphene,64)) -@@ -147,7 +167,10 @@ $(eval $(call rules-meson,graphene,64)) +@@ -148,7 +168,10 @@ $(eval $(call rules-meson,graphene,64)) ## GST_BASE_MESON_ARGS := \ @@ -105,7 +106,7 @@ index 07b69afc..e5350bf8 100644 -Dadder=enabled \ -Dapp=enabled \ -Daudioconvert=enabled \ -@@ -179,7 +202,9 @@ $(eval $(call rules-meson,gst_base,64)) +@@ -180,7 +203,9 @@ $(eval $(call rules-meson,gst_base,64)) ## GST_GOOD_MESON_ARGS := \ @@ -115,7 +116,7 @@ index 07b69afc..e5350bf8 100644 -Daudioparsers=enabled \ -Dautodetect=enabled \ -Davi=enabled \ -@@ -209,11 +234,17 @@ $(eval $(call rules-meson,gst_good,64)) +@@ -210,11 +235,17 @@ $(eval $(call rules-meson,gst_good,64)) FFMPEG_CONFIGURE_ARGS := \ --enable-shared \ @@ -133,10 +134,20 @@ index 07b69afc..e5350bf8 100644 $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg)) $(eval $(call rules-configure,ffmpeg,32)) $(eval $(call rules-configure,ffmpeg,64)) -@@ -405,7 +436,10 @@ WINE_SOURCE_ARGS = \ +@@ -331,7 +362,7 @@ $(eval $(call rules-cmake,openxr,64)) + ## Note 32-bit is not supported by SteamVR, so we don't build it. + ## + +-WINEOPENXR_LDFLAGS = -lopenxr_loader ++WINEOPENXR_LDFLAGS = -lopenxr_loader -lvulkan + WINEOPENXR_DEPENDS = wine openxr + + $(eval $(call rules-source,wineopenxr,$(SRCDIR)/wineopenxr)) +@@ -394,8 +425,10 @@ WINE_SOURCE_ARGS = \ --exclude dlls/winevulkan/winevulkan.spec WINE_CONFIGURE_ARGS = \ +- --enable-werror \ + --with-x \ + --with-gstreamer \ --with-mingw \ @@ -144,7 +155,12 @@ index 07b69afc..e5350bf8 100644 --disable-tests WINE_CONFIGURE_ARGS32 = \ -@@ -475,6 +509,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk +@@ -450,10 +483,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 @@ -154,7 +170,7 @@ index 07b69afc..e5350bf8 100644 $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk)) $(eval $(call rules-meson,dxvk,32,CROSS)) $(eval $(call rules-meson,dxvk,64,CROSS)) -@@ -502,6 +539,9 @@ $(OBJ)/.dxvk-post-build32: +@@ -481,6 +518,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 @@ -164,7 +180,7 @@ index 07b69afc..e5350bf8 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)) -@@ -576,6 +616,9 @@ ifneq ($(UNSTRIPPED_BUILD),) +@@ -555,6 +595,9 @@ ifneq ($(UNSTRIPPED_BUILD),) VKD3D_PROTON_MESON_ARGS = -Denable_trace=true endif @@ -174,7 +190,7 @@ index 07b69afc..e5350bf8 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)) -@@ -872,14 +915,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ +@@ -851,14 +894,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 @@ -192,7 +208,7 @@ index 07b69afc..e5350bf8 100644 mv $@.tmp $@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) -@@ -889,12 +932,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) +@@ -868,12 +911,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) @@ -208,7 +224,7 @@ index 07b69afc..e5350bf8 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) \ -@@ -1020,8 +1063,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64) +@@ -999,8 +1042,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 @@ -219,7 +235,7 @@ index 07b69afc..e5350bf8 100644 rm -rf $(abspath $(DIST_PREFIX)) python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR)) -@@ -1153,7 +1196,6 @@ ifeq ($(ENABLE_CCACHE),1) +@@ -1132,7 +1175,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 @@ -227,7 +243,7 @@ index 07b69afc..e5350bf8 100644 override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS) endif -@@ -1168,9 +1210,6 @@ ifeq ($(CONTAINER_ENGINE),) +@@ -1147,9 +1189,6 @@ ifeq ($(CONTAINER_ENGINE),) CONTAINER_ENGINE := docker endif @@ -271,10 +287,10 @@ index 3b5f7a4a..d9297162 100755 stat "Using $arg_container_engine." diff --git a/make/rules-autoconf.mk b/make/rules-autoconf.mk -index 1f5fb9e9..8e34858a 100644 +index 878640d2..e7baa574 100644 --- a/make/rules-autoconf.mk +++ b/make/rules-autoconf.mk -@@ -32,9 +32,9 @@ $$(OBJ)/.$(1)-configure$(3): $$(OBJ)/.$(1)-pre-configure +@@ -29,9 +29,9 @@ $$(OBJ)/.$(1)-configure$(3): $$($(2)_SRC)/configure $$(OBJ)/.$(1)-build$(3): @echo ":: building $(3)bit $(1)..." >&2 +cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \ @@ -388,6 +404,22 @@ index a2205c1c..be2abd1a 100644 touch $$@ endef +diff --git a/make/rules-makedep.mk b/make/rules-makedep.mk +index 140cb8ea..686c8c1c 100644 +--- a/make/rules-makedep.mk ++++ b/make/rules-makedep.mk +@@ -45,9 +45,9 @@ $$(OBJ)/.$(1)-configure$(3): + $$(OBJ)/.$(1)-build$(3): + @echo ":: building $(3)bit $(1)..." >&2 + +cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \ +- $$(BEAR) $$(MAKE) ++ $$(BEAR) $$(MAKE) -j$$(SUBJOBS) + cd "$$($(2)_OBJ$(3))" && env $$($(2)_ENV$(3)) \ +- $$(MAKE) install ++ $$(MAKE) -j$$(SUBJOBS) install + touch $$@ + endef + diff --git a/make/rules-meson.mk b/make/rules-meson.mk index 985f2085..93860875 100644 --- a/make/rules-meson.mk @@ -423,7 +455,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 5e18f96b..a7f35dd2 100755 +index f3e24c94..ed1664e1 100755 --- a/proton +++ b/proton @@ -423,7 +423,6 @@ class Proton: @@ -434,16 +466,16 @@ index 5e18f96b..a7f35dd2 100755 def path(self, d): return self.base_dir + d -@@ -1718,8 +1717,6 @@ if __name__ == "__main__": +@@ -1530,8 +1529,6 @@ if __name__ == "__main__": g_proton = Proton(os.path.dirname(sys.argv[0])) -- if g_proton.need_tarball_extraction(): -- g_proton.extract_tarball() +- g_proton.cleanup_legacy_dist() +- g_proton.do_steampipe_fixups() g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"]) -@@ -1728,7 +1725,8 @@ if __name__ == "__main__": +@@ -1540,7 +1537,8 @@ if __name__ == "__main__": g_session.init_wine() if g_proton.missing_default_prefix(): @@ -466,5 +498,5 @@ index beddcbbb..b6f36788 100644 - "compatmanager_layer_name" "proton" } -- -2.43.0 +2.45.0 diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch index ed8fb6f89169..7a2cf2c8aad9 100644 --- a/0002-AUR-Do-not-update-cargo-crates.patch +++ b/0002-AUR-Do-not-update-cargo-crates.patch @@ -1,4 +1,4 @@ -From 70710edfb3600abdee06f08b786a0f4cf0f6c981 Mon Sep 17 00:00:00 2001 +From 4ff553875d58143f54afae39353a6d3a2793a779 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.43.0 +2.45.0 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 22da864d1e85..4d02c966ba8b 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 67884593ef2d1548f3d71b32635df175d3954d77 Mon Sep 17 00:00:00 2001 +From 4fee0f8392048eff659e19551d869e2f02fe9a1d 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 a7f35dd2..068fa622 100755 +index ed1664e1..1f98cb68 100755 --- a/proton +++ b/proton -@@ -912,6 +912,15 @@ class CompatData: +@@ -922,6 +922,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 a7f35dd2..068fa622 100755 if use_wined3d: dxvkfiles = [] -- -2.43.0 +2.45.0 diff --git a/0004-AUR-Strip-binaries-early.patch b/0004-AUR-Strip-binaries-early.patch index 542f337db25a..33998a8615e7 100644 --- a/0004-AUR-Strip-binaries-early.patch +++ b/0004-AUR-Strip-binaries-early.patch @@ -1,4 +1,4 @@ -From 8539186688563def900937a0ae49965bd10736c0 Mon Sep 17 00:00:00 2001 +From 5ac2b163ecd5068acf0973939eb21638ac6f2c24 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,7 +8,7 @@ Subject: [PATCH 4/5] AUR Strip binaries early 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index e5350bf8..dbf19ca8 100644 +index 64058e51..89fe3fe6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,7 +54,7 @@ CFLAGS ?= -O2 -march=nocona -mtune=core-avx2 @@ -21,5 +21,5 @@ index e5350bf8..dbf19ca8 100644 COMMON_FLAGS64 := -mcmodel=small CARGO_BUILD_ARGS += --release -- -2.43.0 +2.45.0 diff --git a/0005-AUR-Fix-hwnd-redefinition.patch b/0005-AUR-Fix-hwnd-redefinition.patch index 164be9fff583..70599e833959 100644 --- a/0005-AUR-Fix-hwnd-redefinition.patch +++ b/0005-AUR-Fix-hwnd-redefinition.patch @@ -1,18 +1,18 @@ -From dd4c76d021daaf8852095d144f83c2a39b5f3f7f Mon Sep 17 00:00:00 2001 +From 35b789879967ee77f5b044978f063a27800628d8 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 --- - steam_helper/steam.cpp | 2 ++ - vrclient_x64/vrclient_x64/json_converter.cpp | 2 ++ - 2 files changed, 4 insertions(+) + steam_helper/steam.cpp | 4 ++++ + vrclient_x64/json_converter.cpp | 2 ++ + 2 files changed, 6 insertions(+) diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp -index 6a23b9ac..5437560c 100644 +index 38712c62..46f6e187 100644 --- a/steam_helper/steam.cpp +++ b/steam_helper/steam.cpp -@@ -34,7 +34,9 @@ +@@ -34,10 +34,14 @@ #include "ntstatus.h" #define WIN32_NO_STATUS @@ -20,19 +20,28 @@ index 6a23b9ac..5437560c 100644 #include <windows.h> +} #include <winternl.h> + #include <shellapi.h> ++extern "C" { #include <shlwapi.h> - #include <shlobj.h> -diff --git a/vrclient_x64/vrclient_x64/json_converter.cpp b/vrclient_x64/vrclient_x64/json_converter.cpp -index 83fd2ec0..64d209a2 100644 ---- a/vrclient_x64/vrclient_x64/json_converter.cpp -+++ b/vrclient_x64/vrclient_x64/json_converter.cpp -@@ -1,4 +1,6 @@ ++} + #include <string.h> + #include <stdio.h> + #include <limits.h> +diff --git a/vrclient_x64/json_converter.cpp b/vrclient_x64/json_converter.cpp +index 7d6b4f66..c5533d79 100644 +--- a/vrclient_x64/json_converter.cpp ++++ b/vrclient_x64/json_converter.cpp +@@ -3,8 +3,10 @@ + + #include "ntstatus.h" + #define WIN32_NO_STATUS +extern "C" { - #include <windows.h> + #include "windef.h" + #include "winbase.h" +} - #include <wine/debug.h> - WINE_DEFAULT_DEBUG_CHANNEL(vrclient); + #undef min + #undef max -- -2.43.0 +2.45.0 @@ -1,12 +1,12 @@ # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com> pkgname=proton -_srctag=8.0-5c +_srctag=9.0-1 _commit= -pkgver=8.0.5.3 # pkgver=${_srctag//-/.} -_geckover=2.47.3 +pkgver=${_srctag//-/.} +_geckover=2.47.4 _monover=8.1.0 -pkgrel=7 +pkgrel=1 epoch=1 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components" url="https://github.com/ValveSoftware/Proton" @@ -207,7 +207,6 @@ package() { local _compatdir="$pkgdir/usr/share/steam/compatibilitytools.d" mkdir -p "$_compatdir/${pkgname}" rsync --delete -arx dist/* "$_compatdir/${pkgname}" - cp -f dist/version "$_compatdir/${pkgname}/dist" # 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. @@ -215,15 +214,15 @@ package() { # by the patched proton script. Bundling the helps to avoid making mingw-w64-gcc package # a runtime dependency. cp /usr/i686-w64-mingw32/bin/{libgcc_s_dw2-1.dll,libwinpthread-1.dll} \ - "$_compatdir/${pkgname}"/dist/lib/vkd3d/ + "$_compatdir/${pkgname}"/files/lib/vkd3d/ cp /usr/x86_64-w64-mingw32/bin/{libgcc_s_seh-1.dll,libwinpthread-1.dll} \ - "$_compatdir/${pkgname}"/dist/lib64/vkd3d/ + "$_compatdir/${pkgname}"/files/lib64/vkd3d/ mkdir -p "$pkgdir/usr/share/licenses/${pkgname}" mv "$_compatdir/${pkgname}"/LICENSE{,.OFL} \ "$pkgdir/usr/share/licenses/${pkgname}" - cd "$_compatdir/${pkgname}/dist" + cd "$_compatdir/${pkgname}/files" i686-w64-mingw32-strip --strip-unneeded \ $(find lib/wine \( -iname fakedlls -or -iname i386-windows \) -prune -false -or -iname "*.dll" -or -iname "*.exe") x86_64-w64-mingw32-strip --strip-unneeded \ @@ -246,13 +245,13 @@ package() { $(find "$_monodir" -iname "*x86_64.dll" -or -iname "*x86_64.exe") } -sha256sums=('SKIP' - '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3' - '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75' +sha256sums=('ced1b467da5f7b4ff0cbc2082d4591346163c9f15a396d879447e5782b4a0e59' + '2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6' + 'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814' '4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4' - 'a5e8405ba1493904218165ee93cb9a05fa38132406b4cb8210a435829a3e3a90' - '8ff5a6adf7c048b30477e3b63a42fb65248936ab806dd35c5b95fe5f163ad6f8' - '01ce9791c768ca861c0ea5ae34c95b92647886e9ebebd46b89dd459961646d18' - '7b054514740f4f042cc68a97b10d32fead2123c2b9756887e59f66d6f703069f' - '5ec6cd2229a4a6ca66af1e669fa581667d459da3cc1c826828e4d9d91b2a9fc8') + 'f0c3b2490a6d037b72e49f88369aea78ffa6959d3607cbbc77167545c530a1fd' + 'df84850beefb14e161e5f3c5b6c3ac0557c9b942d56c742c03f25a8ed7efaf0f' + 'faebb4a50d6a135843b3737b7edfc3eb0d996c61066a146269f5019c5080bbed' + '3b3d593083e03d2aa01b71418a0a14301401a3d4847713982a882cb0905f6e7b' + 'acf16bd37b7004a31e3c1c640cf314c4e0e861d9512413d5b095a935540b412d') |