diff options
author | Stelios Tsampas | 2023-07-21 23:36:18 +0300 |
---|---|---|
committer | Stelios Tsampas | 2023-07-21 23:36:18 +0300 |
commit | 8228648c66902d3e1032fd2c6f4c39bf01f6d729 (patch) | |
tree | 7b7f0c67daf47abf97a3d5a5ab9a09c0acb175f1 | |
parent | f1974bb712a58fad068a6fa793c161f814c15e7c (diff) | |
download | aur-8228648c66902d3e1032fd2c6f4c39bf01f6d729.tar.gz |
[proton-ge-custom] Re-enable opensft, kaldi, vosk
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | 0001-AUR-Pkgbuild-changes.patch | 50 | ||||
-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 | 51 | ||||
-rw-r--r-- | 0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch | 2 | ||||
-rw-r--r-- | PKGBUILD | 14 | ||||
-rw-r--r-- | PKGBUILD.testing | 6 |
7 files changed, 96 insertions, 47 deletions
@@ -1,7 +1,7 @@ pkgbase = proton-ge-custom pkgdesc = Compatibility tool for Steam Play based on Wine and additional components, GloriousEggroll's custom build pkgver = GE.Proton8.7 - pkgrel = 4 + pkgrel = 5 epoch = 2 url = https://github.com/GloriousEggroll/proton-ge-custom install = proton-ge-custom.install @@ -93,6 +93,10 @@ pkgbase = proton-ge-custom makedepends = lib32-libsoup makedepends = libgudev makedepends = lib32-libgudev + makedepends = blas + makedepends = lib32-blas + makedepends = lapack + makedepends = lib32-lapack makedepends = desktop-file-utils makedepends = python makedepends = steam-native-runtime @@ -127,6 +131,10 @@ pkgbase = proton-ge-custom depends = lib32-libsoup depends = libgudev depends = lib32-libgudev + depends = blas + depends = lib32-blas + depends = lapack + depends = lib32-lapack depends = desktop-file-utils depends = python depends = steam-native-runtime @@ -176,10 +184,10 @@ pkgbase = proton-ge-custom sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3 sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75 sha256sums = 14c7d76780b79dc62d8ed9d1759e7adcfa332bb2406e2e694dee7b2128cc7a77 - sha256sums = 5885547b1b62ee25036ab353f0a6afcfd77673727b165d42e988335eac9a8430 - sha256sums = f328f4b3cef7932d3225aac8f21a2c72c4aa203cc3ef6d92cee411124243974f - sha256sums = ede96f8697d29080967fabdc6b49618958e2df8f982ea33976dd7764e27781ac - sha256sums = c2061114f7f7c31e2f0e30b3df9dcc9ef39654c0b48026b911ffa58d6732181e + sha256sums = 65238d0d045d87d2192ce5e33ed91aba7b6af23ccf509d802ace183a5df50bfc + sha256sums = f93d3559ee6580f2d8acefd2c94bcafffd26ef6e7943627ba93967cc96fbcf1d + sha256sums = f7993414c472a5307301714e90180d3becfb044dfb9b5650901365bf4b0685fd + sha256sums = 7540ee3290aa290e1c37f9054342e548026bb371a970ba9dfe5e120af5e5764e sha256sums = 20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f pkgname = proton-ge-custom diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch index f767ada91f1b..5d2fb218c6fa 100644 --- a/0001-AUR-Pkgbuild-changes.patch +++ b/0001-AUR-Pkgbuild-changes.patch @@ -1,25 +1,25 @@ -From 630bd1b30aab2e887a3203cc4e4be2b6450120c3 Mon Sep 17 00:00:00 2001 +From 1c4eecfd69f1cae1ffe269c9681a705f85cd77c2 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/4] AUR Pkgbuild changes --- - Makefile.in | 77 +++++++++++++++++++++++++++------- + Makefile.in | 80 +++++++++++++++++++++++++++------- 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-meson.mk | 3 +- make/rules-winemaker.mk | 2 +- proton | 6 +-- toolmanifest_runtime.vdf | 3 -- - 12 files changed, 90 insertions(+), 39 deletions(-) + 12 files changed, 93 insertions(+), 39 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 9cc159cd..b1f39777 100644 +index 9cc159cd..149f9f62 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,11 +50,12 @@ else @@ -165,7 +165,17 @@ index 9cc159cd..b1f39777 100644 -Ddoc='disabled' \ -Dtests=disabled \ -Dgobject-cast-checks=disabled \ -@@ -611,7 +649,11 @@ WINE_SOURCE_ARGS = \ +@@ -549,6 +587,9 @@ OPENFST_CONFIGURE_ARGS = \ + --with-pic \ + --disable-bin \ + ++OPENFST_CFLAGS = -mno-bmi2 ++OPENFST_CXXFLAGS = -mno-bmi2 ++ + $(eval $(call rules-source,openfst,$(SRCDIR)/openfst)) + $(eval $(call rules-autoconf,openfst,32)) + $(eval $(call rules-autoconf,openfst,64)) +@@ -611,7 +652,11 @@ WINE_SOURCE_ARGS = \ --exclude dlls/winevulkan/winevulkan.spec WINE_CONFIGURE_ARGS = \ @@ -177,37 +187,37 @@ index 9cc159cd..b1f39777 100644 --disable-tests WINE_CONFIGURE_ARGS32 = \ -@@ -681,6 +723,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk +@@ -681,6 +726,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk DXVK_DEPENDS = glslang -+DXVK_CPPFLAGS= -msse -msse2 -+DXVK_LDFLAGS= -static -static-libgcc -static-libstdc++ ++DXVK_CPPFLAGS = -msse -msse2 ++DXVK_LDFLAGS = -static -static-libgcc -static-libstdc++ + $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk)) $(eval $(call rules-meson,dxvk,32,CROSS)) $(eval $(call rules-meson,dxvk,64,CROSS)) -@@ -708,6 +753,9 @@ $(OBJ)/.dxvk-post-build32: +@@ -708,6 +756,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 -+DXVK_NVAPI_CPPFLAGS= -msse -msse2 -+DXVK_NVAPI_LDFLAGS= -static -static-libgcc -static-libstdc++ ++DXVK_NVAPI_CPPFLAGS = -msse -msse2 ++DXVK_NVAPI_LDFLAGS = -static -static-libgcc -static-libstdc++ + $(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)) -@@ -782,6 +830,9 @@ ifneq ($(UNSTRIPPED_BUILD),) +@@ -782,6 +833,9 @@ ifneq ($(UNSTRIPPED_BUILD),) VKD3D_PROTON_MESON_ARGS = -Denable_trace=true endif -+VKD3D_PROTON_CPPFLAGS= -msse -msse2 -+VKD3D_PROTON_LDFLAGS= -static -static-libgcc -static-libstdc++ ++VKD3D_PROTON_CPPFLAGS = -msse -msse2 ++VKD3D_PROTON_LDFLAGS = -static -static-libgcc -static-libstdc++ + $(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)) -@@ -1062,14 +1113,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ +@@ -1062,14 +1116,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 @@ -225,7 +235,7 @@ index 9cc159cd..b1f39777 100644 mv $@.tmp $@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) -@@ -1079,12 +1130,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH) +@@ -1079,12 +1133,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) @@ -241,7 +251,7 @@ index 9cc159cd..b1f39777 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) \ -@@ -1210,8 +1261,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64) +@@ -1210,8 +1264,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 @@ -252,7 +262,7 @@ index 9cc159cd..b1f39777 100644 rm -rf $(abspath $(DIST_PREFIX)) python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR)) -@@ -1353,7 +1404,6 @@ ifeq ($(ENABLE_CCACHE),1) +@@ -1353,7 +1407,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 @@ -260,7 +270,7 @@ index 9cc159cd..b1f39777 100644 override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS) endif -@@ -1368,9 +1418,6 @@ ifeq ($(CONTAINER_ENGINE),) +@@ -1368,9 +1421,6 @@ ifeq ($(CONTAINER_ENGINE),) CONTAINER_ENGINE := docker endif diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch index 614f5f8692f7..1131be4b20d3 100644 --- a/0002-AUR-Do-not-update-cargo-crates.patch +++ b/0002-AUR-Do-not-update-cargo-crates.patch @@ -1,4 +1,4 @@ -From d8181ccb82297b9b3e56ef25f3042caeb65b988c Mon Sep 17 00:00:00 2001 +From 446cab222a3c5cbc7a38b068d471b64e6858418e 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/4] 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 5d649c43a14c..203b54f98af5 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,18 +1,18 @@ -From b7ca6c25ef0dc4c0cfbd5d51ad36b4ef405ead0c Mon Sep 17 00:00:00 2001 +From 97ee1c8416c2f8f3623ac2a87b91d7c059c19688 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/4] AUR Remove kaldi, openfst, vosk-api modules because of missing blas, lapack lib32 from Arch --- - Makefile.in | 79 +---------------------------------------------------- - 1 file changed, 1 insertion(+), 78 deletions(-) + Makefile.in | 92 ++++------------------------------------------------- + 1 file changed, 6 insertions(+), 86 deletions(-) diff --git a/Makefile.in b/Makefile.in -index b1f39777..ce8a32b9 100644 +index 149f9f62..1f5476b0 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -551,83 +551,6 @@ $(OBJ)/.steamexe-post-build64: +@@ -551,86 +551,6 @@ $(OBJ)/.steamexe-post-build64: cp $(STEAMEXE_SRC)/64/libsteam_api.so $(DST_LIBDIR64)/ touch $@ @@ -52,6 +52,9 @@ index b1f39777..ce8a32b9 100644 - --with-pic \ - --disable-bin \ - +-OPENFST_CFLAGS = -mno-bmi2 +-OPENFST_CXXFLAGS = -mno-bmi2 +- -$(eval $(call rules-source,openfst,$(SRCDIR)/openfst)) -$(eval $(call rules-autoconf,openfst,32)) -$(eval $(call rules-autoconf,openfst,64)) @@ -96,15 +99,39 @@ index b1f39777..ce8a32b9 100644 ## ## wine -@@ -664,7 +587,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" +@@ -726,8 +646,8 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk + DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk + DXVK_DEPENDS = glslang + +-DXVK_CPPFLAGS = -msse -msse2 +-DXVK_LDFLAGS = -static -static-libgcc -static-libstdc++ ++DXVK_CPPFLAGS= -msse -msse2 ++DXVK_LDFLAGS= -static -static-libgcc -static-libstdc++ + + $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk)) + $(eval $(call rules-meson,dxvk,32,CROSS)) +@@ -756,8 +676,8 @@ $(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 + +-DXVK_NVAPI_CPPFLAGS = -msse -msse2 +-DXVK_NVAPI_LDFLAGS = -static -static-libgcc -static-libstdc++ ++DXVK_NVAPI_CPPFLAGS= -msse -msse2 ++DXVK_NVAPI_LDFLAGS= -static -static-libgcc -static-libstdc++ + + $(eval $(call rules-source,dxvk-nvapi,$(SRCDIR)/dxvk-nvapi)) + $(eval $(call rules-meson,dxvk-nvapi,32,CROSS)) +@@ -833,8 +753,8 @@ ifneq ($(UNSTRIPPED_BUILD),) + VKD3D_PROTON_MESON_ARGS = -Denable_trace=true + endif --WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d openfst kaldi vosk -+WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d +-VKD3D_PROTON_CPPFLAGS = -msse -msse2 +-VKD3D_PROTON_LDFLAGS = -static -static-libgcc -static-libstdc++ ++VKD3D_PROTON_CPPFLAGS= -msse -msse2 ++VKD3D_PROTON_LDFLAGS= -static -static-libgcc -static-libstdc++ - $(eval $(call rules-source,wine,$(SRCDIR)/wine)) - $(eval $(call rules-autoconf,wine,32)) + $(eval $(call rules-source,vkd3d-proton,$(SRCDIR)/vkd3d-proton)) + $(eval $(call rules-meson,vkd3d-proton,32,CROSS)) -- 2.41.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 44569e03fbbc..68d351e44ef1 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 391e96733fe1261d2c8f22f1b7d4f8232ff8e456 Mon Sep 17 00:00:00 2001 +From cd28379b49eab5907fc0cf0fa73eb26843b32db7 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/4] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the @@ -6,7 +6,7 @@ _commit=c03528a75cb317aa19a8e65bbe5c82416ee16594 pkgver=${_srctag//-/.} _geckover=2.47.3 _monover=8.0.0 -pkgrel=4 +pkgrel=5 epoch=2 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, GloriousEggroll's custom build" url="https://github.com/GloriousEggroll/proton-ge-custom" @@ -30,6 +30,8 @@ depends=( 'sdl2>=2.0.16' 'lib32-sdl2>=2.0.16' libsoup lib32-libsoup libgudev lib32-libgudev + blas lib32-blas + lapack lib32-lapack desktop-file-utils python steam-native-runtime @@ -159,7 +161,7 @@ prepare() { patch -p1 -i "$srcdir"/0001-AUR-Pkgbuild-changes.patch patch -p1 -i "$srcdir"/0002-AUR-Do-not-update-cargo-crates.patch - patch -p1 -i "$srcdir"/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch + #patch -p1 -i "$srcdir"/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch patch -p1 -i "$srcdir"/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch } @@ -257,10 +259,10 @@ sha256sums=('SKIP' '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3' '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75' '14c7d76780b79dc62d8ed9d1759e7adcfa332bb2406e2e694dee7b2128cc7a77' - '5885547b1b62ee25036ab353f0a6afcfd77673727b165d42e988335eac9a8430' - 'f328f4b3cef7932d3225aac8f21a2c72c4aa203cc3ef6d92cee411124243974f' - 'ede96f8697d29080967fabdc6b49618958e2df8f982ea33976dd7764e27781ac' - 'c2061114f7f7c31e2f0e30b3df9dcc9ef39654c0b48026b911ffa58d6732181e' + '65238d0d045d87d2192ce5e33ed91aba7b6af23ccf509d802ace183a5df50bfc' + 'f93d3559ee6580f2d8acefd2c94bcafffd26ef6e7943627ba93967cc96fbcf1d' + 'f7993414c472a5307301714e90180d3becfb044dfb9b5650901365bf4b0685fd' + '7540ee3290aa290e1c37f9054342e548026bb371a970ba9dfe5e120af5e5764e' '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f') # Optional patches sha256sums+=( diff --git a/PKGBUILD.testing b/PKGBUILD.testing index 0b5a2a26bec9..42ec3070fc8d 100644 --- a/PKGBUILD.testing +++ b/PKGBUILD.testing @@ -6,7 +6,7 @@ _commit=c03528a75cb317aa19a8e65bbe5c82416ee16594 pkgver=${_srctag//-/.} _geckover=2.47.3 _monover=8.0.0 -pkgrel=4 +pkgrel=5 epoch=2 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, GloriousEggroll's custom build" url="https://github.com/GloriousEggroll/proton-ge-custom" @@ -30,6 +30,8 @@ depends=( 'sdl2>=2.0.16' 'lib32-sdl2>=2.0.16' libsoup lib32-libsoup libgudev lib32-libgudev + blas lib32-blas + lapack lib32-lapack desktop-file-utils python steam-native-runtime @@ -159,7 +161,7 @@ prepare() { patch -p1 -i "$srcdir"/0001-AUR-Pkgbuild-changes.patch patch -p1 -i "$srcdir"/0002-AUR-Do-not-update-cargo-crates.patch - patch -p1 -i "$srcdir"/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch + #patch -p1 -i "$srcdir"/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch patch -p1 -i "$srcdir"/0004-AUR-Copy-DLL-dependencies-of-32bit-libvkd3d-dlls-int.patch patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch } |