summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO30
-rw-r--r--0001-AUR-Pkgbuild-changes.patch98
-rw-r--r--0002-AUR-Do-not-update-cargo-crates.patch4
-rw-r--r--0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch10
-rw-r--r--0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch6
-rw-r--r--0005-AUR-Strip-binaries-early.patch8
-rw-r--r--0006-AUR-Fix-hwnd-redefinition.patch6
-rw-r--r--PKGBUILD31
8 files changed, 95 insertions, 98 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0b7e65021e30..b4c7bcccd0c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = proton-ge-custom
pkgdesc = Compatibility tool for Steam Play based on Wine and additional components, GloriousEggroll's custom build
- pkgver = GE.Proton9.4
+ pkgver = GE.Proton9.5
pkgrel = 1
epoch = 2
url = https://github.com/GloriousEggroll/proton-ge-custom
@@ -129,33 +129,33 @@ pkgbase = proton-ge-custom
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 = xalia-0.4.1-net48-mono.zip
+ 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-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#commit=8c7bddc24ad8aead1033a7ad8dd9486520b12e1e
+ source = proton-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#tag=GE-Proton9-5
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/xalia/releases/download/xalia-0.4.1/xalia-0.4.1-net48-mono.zip
+ 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-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
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 = a39b5d4a2be1c39336401c7c79c4e3d9110c2b14fa43e46fc06d0efd18d0a7fa
+ sha256sums = 324f0ca2cafe55893af0ce6f9b86c9db8ff1ffbf507da77a2d60ceb113d08c99
sha256sums = 2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6
sha256sums = fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814
- sha256sums = d73d440c08ebd67c93fbd6534f4f1b4e98aa07342f9c7d98c8aaeb74755eb9cf
- sha256sums = a652c3289fb444efb2fbd8b5757484e21ffe6a537b3a3f9a0fbb04a9a10afcba
- sha256sums = 1f7267cb9efcbd61b41c1e6fdf5741202f34b5efd7e61ee6dff782e148969d31
- sha256sums = 07329babba794ce1428fd3f9910040d12afc478985ec0b5d4e31b24f9d1262b5
- sha256sums = 54fabb6cb5ab1c93a9d012340a4eb6b614f89fb849838f133210bfd823838739
- sha256sums = ded35383985eb53a9a03692e62c17cf83461929c781a1973c9b769e7fdf5489b
- sha256sums = b57e5a9d575d38367f1e91fd658282f787f9434007b60fffc79f5360eebeceee
- sha256sums = 3607adae993ed293702c15f27fb768f39128171caba1f9dbf27af3ce84d41f17
+ sha256sums = 601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767
+ sha256sums = 50ce2cc85162343e62340b0ca7994ceba94592ab395fb99711e94e108e991f0c
+ sha256sums = 6a08420d44740c14cc22e029ec38e0b80011caa99e1e399d442c250104b7b9e0
+ sha256sums = 981c46b5bfe403ab5b834cde0544192a6af797942a5e4633e5cd6327a475b3da
+ sha256sums = 622d189e03180eaaf5ed03a20265e4486a65480cf2ed63793393b121731ababa
+ sha256sums = 9062e5e8fef9f1ce86f7e37d4de8af11e9f66afd466a5939587b16278206cc0a
+ sha256sums = 92a0f078362aab6d37ceb1690409f468c6d0c0630d29653bedcf49e9d33cda2a
+ sha256sums = af6cf93eebfbd0ba63ee54d9d4d69c1790090edfcb6a8a1dee7d01662da3a4ac
pkgname = proton-ge-custom
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index a3873bc73ab9..abb31b819652 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,29 +1,29 @@
-From 4cb631d134dd15aa5b659ea397d98438f979f46a Mon Sep 17 00:00:00 2001
+From ec0126e8c1ac948d4823f4b086e24241fe3e441b 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/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, 90 insertions(+), 42 deletions(-)
+ 13 files changed, 88 insertions(+), 42 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index e21a11e1..82a3084f 100644
+index bee51bfa..42504deb 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 e21a11e1..82a3084f 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 e21a11e1..82a3084f 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 e21a11e1..82a3084f 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 e21a11e1..82a3084f 100644
-Dexamples=disabled \
-Dtests=disabled \
-Dbenchmarks=disabled \
-@@ -125,7 +135,10 @@ $(eval $(call rules-meson,gst_orc,64))
+@@ -132,7 +142,10 @@ $(eval $(call rules-meson,gst_orc,64))
##
GSTREAMER_MESON_ARGS := \
@@ -81,7 +81,7 @@ index e21a11e1..82a3084f 100644
-Dintrospection=disabled \
-Dgobject-cast-checks=disabled \
-Dglib-asserts=disabled \
-@@ -149,6 +162,11 @@ $(eval $(call rules-meson,gstreamer,64))
+@@ -156,6 +169,11 @@ $(eval $(call rules-meson,gstreamer,64))
## graphene
##
@@ -93,7 +93,7 @@ index e21a11e1..82a3084f 100644
$(eval $(call rules-source,graphene,$(SRCDIR)/graphene))
$(eval $(call rules-meson,graphene,32))
$(eval $(call rules-meson,graphene,64))
-@@ -159,6 +177,7 @@ $(eval $(call rules-meson,graphene,64))
+@@ -166,6 +184,7 @@ $(eval $(call rules-meson,graphene,64))
##
GST_BASE_MESON_ARGS := \
@@ -101,7 +101,7 @@ index e21a11e1..82a3084f 100644
-Dauto_features=disabled \
-Dintrospection=disabled \
-Dgobject-cast-checks=disabled \
-@@ -168,6 +187,7 @@ GST_BASE_MESON_ARGS := \
+@@ -175,6 +194,7 @@ GST_BASE_MESON_ARGS := \
-Dexamples=disabled \
-Dtests=disabled \
-Ddoc=disabled \
@@ -109,7 +109,7 @@ index e21a11e1..82a3084f 100644
-Dadder=enabled \
-Dapp=enabled \
-Daudioconvert=enabled \
-@@ -201,6 +221,7 @@ $(eval $(call rules-meson,gst_base,64))
+@@ -208,6 +228,7 @@ $(eval $(call rules-meson,gst_base,64))
##
GST_GOOD_MESON_ARGS := \
@@ -117,7 +117,7 @@ index e21a11e1..82a3084f 100644
-Dauto_features=disabled \
-Dgobject-cast-checks=disabled \
-Dglib-asserts=disabled \
-@@ -247,6 +268,7 @@ $(eval $(call rules-meson,gst_good,64))
+@@ -254,6 +275,7 @@ $(eval $(call rules-meson,gst_good,64))
FFMPEG_CONFIGURE_ARGS := \
--enable-shared \
@@ -125,19 +125,17 @@ index e21a11e1..82a3084f 100644
--disable-static \
--disable-everything \
--disable-programs \
-@@ -276,6 +298,11 @@ FFMPEG_CONFIGURE_ARGS := \
- --enable-decoder=aac \
- --enable-demuxer=xwma
-
-+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)
+@@ -284,6 +306,9 @@ FFMPEG_CONFIGURE_ARGS := \
+ --enable-demuxer=xwma \
+ --disable-inline-asm
+
++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))
-@@ -320,6 +347,7 @@ $(OBJ)/.gst_plugins_rs-post-build32:
+@@ -328,6 +353,7 @@ $(OBJ)/.gst_plugins_rs-post-build32:
##
GST_BAD_MESON_ARGS := \
@@ -145,7 +143,7 @@ index e21a11e1..82a3084f 100644
-Dauto_features=disabled \
-Dintrospection=disabled \
-Dgobject-cast-checks=disabled \
-@@ -432,6 +460,7 @@ $(eval $(call rules-meson,gst_bad,64))
+@@ -440,6 +466,7 @@ $(eval $(call rules-meson,gst_bad,64))
##
GST_UGLY_MESON_ARGS := \
@@ -153,7 +151,7 @@ index e21a11e1..82a3084f 100644
-Dauto_features=disabled \
-Dgobject-cast-checks=disabled \
-Dglib-asserts=disabled \
-@@ -522,7 +551,7 @@ $(eval $(call rules-cmake,openxr,64))
+@@ -530,7 +557,7 @@ $(eval $(call rules-cmake,openxr,64))
## Note 32-bit is not supported by SteamVR, so we don't build it.
##
@@ -162,7 +160,7 @@ index e21a11e1..82a3084f 100644
WINEOPENXR_DEPENDS = wine openxr
$(eval $(call rules-source,wineopenxr,$(SRCDIR)/wineopenxr))
-@@ -600,6 +629,9 @@ OPENFST_CONFIGURE_ARGS = \
+@@ -608,6 +635,9 @@ OPENFST_CONFIGURE_ARGS = \
--with-pic \
--disable-bin \
@@ -172,7 +170,7 @@ index e21a11e1..82a3084f 100644
$(eval $(call rules-source,openfst,$(SRCDIR)/openfst))
$(eval $(call rules-autoconf,openfst,32))
$(eval $(call rules-autoconf,openfst,64))
-@@ -662,7 +694,10 @@ WINE_SOURCE_ARGS = \
+@@ -670,7 +700,10 @@ WINE_SOURCE_ARGS = \
--exclude dlls/winevulkan/winevulkan.spec
WINE_CONFIGURE_ARGS = \
@@ -183,9 +181,9 @@ index e21a11e1..82a3084f 100644
--disable-tests
WINE_CONFIGURE_ARGS32 = \
-@@ -717,10 +752,14 @@ $(eval $(call rules-makedep,vrclient,64))
- ## dxvk
- ##
+@@ -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)
+DXVK_MESON_ARGS = --force-fallback-for=libdisplay-info
DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
@@ -198,7 +196,7 @@ index e21a11e1..82a3084f 100644
$(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
$(eval $(call rules-meson,dxvk,32,CROSS))
$(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -748,6 +787,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -760,6 +797,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
@@ -208,7 +206,7 @@ index e21a11e1..82a3084f 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))
-@@ -776,6 +818,9 @@ D8VK_MESON_ARGS32 = --bindir=$(D8VK_DST32)/lib/wine/d8vk
+@@ -788,6 +828,9 @@ D8VK_MESON_ARGS32 = --bindir=$(D8VK_DST32)/lib/wine/d8vk
D8VK_MESON_ARGS64 = --bindir=$(D8VK_DST64)/lib64/wine/d8vk
D8VK_DEPENDS = glslang
@@ -218,7 +216,7 @@ index e21a11e1..82a3084f 100644
$(eval $(call rules-source,d8vk,$(SRCDIR)/d8vk))
$(eval $(call rules-meson,d8vk,32,CROSS))
$(eval $(call rules-meson,d8vk,64,CROSS))
-@@ -855,6 +900,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
+@@ -875,6 +918,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
endif
@@ -228,7 +226,7 @@ index e21a11e1..82a3084f 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))
-@@ -1142,14 +1190,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -1145,14 +1191,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
@@ -246,7 +244,7 @@ index e21a11e1..82a3084f 100644
mv $@.tmp $@
$(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -1159,12 +1207,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -1162,12 +1208,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)
@@ -262,7 +260,7 @@ index e21a11e1..82a3084f 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) \
-@@ -1311,8 +1359,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1316,8 +1362,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
@@ -273,7 +271,7 @@ index e21a11e1..82a3084f 100644
rm -rf $(abspath $(DIST_PREFIX))
python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
-@@ -1454,7 +1502,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1459,7 +1505,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
@@ -281,7 +279,7 @@ index e21a11e1..82a3084f 100644
override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
endif
-@@ -1469,9 +1516,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1474,9 +1519,6 @@ ifeq ($(CONTAINER_ENGINE),)
CONTAINER_ENGINE := docker
endif
@@ -373,11 +371,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" \
@@ -388,7 +386,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))" \
@@ -397,7 +395,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)" \
@@ -406,8 +404,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
@@ -493,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 4d4b058a..99d1af3d 100755
+index 6d417ab6..e79c5cae 100755
--- a/proton
+++ b/proton
@@ -523,7 +523,6 @@ class Proton:
@@ -504,7 +502,7 @@ index 4d4b058a..99d1af3d 100755
def path(self, d):
return self.base_dir + d
-@@ -1701,8 +1700,6 @@ if __name__ == "__main__":
+@@ -1704,8 +1703,6 @@ if __name__ == "__main__":
g_proton = Proton(os.path.dirname(sys.argv[0]))
@@ -513,7 +511,7 @@ index 4d4b058a..99d1af3d 100755
g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
-@@ -1714,7 +1711,8 @@ if __name__ == "__main__":
+@@ -1717,7 +1714,8 @@ if __name__ == "__main__":
os.environ["PROTON_DLL_COPY"] = "*"
if g_proton.missing_default_prefix():
@@ -536,5 +534,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 6b3a7f08ac4e..bef6f9829919 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From 34a95536f653d549ab3e3ff03c8d78d6d55f6fd1 Mon Sep 17 00:00:00 2001
+From 5d641b7911a5c3285ce668a635c4024878d15de9 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 b87cba356b81..c6057df57a64 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 b0578227abf81b437468f4af45e08748ccf48837 Mon Sep 17 00:00:00 2001
+From 5fce541cf02ddcefee6664686d5e16d1a4b63a20 Mon Sep 17 00:00:00 2001
From: Stelios Tsampas <loathingkernel@gmail.com>
Date: Wed, 12 Jul 2023 17:56:34 +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 82a3084f..a0e45233 100644
+index 42504deb..5ca37a0e 100644
--- a/Makefile.in
+++ b/Makefile.in
-@@ -593,86 +593,6 @@ $(OBJ)/.steamexe-post-build64:
+@@ -599,86 +599,6 @@ $(OBJ)/.steamexe-post-build64:
cp $(SRC)/steam_helper/64/libsteam_api.so $(DST_LIBDIR64)/
touch $@
@@ -99,7 +99,7 @@ index 82a3084f..a0e45233 100644
##
## wine
-@@ -708,7 +628,7 @@ WINE_CONFIGURE_ARGS64 = --enable-win64 \
+@@ -714,7 +634,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 82a3084f..a0e45233 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 942d09086976..a8cad5ebfe4f 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 10aa3d86a67beb2a1fa2f93aec9cac483b3abe07 Mon Sep 17 00:00:00 2001
+From ac8cb7143e72649078f5a042568259a7f07e1643 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 99d1af3d..70a33c8e 100755
+index e79c5cae..ffbf0b04 100755
--- a/proton
+++ b/proton
@@ -1022,6 +1022,15 @@ class CompatData:
@@ -40,5 +40,5 @@ index 99d1af3d..70a33c8e 100755
enable_d8vk = "enabled8vk" in g_session.compat_config
--
-2.44.0
+2.45.0
diff --git a/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch
index 308adb2db470..5b7f4bbe8dd2 100644
--- a/0005-AUR-Strip-binaries-early.patch
+++ b/0005-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From c629c61c763b6ae2868bf455dbc0c13cfc29cbc2 Mon Sep 17 00:00:00 2001
+From d9f3dd0e213a5f788ffd7c53d28c9ed4fe50f87b 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 a0e45233..89c37fc8 100644
+index 5ca37a0e..7056890f 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 a0e45233..89c37fc8 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 24188e9044e8..da2c44264824 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From 54fd7fee743bfa03c87ca9a8c7e133f052bed5f9 Mon Sep 17 00:00:00 2001
+From b297a1a2edae6695cc79852aa35bf1c0c3cb931e 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
@@ -9,7 +9,7 @@ Subject: [PATCH 6/6] AUR: Fix hwnd redefinition
2 files changed, 6 insertions(+)
diff --git a/steam_helper/steam.cpp b/steam_helper/steam.cpp
-index 5240e465..7ee80752 100644
+index 542aa972..31c48beb 100644
--- a/steam_helper/steam.cpp
+++ b/steam_helper/steam.cpp
@@ -34,11 +34,15 @@
@@ -44,5 +44,5 @@ index 7d6b4f66..c5533d79 100644
#undef min
#undef max
--
-2.44.0
+2.45.0
diff --git a/PKGBUILD b/PKGBUILD
index dec9978dfa2c..d2a476ccc785 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
pkgname=proton-ge-custom
-_srctag=GE-Proton9-4
-_commit=8c7bddc24ad8aead1033a7ad8dd9486520b12e1e
+_srctag=GE-Proton9-5
+_commit=
pkgver=${_srctag//-/.}
_geckover=2.47.4
-_monover=9.0.0
-_xaliaver=0.4.1
+_monover=9.1.0
+_xaliaver=0.4.2
pkgrel=1
epoch=2
pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, GloriousEggroll's custom build"
@@ -86,7 +86,7 @@ optdepends=(
provides=('proton')
install=${pkgname}.install
source=(
- proton-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#commit=${_commit}
+ proton-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#tag=${_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
@@ -225,8 +225,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} \
@@ -259,14 +258,14 @@ package() {
$(find "$_monodir" -iname "*x86_64.dll" -or -iname "*x86_64.exe")
}
-sha256sums=('a39b5d4a2be1c39336401c7c79c4e3d9110c2b14fa43e46fc06d0efd18d0a7fa'
+sha256sums=('324f0ca2cafe55893af0ce6f9b86c9db8ff1ffbf507da77a2d60ceb113d08c99'
'2cfc8d5c948602e21eff8a78613e1826f2d033df9672cace87fed56e8310afb6'
'fd88fc7e537d058d7a8abf0c1ebc90c574892a466de86706a26d254710a82814'
- 'd73d440c08ebd67c93fbd6534f4f1b4e98aa07342f9c7d98c8aaeb74755eb9cf'
- 'a652c3289fb444efb2fbd8b5757484e21ffe6a537b3a3f9a0fbb04a9a10afcba'
- '1f7267cb9efcbd61b41c1e6fdf5741202f34b5efd7e61ee6dff782e148969d31'
- '07329babba794ce1428fd3f9910040d12afc478985ec0b5d4e31b24f9d1262b5'
- '54fabb6cb5ab1c93a9d012340a4eb6b614f89fb849838f133210bfd823838739'
- 'ded35383985eb53a9a03692e62c17cf83461929c781a1973c9b769e7fdf5489b'
- 'b57e5a9d575d38367f1e91fd658282f787f9434007b60fffc79f5360eebeceee'
- '3607adae993ed293702c15f27fb768f39128171caba1f9dbf27af3ce84d41f17')
+ '601169d0203b291fbfd946b356a9538855e01de22abd470ded73baf312c88767'
+ '50ce2cc85162343e62340b0ca7994ceba94592ab395fb99711e94e108e991f0c'
+ '6a08420d44740c14cc22e029ec38e0b80011caa99e1e399d442c250104b7b9e0'
+ '981c46b5bfe403ab5b834cde0544192a6af797942a5e4633e5cd6327a475b3da'
+ '622d189e03180eaaf5ed03a20265e4486a65480cf2ed63793393b121731ababa'
+ '9062e5e8fef9f1ce86f7e37d4de8af11e9f66afd466a5939587b16278206cc0a'
+ '92a0f078362aab6d37ceb1690409f468c6d0c0630d29653bedcf49e9d33cda2a'
+ 'af6cf93eebfbd0ba63ee54d9d4d69c1790090edfcb6a8a1dee7d01662da3a4ac')