diff options
-rw-r--r-- | .SRCINFO | 26 | ||||
-rw-r--r-- | 0001-AUR-Pkgbuild-changes.patch | 83 | ||||
-rw-r--r-- | 0002-AUR-Do-not-update-cargo-crates.patch | 4 | ||||
-rw-r--r-- | 0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch | 10 | ||||
-rw-r--r-- | 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch | 6 | ||||
-rw-r--r-- | 0005-AUR-Strip-binaries-early.patch | 8 | ||||
-rw-r--r-- | 0006-AUR-Fix-hwnd-redefinition.patch | 4 | ||||
-rw-r--r-- | PKGBUILD | 24 |
8 files changed, 82 insertions, 83 deletions
@@ -1,7 +1,7 @@ pkgbase = proton-experimental pkgdesc = Compatibility tool for Steam Play based on Wine and additional components, experimental branch - pkgver = 9.0.20240411 - pkgrel = 2 + pkgver = 9.0.20240503.2 + pkgrel = 1 epoch = 1 url = https://github.com/ValveSoftware/Proton install = proton-experimental.install @@ -127,16 +127,16 @@ pkgbase = proton-experimental provides = proton noextract = wine-gecko-2.47.4-x86.tar.xz noextract = wine-gecko-2.47.4-x86_64.tar.xz - noextract = wine-mono-9.0.0-x86.tar.xz + noextract = wine-mono-9.1.0-x86.tar.xz noextract = xalia-0.4.1-net48-mono.zip options = !staticlibs options = !lto options = !debug options = emptydirs - source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-9.0-20240411 + source = proton::git+https://github.com/ValveSoftware/Proton.git#tag=experimental-9.0-20240503b 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-9.0.0/wine-mono-9.0.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.1/xalia-0.4.1-net48-mono.zip source = 0001-AUR-Pkgbuild-changes.patch source = 0002-AUR-Do-not-update-cargo-crates.patch @@ -144,16 +144,16 @@ pkgbase = proton-experimental source = 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch source = 0005-AUR-Strip-binaries-early.patch source = 0006-AUR-Fix-hwnd-redefinition.patch - sha256sums = 15daf1f0e847ab05b6945b5c2c6104ae59d584f6d508ac36af37ca468ba5d2dd + sha256sums = 07a21f546d0ecfe28b409ea0aa402732a8d440ede2f49870059daf38989e46a8 sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6 sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814 - sha256sums = d73d440c08ebd67c93fbd6534f4f1b4e98aa07342f9c7d98c8aaeb74755eb9cf + sha256sums = 601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767 sha256sums = a652c3289fb444efb2fbd8b5757484e21ffe6a537b3a3f9a0fbb04a9a10afcba - sha256sums = 60a55b54a9e6bd6f31e9850c5d7b64596e8a11db2222fa5bdb4868c46d94e06e - sha256sums = 8b9cea08ebe45002fd3e81b17332fccf48c3eb42bcc80cafc38cd58ebae5ffe4 - sha256sums = d4aff4eaf001dc329b91d706d7ae5389528a482689b62afd03798f54365c55f1 - sha256sums = cd276b4f4014361de97afafa73e5c252de6fcde8bf5370523fd29ee30d9e0624 - sha256sums = 1aab55361a77af5fe766fb3dbf88b167d55be5fffb0b7f2633fcab1b807480a3 - sha256sums = d985a675fc137347afa4f864758efe7c5e34196367f2fa6e48df1a4e56ed0139 + sha256sums = 1c541c59b96d1b8e82fd17fa2b1d4bc929dce903e8b02abb9a45d69e415e9e43 + sha256sums = 2405158b694487c37e0ca7c4e02788c8c4fad47b6de4ea9999565ead124019c2 + sha256sums = f1c48a7d19800f9e46568c6ba2e3600a7f21885cc8251a655e83f7cd38e0b48b + sha256sums = 0fc622d47817dd0959e38e037d698fa843b515307511944b3021a9ff19e3cd3f + sha256sums = f6425db2bd252f7de452903a29f89183241bc317ee3140193b7d8343adb2f565 + sha256sums = de138e48f6a4662c4877a7f76db9eaf42241b6784ea91a2583707a9842cde78b pkgname = proton-experimental diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch index 133428c14493..2f56bcbceed0 100644 --- a/0001-AUR-Pkgbuild-changes.patch +++ b/0001-AUR-Pkgbuild-changes.patch @@ -1,29 +1,29 @@ -From 6727a5f84148c2a6f8e9fc2b901321dd32d9e3cf Mon Sep 17 00:00:00 2001 +From f263ffe75e8def27e97e11ddbb9dfe14a0d2106b 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 --- - Makefile.in | 76 ++++++++++++++++++++++++++-------- + Makefile.in | 74 ++++++++++++++++++++++++++-------- compatibilitytool.vdf.template | 2 +- configure.sh | 2 + make/rules-autoconf.mk | 4 +- make/rules-cargo.mk | 4 +- make/rules-cmake.mk | 4 +- - make/rules-common.mk | 18 ++++---- + 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 -- - 13 files changed, 89 insertions(+), 43 deletions(-) + 13 files changed, 87 insertions(+), 43 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 0f98d7cf..64f886eb 100644 +index 8c687aed..11890078 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 0f98d7cf..64f886eb 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 0f98d7cf..64f886eb 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 0f98d7cf..64f886eb 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 0f98d7cf..64f886eb 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 0f98d7cf..64f886eb 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 0f98d7cf..64f886eb 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 0f98d7cf..64f886eb 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 0f98d7cf..64f886eb 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 0f98d7cf..64f886eb 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 0f98d7cf..64f886eb 100644 WINEOPENXR_DEPENDS = wine openxr $(eval $(call rules-source,wineopenxr,$(SRCDIR)/wineopenxr)) -@@ -409,6 +440,9 @@ OPENFST_CONFIGURE_ARGS = \ +@@ -417,6 +446,9 @@ OPENFST_CONFIGURE_ARGS = \ --with-pic \ --disable-bin \ @@ -153,7 +152,7 @@ index 0f98d7cf..64f886eb 100644 $(eval $(call rules-source,openfst,$(SRCDIR)/openfst)) $(eval $(call rules-autoconf,openfst,32)) $(eval $(call rules-autoconf,openfst,64)) -@@ -471,8 +505,10 @@ WINE_SOURCE_ARGS = \ +@@ -479,8 +511,10 @@ WINE_SOURCE_ARGS = \ --exclude dlls/winevulkan/winevulkan.spec WINE_CONFIGURE_ARGS = \ @@ -165,9 +164,9 @@ index 0f98d7cf..64f886eb 100644 --disable-tests WINE_CONFIGURE_ARGS32 = \ -@@ -527,10 +563,14 @@ $(eval $(call rules-makedep,vrclient,64)) - ## dxvk - ## +@@ -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) +DXVK_MESON_ARGS = --force-fallback-for=libdisplay-info DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk @@ -180,7 +179,7 @@ index 0f98d7cf..64f886eb 100644 $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk)) $(eval $(call rules-meson,dxvk,32,CROSS)) $(eval $(call rules-meson,dxvk,64,CROSS)) -@@ -558,6 +598,9 @@ $(OBJ)/.dxvk-post-build32: +@@ -570,6 +608,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 @@ -190,7 +189,7 @@ index 0f98d7cf..64f886eb 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)) -@@ -632,6 +675,9 @@ ifneq ($(UNSTRIPPED_BUILD),) +@@ -649,6 +690,9 @@ ifneq ($(UNSTRIPPED_BUILD),) VKD3D_PROTON_MESON_ARGS = -Denable_trace=true endif @@ -200,7 +199,7 @@ index 0f98d7cf..64f886eb 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 +965,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ +@@ -919,14 +963,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 @@ -218,7 +217,7 @@ index 0f98d7cf..64f886eb 100644 mv $@.tmp $@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) -@@ -936,12 +982,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) +@@ -936,12 +980,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) @@ -234,7 +233,7 @@ index 0f98d7cf..64f886eb 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 +1136,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64) +@@ -1090,8 +1134,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 @@ -245,7 +244,7 @@ index 0f98d7cf..64f886eb 100644 rm -rf $(abspath $(DIST_PREFIX)) python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR)) -@@ -1223,7 +1269,6 @@ ifeq ($(ENABLE_CCACHE),1) +@@ -1223,7 +1267,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 @@ -253,7 +252,7 @@ index 0f98d7cf..64f886eb 100644 override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS) endif -@@ -1238,9 +1283,6 @@ ifeq ($(CONTAINER_ENGINE),) +@@ -1238,9 +1281,6 @@ ifeq ($(CONTAINER_ENGINE),) CONTAINER_ENGINE := docker endif @@ -345,11 +344,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" \ @@ -360,7 +359,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))" \ @@ -369,7 +368,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)" \ @@ -378,8 +377,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 @@ -465,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 16f82b34..8f9d03b0 100755 +index 8327b3d2..a0c1bcf8 100755 --- a/proton +++ b/proton @@ -424,7 +424,6 @@ class Proton: @@ -476,7 +475,7 @@ index 16f82b34..8f9d03b0 100755 def path(self, d): return self.base_dir + d -@@ -1537,8 +1536,6 @@ if __name__ == "__main__": +@@ -1544,8 +1543,6 @@ if __name__ == "__main__": g_proton = Proton(os.path.dirname(sys.argv[0])) @@ -485,7 +484,7 @@ index 16f82b34..8f9d03b0 100755 g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"]) -@@ -1547,7 +1544,8 @@ if __name__ == "__main__": +@@ -1554,7 +1551,8 @@ if __name__ == "__main__": g_session.init_wine() if g_proton.missing_default_prefix(): @@ -508,5 +507,5 @@ index beddcbbb..b6f36788 100644 - "compatmanager_layer_name" "proton" } -- -2.44.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 e5d10e6c2114..8ca22fabee96 100644 --- a/0002-AUR-Do-not-update-cargo-crates.patch +++ b/0002-AUR-Do-not-update-cargo-crates.patch @@ -1,4 +1,4 @@ -From a7316fe9b62ea4a0d3ca2e839f3ce9d0ac48ec92 Mon Sep 17 00:00:00 2001 +From fd33f755275ec3323816ec0662e08232b91184bc 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/6] AUR Do not update cargo crates @@ -21,5 +21,5 @@ index 00fa99fc..225ab528 100644 -j$$(SUBJOBS) --locked --offline --verbose \ --target "$$(CARGO_TARGET_$(3))" \ -- -2.44.0 +2.45.0 diff --git a/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch b/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch index ba297284a761..e685126cc88f 100644 --- a/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch +++ b/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch @@ -1,4 +1,4 @@ -From 9bbbf911c6d894652c239d64e1a8763dd5d727ec Mon Sep 17 00:00:00 2001 +From c6b5406b807db68d8564d5e33febfa0b80b95acb Mon Sep 17 00:00:00 2001 From: Stelios Tsampas <loathingkernel@gmail.com> Date: Wed, 12 Jul 2023 17:53:47 +0300 Subject: [PATCH 3/6] AUR Remove kaldi, openfst, vosk-api modules because of @@ -9,10 +9,10 @@ Subject: [PATCH 3/6] AUR Remove kaldi, openfst, vosk-api modules because of 1 file changed, 1 insertion(+), 81 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 64f886eb..aa3e7a89 100644 +index 11890078..6cf7205d 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -404,86 +404,6 @@ $(OBJ)/.steamexe-post-build64: +@@ -410,86 +410,6 @@ $(OBJ)/.steamexe-post-build64: cp $(SRC)/steam_helper/64/libsteam_api.so $(DST_LIBDIR64)/ touch $@ @@ -99,7 +99,7 @@ index 64f886eb..aa3e7a89 100644 ## ## wine -@@ -519,7 +439,7 @@ WINE_CONFIGURE_ARGS64 = --enable-win64 \ +@@ -525,7 +445,7 @@ WINE_CONFIGURE_ARGS64 = --enable-win64 \ VKD3D_PE_CFLAGS="-I$(VULKAN_HEADERS_DST64)/include -I$(VKD3D_DST64)/include/vkd3d" \ VKD3D_PE_LIBS="-L$(VKD3D_DST64)/bin -l:libvkd3d-1.dll -l:libvkd3d-shader-1.dll" @@ -109,5 +109,5 @@ index 64f886eb..aa3e7a89 100644 $(eval $(call rules-source,wine,$(SRCDIR)/wine)) $(eval $(call rules-autoconf,wine,32)) -- -2.44.0 +2.45.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 3af20e02ed34..c77b40becd53 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,4 +1,4 @@ -From 8bb490d7823b86eaf88098c0697fee32ed3d6892 Mon Sep 17 00:00:00 2001 +From 47d75a10c48153c355b023641ca350b8136551d3 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/6] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the @@ -20,7 +20,7 @@ a runtime dependency. 1 file changed, 9 insertions(+) diff --git a/proton b/proton -index 8f9d03b0..420d9053 100755 +index a0c1bcf8..db10017c 100755 --- a/proton +++ b/proton @@ -923,6 +923,15 @@ class CompatData: @@ -40,5 +40,5 @@ index 8f9d03b0..420d9053 100755 if use_wined3d: dxvkfiles = [] -- -2.44.0 +2.45.0 diff --git a/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch index a50fb02a9a47..3334b502aa2d 100644 --- a/0005-AUR-Strip-binaries-early.patch +++ b/0005-AUR-Strip-binaries-early.patch @@ -1,4 +1,4 @@ -From ca13029d4b34efeff0c172da1699534d16ba1bda Mon Sep 17 00:00:00 2001 +From 5932cb1847766535b4c8a6038319d01134b5538b Mon Sep 17 00:00:00 2001 From: Stelios Tsampas <loathingkernel@gmail.com> Date: Wed, 23 Aug 2023 19:31:35 +0300 Subject: [PATCH 5/6] AUR Strip binaries early @@ -8,10 +8,10 @@ Subject: [PATCH 5/6] AUR Strip binaries early 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index aa3e7a89..c67b9dd2 100644 +index 6cf7205d..fd8486fa 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 aa3e7a89..c67b9dd2 100644 COMMON_FLAGS64 := -mcmodel=small CARGO_BUILD_ARGS += --release -- -2.44.0 +2.45.0 diff --git a/0006-AUR-Fix-hwnd-redefinition.patch b/0006-AUR-Fix-hwnd-redefinition.patch index d900293ab1fe..f5ba19334e7b 100644 --- a/0006-AUR-Fix-hwnd-redefinition.patch +++ b/0006-AUR-Fix-hwnd-redefinition.patch @@ -1,4 +1,4 @@ -From 256e1d6c0fa13bd1723e001d6abc30e628ddcc17 Mon Sep 17 00:00:00 2001 +From 228fe37d392087aacb1e40e81ac65918e728c05b Mon Sep 17 00:00:00 2001 From: Stelios Tsampas <loathingkernel@gmail.com> Date: Thu, 28 Sep 2023 14:16:04 +0300 Subject: [PATCH 6/6] AUR: Fix hwnd redefinition @@ -44,5 +44,5 @@ index 7d6b4f66..c5533d79 100644 #undef min #undef max -- -2.44.0 +2.45.0 @@ -1,13 +1,13 @@ # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com> pkgname=proton-experimental -_srctag=9.0-20240411 +_srctag=9.0-20240503b _commit= -pkgver=${_srctag//-/.} +pkgver=9.0.20240503.2 #${_srctag//-/.} _geckover=2.47.4 -_monover=9.0.0 +_monover=9.1.0 _xaliaver=0.4.1 -pkgrel=2 +pkgrel=1 epoch=1 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, experimental branch" url="https://github.com/ValveSoftware/Proton" @@ -257,14 +257,14 @@ package() { $(find "$_monodir" -iname "*x86_64.dll" -or -iname "*x86_64.exe") } -sha256sums=('15daf1f0e847ab05b6945b5c2c6104ae59d584f6d508ac36af37ca468ba5d2dd' +sha256sums=('07a21f546d0ecfe28b409ea0aa402732a8d440ede2f49870059daf38989e46a8' '2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6' 'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814' - 'd73d440c08ebd67c93fbd6534f4f1b4e98aa07342f9c7d98c8aaeb74755eb9cf' + '601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767' 'a652c3289fb444efb2fbd8b5757484e21ffe6a537b3a3f9a0fbb04a9a10afcba' - '60a55b54a9e6bd6f31e9850c5d7b64596e8a11db2222fa5bdb4868c46d94e06e' - '8b9cea08ebe45002fd3e81b17332fccf48c3eb42bcc80cafc38cd58ebae5ffe4' - 'd4aff4eaf001dc329b91d706d7ae5389528a482689b62afd03798f54365c55f1' - 'cd276b4f4014361de97afafa73e5c252de6fcde8bf5370523fd29ee30d9e0624' - '1aab55361a77af5fe766fb3dbf88b167d55be5fffb0b7f2633fcab1b807480a3' - 'd985a675fc137347afa4f864758efe7c5e34196367f2fa6e48df1a4e56ed0139') + '1c541c59b96d1b8e82fd17fa2b1d4bc929dce903e8b02abb9a45d69e415e9e43' + '2405158b694487c37e0ca7c4e02788c8c4fad47b6de4ea9999565ead124019c2' + 'f1c48a7d19800f9e46568c6ba2e3600a7f21885cc8251a655e83f7cd38e0b48b' + '0fc622d47817dd0959e38e037d698fa843b515307511944b3021a9ff19e3cd3f' + 'f6425db2bd252f7de452903a29f89183241bc317ee3140193b7d8343adb2f565' + 'de138e48f6a4662c4877a7f76db9eaf42241b6784ea91a2583707a9842cde78b') |