summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO8
-rw-r--r--0001-AUR-Pkgbuild-changes.patch32
-rw-r--r--0002-AUR-Do-not-update-cargo-crates.patch6
-rw-r--r--0003-AUR-Remove-opensft-kaldi-and-vosk-from-build-because.patch26
-rw-r--r--PKGBUILD10
-rw-r--r--PKGBUILD.testing6
6 files changed, 60 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d363067b23a0..100c3b1876b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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.5
- pkgrel = 2
+ pkgrel = 3
epoch = 2
url = https://github.com/GloriousEggroll/proton-ge-custom
install = proton-ge-custom.install
@@ -204,6 +204,7 @@ pkgbase = proton-ge-custom
source = https://github.com/madewokherd/wine-mono/releases/download/wine-mono-8.0.0/wine-mono-8.0.0-x86.tar.xz
source = 0001-AUR-Pkgbuild-changes.patch
source = 0002-AUR-Do-not-update-cargo-crates.patch
+ source = 0003-AUR-Remove-opensft-kaldi-and-vosk-from-build-because.patch
source = fix_hwnd_changes_meaning.patch
sha256sums = SKIP
sha256sums = SKIP
@@ -239,8 +240,9 @@ pkgbase = proton-ge-custom
sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3
sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75
sha256sums = 14c7d76780b79dc62d8ed9d1759e7adcfa332bb2406e2e694dee7b2128cc7a77
- sha256sums = a7c82094e1ca3101a0e63c73d01728630f1333ddade38088fadc3bdc9527e0cd
- sha256sums = 6db2946f8125c5b3216f4fc6493ef090eb84311f889ee3225c2c7178af989b69
+ sha256sums = 9266599d3eccde9cf6189358c9b7e7518cbf68717260093ebee7dc886ac646cc
+ sha256sums = 3029f2ebc347c59f9dc64525e31bb0f22a05322d9dffcbe846feb44a79747c18
+ sha256sums = 66d12c661b00082233b44ed22bd44df752b92be9bee7701789e2cb9b2acb2ee0
sha256sums = 20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f
pkgname = proton-ge-custom
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 3456b6bd998a..73db6447a7c9 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,7 +1,7 @@
-From 5bba6921f77f08de4c4c17fc74718cc1ae7b7bf8 Mon Sep 17 00:00:00 2001
+From b41ec35863a8d8f197dda3b509164663e0bb3db9 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/2] AUR Pkgbuild changes
+Subject: [PATCH 1/3] AUR Pkgbuild changes
---
Makefile.in | 78 +++++++++++++++++++++++++++-------
@@ -19,7 +19,7 @@ Subject: [PATCH 1/2] AUR Pkgbuild changes
12 files changed, 90 insertions(+), 40 deletions(-)
diff --git a/Makefile.in b/Makefile.in
-index 7ee81fe9..bc5d0131 100644
+index 9726d2f1..cbebe144 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,7 +24,6 @@ SHELL := /bin/bash
@@ -169,7 +169,7 @@ index 7ee81fe9..bc5d0131 100644
-Ddoc='disabled' \
-Dtests=disabled \
-Dgobject-cast-checks=disabled \
-@@ -530,7 +567,11 @@ WINE_SOURCE_ARGS = \
+@@ -605,7 +642,11 @@ WINE_SOURCE_ARGS = \
--exclude dlls/winevulkan/winevulkan.spec
WINE_CONFIGURE_ARGS = \
@@ -181,7 +181,7 @@ index 7ee81fe9..bc5d0131 100644
--disable-tests
WINE_CONFIGURE_ARGS32 = \
-@@ -600,6 +641,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
+@@ -675,6 +716,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
DXVK_DEPENDS = glslang
@@ -191,7 +191,7 @@ index 7ee81fe9..bc5d0131 100644
$(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
$(eval $(call rules-meson,dxvk,32,CROSS))
$(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -622,6 +666,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -702,6 +746,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
@@ -201,7 +201,7 @@ index 7ee81fe9..bc5d0131 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))
-@@ -692,6 +739,9 @@ VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton
+@@ -772,6 +819,9 @@ VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton
VKD3D_PROTON_MESON_ARGS64 = --bindir=$(VKD3D_PROTON_DST64)/lib64/wine/vkd3d-proton
VKD3D_PROTON_DEPENDS = glslang
@@ -211,7 +211,7 @@ index 7ee81fe9..bc5d0131 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))
-@@ -947,14 +997,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -1031,14 +1081,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
@@ -229,7 +229,7 @@ index 7ee81fe9..bc5d0131 100644
mv $@.tmp $@
$(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -964,12 +1014,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -1048,12 +1098,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)
@@ -245,7 +245,7 @@ index 7ee81fe9..bc5d0131 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) \
-@@ -1095,8 +1145,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1179,8 +1229,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
@@ -256,7 +256,7 @@ index 7ee81fe9..bc5d0131 100644
rm -rf $(abspath $(DIST_PREFIX))
python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
-@@ -1238,7 +1288,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1322,7 +1372,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
@@ -264,7 +264,7 @@ index 7ee81fe9..bc5d0131 100644
override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
endif
-@@ -1253,9 +1302,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1337,9 +1386,6 @@ ifeq ($(CONTAINER_ENGINE),)
CONTAINER_ENGINE := docker
endif
@@ -460,7 +460,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 9b4a92b0..4908dc48 100755
+index 0e6fde18..789e1cec 100755
--- a/proton
+++ b/proton
@@ -423,7 +423,6 @@ class Proton:
@@ -471,7 +471,7 @@ index 9b4a92b0..4908dc48 100755
def path(self, d):
return self.base_dir + d
-@@ -1798,8 +1797,6 @@ if __name__ == "__main__":
+@@ -1827,8 +1826,6 @@ if __name__ == "__main__":
g_proton = Proton(os.path.dirname(sys.argv[0]))
@@ -480,7 +480,7 @@ index 9b4a92b0..4908dc48 100755
g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
-@@ -1808,7 +1805,8 @@ if __name__ == "__main__":
+@@ -1837,7 +1834,8 @@ if __name__ == "__main__":
g_session.init_wine()
if g_proton.missing_default_prefix():
@@ -503,5 +503,5 @@ index beddcbbb..b6f36788 100644
- "compatmanager_layer_name" "proton"
}
--
-2.40.1
+2.41.0
diff --git a/0002-AUR-Do-not-update-cargo-crates.patch b/0002-AUR-Do-not-update-cargo-crates.patch
index 14875d2f14ba..03618900a8b0 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,7 +1,7 @@
-From a8506047216baa6f0000ffa67fd2e52247c147be Mon Sep 17 00:00:00 2001
+From 5dafef68c2f8dce71781b6e69a69f90256a65684 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/2] AUR Do not update cargo crates
+Subject: [PATCH 2/3] AUR Do not update cargo crates
---
make/rules-cargo.mk | 2 --
@@ -21,5 +21,5 @@ index 45bd7381..11e36c1d 100644
-j$$(SUBJOBS) --locked --offline --verbose \
--target "$$(CARGO_TARGET_$(3))" \
--
-2.40.1
+2.41.0
diff --git a/0003-AUR-Remove-opensft-kaldi-and-vosk-from-build-because.patch b/0003-AUR-Remove-opensft-kaldi-and-vosk-from-build-because.patch
new file mode 100644
index 000000000000..3148119f2779
--- /dev/null
+++ b/0003-AUR-Remove-opensft-kaldi-and-vosk-from-build-because.patch
@@ -0,0 +1,26 @@
+From 491d08c9b39c24327afe3f90727f0640035ca474 Mon Sep 17 00:00:00 2001
+From: Stelios Tsampas <loathingkernel@gmail.com>
+Date: Sun, 2 Jul 2023 21:27:37 +0300
+Subject: [PATCH 3/3] AUR Remove opensft kaldi and vosk from build because of
+ missing lib32 blas and lapack from repo and the AUR
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index cbebe144..c897b93b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -657,7 +657,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"
+
+-WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d openfst kaldi vosk
++WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d
+
+ $(eval $(call rules-source,wine,$(SRCDIR)/wine))
+ $(eval $(call rules-autoconf,wine,32))
+--
+2.41.0
+
diff --git a/PKGBUILD b/PKGBUILD
index cf7b2aa7155f..a52bc942cc21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=c10e04a5b7d858dce00d7cb55ad2eb8f404162f9
pkgver=${_srctag//-/.}
_geckover=2.47.3
_monover=8.0.0
-pkgrel=2
+pkgrel=3
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"
@@ -120,6 +120,7 @@ source=(
https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${_monover}/wine-mono-${_monover}-x86.tar.xz
0001-AUR-Pkgbuild-changes.patch
0002-AUR-Do-not-update-cargo-crates.patch
+ 0003-AUR-Remove-opensft-kaldi-and-vosk-from-build-because.patch
)
# Optional patches
source+=(
@@ -256,7 +257,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-opensft-kaldi-and-vosk-from-build-because.patch
patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch
# Remove repos from srcdir to save space
@@ -379,8 +380,9 @@ sha256sums=('SKIP'
'08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
'0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
'14c7d76780b79dc62d8ed9d1759e7adcfa332bb2406e2e694dee7b2128cc7a77'
- 'a7c82094e1ca3101a0e63c73d01728630f1333ddade38088fadc3bdc9527e0cd'
- '6db2946f8125c5b3216f4fc6493ef090eb84311f889ee3225c2c7178af989b69')
+ '9266599d3eccde9cf6189358c9b7e7518cbf68717260093ebee7dc886ac646cc'
+ '3029f2ebc347c59f9dc64525e31bb0f22a05322d9dffcbe846feb44a79747c18'
+ '66d12c661b00082233b44ed22bd44df752b92be9bee7701789e2cb9b2acb2ee0')
# Optional patches
sha256sums+=(
'20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f'
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index bb562d51bccc..b5dca0a39ee1 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -6,7 +6,7 @@ _commit=c10e04a5b7d858dce00d7cb55ad2eb8f404162f9
pkgver=${_srctag//-/.}
_geckover=2.47.3
_monover=8.0.0
-pkgrel=2
+pkgrel=3
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"
@@ -120,6 +120,7 @@ source=(
https://github.com/madewokherd/wine-mono/releases/download/wine-mono-${_monover}/wine-mono-${_monover}-x86.tar.xz
0001-AUR-Pkgbuild-changes.patch
0002-AUR-Do-not-update-cargo-crates.patch
+ 0003-AUR-Remove-opensft-kaldi-and-vosk-from-build-because.patch
)
# Optional patches
source+=(
@@ -256,7 +257,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-opensft-kaldi-and-vosk-from-build-because.patch
patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch
# Remove repos from srcdir to save space
@@ -383,6 +384,7 @@ sha256sums=('SKIP'
'0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
'14c7d76780b79dc62d8ed9d1759e7adcfa332bb2406e2e694dee7b2128cc7a77'
'SKIP'
+ 'SKIP'
'SKIP')
# Optional patches
sha256sums+=(