diff options
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | 0001-AUR-Pkgbuild-changes.patch | 40 | ||||
-rw-r--r-- | 0002-AUR-Do-not-update-cargo-crates.patch | 2 | ||||
-rw-r--r-- | 0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch | 8 | ||||
-rw-r--r-- | 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch | 6 | ||||
-rw-r--r-- | 0005-AUR-Strip-binaries-early.patch | 4 | ||||
-rw-r--r-- | 0006-AUR-Fix-hwnd-redefinition.patch | 2 | ||||
-rw-r--r-- | PKGBUILD | 16 |
8 files changed, 47 insertions, 47 deletions
@@ -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.Proton8.30 + pkgver = GE.Proton8.31 pkgrel = 1 epoch = 2 url = https://github.com/GloriousEggroll/proton-ge-custom @@ -133,7 +133,7 @@ pkgbase = proton-ge-custom options = !lto options = !debug options = emptydirs - source = proton-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#commit=06880fa56166180df777579c907d3f52d16442b3 + source = proton-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#commit=6fb8c815f261a2773817e2a470918ae39e86691f 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 = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-8.1.0/wine-mono-8.1.0-x86.tar.xz @@ -147,11 +147,11 @@ pkgbase = proton-ge-custom sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3 sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75 sha256sums = 4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4 - sha256sums = 285ff865f31a4b18dfad6dbf0b511108db4e9a02212e2cd95ddd461beebcf0c6 - sha256sums = a7a1a68b37cebe875cf1de583a2581026d4e5e1ae6581d20794bb8a220ff96d2 - sha256sums = 1e1f86fb3a3a0d94524b65ec368176ee76fd1e948e898d02c97740ca08989eeb - sha256sums = fd6ef422adac7a84a74067907f6e20e5b331bd8d19c963286a073e5028fa8604 - sha256sums = cddc5b07ac9a742ee49aec87fbe9598aa43386a964cbaa437e7e387d18a6bb53 - sha256sums = 4b1fc2871645d8b593eb98830c3817ca7ecfdad6c57eb68ef47753d34c1b4934 + sha256sums = 68ac2429b5389437023ff4d994464db6452c80a81585fe9a719333d7b9aff8ee + sha256sums = 2fe2fe1bd6bf72a7b0269a963880da4e62420c7cae749e5e610d2c822c3b50c7 + sha256sums = c9f34ccae6e1d6b478dfb36b445c8c501c5314fd13b3394aa28e757b4ec9635f + sha256sums = 3796ce184ee92b48378526b139e2109c535cb0494ad92e7b85229c26d7629b3f + sha256sums = f33527282a555bf409d8c3362167da6e37e3a07b07abea5dd79bbd676539325c + sha256sums = 68bee9b8a25ef3cd177845a15eebdd1aa8f68818a114c34d345431a01376b926 pkgname = proton-ge-custom diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch index dc59722970e2..1957fde77e49 100644 --- a/0001-AUR-Pkgbuild-changes.patch +++ b/0001-AUR-Pkgbuild-changes.patch @@ -1,4 +1,4 @@ -From d67d53fabc20631ec747db7db30111ed1e8941dd Mon Sep 17 00:00:00 2001 +From c93e7c51c12dfcc66bba3816ab611577838eb824 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 @@ -20,7 +20,7 @@ Subject: [PATCH 1/6] AUR Pkgbuild changes 13 files changed, 89 insertions(+), 42 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 3d69e90c..a96465c7 100644 +index a9c50e19..e568dfb6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,11 +50,12 @@ else @@ -109,7 +109,7 @@ index 3d69e90c..a96465c7 100644 -Dadder=enabled \ -Dapp=enabled \ -Daudioconvert=enabled \ -@@ -200,6 +220,7 @@ $(eval $(call rules-meson,gst_base,64)) +@@ -201,6 +221,7 @@ $(eval $(call rules-meson,gst_base,64)) ## GST_GOOD_MESON_ARGS := \ @@ -117,7 +117,7 @@ index 3d69e90c..a96465c7 100644 -Dauto_features=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -@@ -246,6 +267,7 @@ $(eval $(call rules-meson,gst_good,64)) +@@ -247,6 +268,7 @@ $(eval $(call rules-meson,gst_good,64)) FFMPEG_CONFIGURE_ARGS := \ --enable-shared \ @@ -125,7 +125,7 @@ index 3d69e90c..a96465c7 100644 --disable-static \ --disable-everything \ --disable-programs \ -@@ -275,6 +297,11 @@ FFMPEG_CONFIGURE_ARGS := \ +@@ -276,6 +298,11 @@ FFMPEG_CONFIGURE_ARGS := \ --enable-decoder=aac \ --enable-demuxer=xwma @@ -137,7 +137,7 @@ index 3d69e90c..a96465c7 100644 $(eval $(call rules-source,ffmpeg,$(SRCDIR)/ffmpeg)) $(eval $(call rules-configure,ffmpeg,32)) $(eval $(call rules-configure,ffmpeg,64)) -@@ -319,6 +346,7 @@ $(OBJ)/.gst_plugins_rs-post-build32: +@@ -320,6 +347,7 @@ $(OBJ)/.gst_plugins_rs-post-build32: ## GST_BAD_MESON_ARGS := \ @@ -145,7 +145,7 @@ index 3d69e90c..a96465c7 100644 -Dauto_features=disabled \ -Dintrospection=disabled \ -Dgobject-cast-checks=disabled \ -@@ -431,6 +459,7 @@ $(eval $(call rules-meson,gst_bad,64)) +@@ -432,6 +460,7 @@ $(eval $(call rules-meson,gst_bad,64)) ## GST_UGLY_MESON_ARGS := \ @@ -153,7 +153,7 @@ index 3d69e90c..a96465c7 100644 -Dauto_features=disabled \ -Dgobject-cast-checks=disabled \ -Dglib-asserts=disabled \ -@@ -520,7 +549,7 @@ $(eval $(call rules-cmake,openxr,64)) +@@ -521,7 +550,7 @@ $(eval $(call rules-cmake,openxr,64)) ## Note 32-bit is not supported by SteamVR, so we don't build it. ## @@ -162,7 +162,7 @@ index 3d69e90c..a96465c7 100644 WINEOPENXR_DEPENDS = wine openxr $(eval $(call rules-source,wineopenxr,$(SRCDIR)/wineopenxr)) -@@ -598,6 +627,9 @@ OPENFST_CONFIGURE_ARGS = \ +@@ -599,6 +628,9 @@ OPENFST_CONFIGURE_ARGS = \ --with-pic \ --disable-bin \ @@ -172,7 +172,7 @@ index 3d69e90c..a96465c7 100644 $(eval $(call rules-source,openfst,$(SRCDIR)/openfst)) $(eval $(call rules-autoconf,openfst,32)) $(eval $(call rules-autoconf,openfst,64)) -@@ -660,7 +692,10 @@ WINE_SOURCE_ARGS = \ +@@ -661,7 +693,10 @@ WINE_SOURCE_ARGS = \ --exclude dlls/winevulkan/winevulkan.spec WINE_CONFIGURE_ARGS = \ @@ -183,7 +183,7 @@ index 3d69e90c..a96465c7 100644 --disable-tests WINE_CONFIGURE_ARGS32 = \ -@@ -717,6 +752,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk +@@ -718,6 +753,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk DXVK_DEPENDS = glslang @@ -193,7 +193,7 @@ index 3d69e90c..a96465c7 100644 $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk)) $(eval $(call rules-meson,dxvk,32,CROSS)) $(eval $(call rules-meson,dxvk,64,CROSS)) -@@ -744,6 +782,9 @@ $(OBJ)/.dxvk-post-build32: +@@ -745,6 +783,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 @@ -203,7 +203,7 @@ index 3d69e90c..a96465c7 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)) -@@ -772,6 +813,9 @@ D8VK_MESON_ARGS32 = --bindir=$(D8VK_DST32)/lib/wine/d8vk +@@ -773,6 +814,9 @@ D8VK_MESON_ARGS32 = --bindir=$(D8VK_DST32)/lib/wine/d8vk D8VK_MESON_ARGS64 = --bindir=$(D8VK_DST64)/lib64/wine/d8vk D8VK_DEPENDS = glslang @@ -213,7 +213,7 @@ index 3d69e90c..a96465c7 100644 $(eval $(call rules-source,d8vk,$(SRCDIR)/d8vk)) $(eval $(call rules-meson,d8vk,32,CROSS)) $(eval $(call rules-meson,d8vk,64,CROSS)) -@@ -851,6 +895,9 @@ ifneq ($(UNSTRIPPED_BUILD),) +@@ -852,6 +896,9 @@ ifneq ($(UNSTRIPPED_BUILD),) VKD3D_PROTON_MESON_ARGS = -Denable_trace=true endif @@ -223,7 +223,7 @@ index 3d69e90c..a96465c7 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)) -@@ -1147,14 +1194,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ +@@ -1148,14 +1195,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 @@ -241,7 +241,7 @@ index 3d69e90c..a96465c7 100644 mv $@.tmp $@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) -@@ -1164,12 +1211,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) +@@ -1165,12 +1212,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) @@ -257,7 +257,7 @@ index 3d69e90c..a96465c7 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) \ -@@ -1295,8 +1342,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64) +@@ -1296,8 +1343,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 @@ -268,7 +268,7 @@ index 3d69e90c..a96465c7 100644 rm -rf $(abspath $(DIST_PREFIX)) python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR)) -@@ -1438,7 +1485,6 @@ ifeq ($(ENABLE_CCACHE),1) +@@ -1439,7 +1486,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 @@ -276,7 +276,7 @@ index 3d69e90c..a96465c7 100644 override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS) endif -@@ -1453,9 +1499,6 @@ ifeq ($(CONTAINER_ENGINE),) +@@ -1454,9 +1500,6 @@ ifeq ($(CONTAINER_ENGINE),) CONTAINER_ENGINE := docker endif @@ -488,7 +488,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 009bb53b..a97f6dda 100755 +index 2c231af4..31c48410 100755 --- a/proton +++ b/proton @@ -423,7 +423,6 @@ class Proton: diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch index ef86c83d957b..71c690451917 100644 --- a/0002-AUR-Do-not-update-cargo-crates.patch +++ b/0002-AUR-Do-not-update-cargo-crates.patch @@ -1,4 +1,4 @@ -From bc4652d166a2d91e44e5eb69078c4f1129316b57 Mon Sep 17 00:00:00 2001 +From ee404104190497df0e93cebbd4fb3f7588698bf0 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 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 66cb88239299..aa94f68fdb71 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 7a4655358181fe5beaa8b63247727c814961e804 Mon Sep 17 00:00:00 2001 +From 1f90202a460886a4202e65b73eb163baece53ea4 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 a96465c7..2b7eec43 100644 +index e568dfb6..cb8c9be0 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -591,86 +591,6 @@ $(OBJ)/.steamexe-post-build64: +@@ -592,86 +592,6 @@ $(OBJ)/.steamexe-post-build64: cp $(SRC)/steam_helper/64/libsteam_api.so $(DST_LIBDIR64)/ touch $@ @@ -99,7 +99,7 @@ index a96465c7..2b7eec43 100644 ## ## wine -@@ -706,7 +626,7 @@ WINE_CONFIGURE_ARGS64 = --enable-win64 \ +@@ -707,7 +627,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" 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 30f5b6ce70d9..96e76306170b 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 67bbdac3ea4ef38c6eec7a8d79f9371329504a87 Mon Sep 17 00:00:00 2001 +From 0db3c5021cdc1e003b9ac959ceb7e366d3288aed 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,10 +20,10 @@ a runtime dependency. 1 file changed, 9 insertions(+) diff --git a/proton b/proton -index a97f6dda..259083c6 100755 +index 31c48410..aed452e6 100755 --- a/proton +++ b/proton -@@ -921,6 +921,15 @@ class CompatData: +@@ -915,6 +915,15 @@ class CompatData: prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) try_copy(g_proton.lib_dir + "vkd3d/libvkd3d-shader-1.dll", "drive_c/windows/syswow64", prefix=self.prefix_dir, track_file=tracked_files, link_debug=True) diff --git a/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch index e06823f283b0..2cd35515fd92 100644 --- a/0005-AUR-Strip-binaries-early.patch +++ b/0005-AUR-Strip-binaries-early.patch @@ -1,4 +1,4 @@ -From 304d07a8100a601bde649d7b07cd3d9ec7df0b1d Mon Sep 17 00:00:00 2001 +From f2a1a16773e870a9d7f5e5994cd33f793d219b62 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,7 +8,7 @@ Subject: [PATCH 5/6] AUR Strip binaries early 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 2b7eec43..633e0043 100644 +index cb8c9be0..3963986b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -54,7 +54,7 @@ CFLAGS ?= -O2 -march=nocona -mtune=core-avx2 diff --git a/0006-AUR-Fix-hwnd-redefinition.patch b/0006-AUR-Fix-hwnd-redefinition.patch index 8d98bbae118d..90456827d35b 100644 --- a/0006-AUR-Fix-hwnd-redefinition.patch +++ b/0006-AUR-Fix-hwnd-redefinition.patch @@ -1,4 +1,4 @@ -From 6348127c6de9af3183de0c02dcbf3e84c5e1dfb0 Mon Sep 17 00:00:00 2001 +From 2f989950794f4f23b36279e070929897b11088e0 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 @@ -1,8 +1,8 @@ # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com> pkgname=proton-ge-custom -_srctag=GE-Proton8-30 -_commit=06880fa56166180df777579c907d3f52d16442b3 +_srctag=GE-Proton8-31 +_commit=6fb8c815f261a2773817e2a470918ae39e86691f pkgver=${_srctag//-/.} _geckover=2.47.3 _monover=8.1.0 @@ -266,10 +266,10 @@ sha256sums=('SKIP' '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3' '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75' '4e3e8a40729e4c9e3e9e651cebe4f1aed8f9a4d22e991e6cd24608687f0eedd4' - '285ff865f31a4b18dfad6dbf0b511108db4e9a02212e2cd95ddd461beebcf0c6' - 'a7a1a68b37cebe875cf1de583a2581026d4e5e1ae6581d20794bb8a220ff96d2' - '1e1f86fb3a3a0d94524b65ec368176ee76fd1e948e898d02c97740ca08989eeb' - 'fd6ef422adac7a84a74067907f6e20e5b331bd8d19c963286a073e5028fa8604' - 'cddc5b07ac9a742ee49aec87fbe9598aa43386a964cbaa437e7e387d18a6bb53' - '4b1fc2871645d8b593eb98830c3817ca7ecfdad6c57eb68ef47753d34c1b4934') + '68ac2429b5389437023ff4d994464db6452c80a81585fe9a719333d7b9aff8ee' + '2fe2fe1bd6bf72a7b0269a963880da4e62420c7cae749e5e610d2c822c3b50c7' + 'c9f34ccae6e1d6b478dfb36b445c8c501c5314fd13b3394aa28e757b4ec9635f' + '3796ce184ee92b48378526b139e2109c535cb0494ad92e7b85229c26d7629b3f' + 'f33527282a555bf409d8c3362167da6e37e3a07b07abea5dd79bbd676539325c' + '68bee9b8a25ef3cd177845a15eebdd1aa8f68818a114c34d345431a01376b926') |