[proton-ge-custom] Version GE-Proton8-6

5 files changed, 178 insertions, 71 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 100c3b1876b5..291c0c3a55ef 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 = 3
+	pkgver = GE.Proton8.6
+	pkgrel = 1
 	epoch = 2
 	url = https://github.com/GloriousEggroll/proton-ge-custom
 	install = proton-ge-custom.install
@@ -168,7 +168,7 @@ pkgbase = proton-ge-custom
 	options = !staticlibs
 	options = !lto
 	options = emptydirs
-	source = proton-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#commit=c10e04a5b7d858dce00d7cb55ad2eb8f404162f9
+	source = proton-ge-custom::git+https://github.com/gloriouseggroll/proton-ge-custom.git#commit=610dead69d75fe548b4349dadb3ab04e7e466095
 	source = wine-valve::git+https://github.com/ValveSoftware/wine.git
 	source = dxvk::git+https://github.com/doitsujin/dxvk.git
 	source = openvr::git+https://github.com/ValveSoftware/openvr.git
@@ -191,9 +191,6 @@ pkgbase = proton-ge-custom
 	source = gst-plugins-rs::git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
 	source = dxil-spirv::git+https://github.com/HansKristian-Work/dxil-spirv.git
 	source = graphene::git+https://github.com/ebassi/graphene.git
-	source = openfst::git+https://github.com/alphacep/openfst.git
-	source = kaldi::git+https://github.com/alphacep/kaldi.git
-	source = vosk-api::git+https://github.com/alphacep/vosk-api.git
 	source = libdisplay-info-dxvk::git+https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info.git
 	source = wine-staging::git+https://github.com/wine-staging/wine-staging.git
 	source = protonfixes-gloriouseggroll::git+https://github.com/gloriouseggroll/protonfixes.git
@@ -204,7 +201,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 = 0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
 	source = fix_hwnd_changes_meaning.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
@@ -234,15 +231,12 @@ pkgbase = proton-ge-custom
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
 	sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3
 	sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75
 	sha256sums = 14c7d76780b79dc62d8ed9d1759e7adcfa332bb2406e2e694dee7b2128cc7a77
 	sha256sums = 9266599d3eccde9cf6189358c9b7e7518cbf68717260093ebee7dc886ac646cc
 	sha256sums = 3029f2ebc347c59f9dc64525e31bb0f22a05322d9dffcbe846feb44a79747c18
-	sha256sums = 66d12c661b00082233b44ed22bd44df752b92be9bee7701789e2cb9b2acb2ee0
+	sha256sums = d9b78a6879ae6d96070c947a10aa2c1818f6aecc0e7a2b34ff1a8424f320df69
 	sha256sums = 20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f
 
 pkgname = proton-ge-custom
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
new file mode 100644
index 000000000000..89ae9f778c6d
--- /dev/null
+++ b/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
@@ -0,0 +1,157 @@
+From 060ec92c2d16339f9f9dcbf0d97ca9a5329d2620 Mon Sep 17 00:00:00 2001
+From: Stelios Tsampas <loathingkernel@gmail.com>
+Date: Mon, 3 Jul 2023 12:01:24 +0300
+Subject: [PATCH 3/3] AUR Remove kaldi, openfst, vosk-api modules because of
+ missing blas, lapack lib32 from Arch
+
+Revert "build: import kaldi, openfst, vosk-api modules from upstream"
+
+This reverts commit 9c5af861877180a4a1c9966a51c7f0b7afbcabbc.
+---
+ .gitmodules | 10 -------
+ Makefile.in | 77 +----------------------------------------------------
+ kaldi       |  1 -
+ openfst     |  1 -
+ vosk-api    |  1 -
+ 5 files changed, 1 insertion(+), 89 deletions(-)
+ delete mode 160000 kaldi
+ delete mode 160000 openfst
+ delete mode 160000 vosk-api
+
+diff --git a/.gitmodules b/.gitmodules
+index cfcf0f66..a245d681 100755
+--- a/.gitmodules
++++ b/.gitmodules
+@@ -76,13 +76,3 @@
+ [submodule "glslang"]
+ 	path = glslang
+ 	url = https://github.com/KhronosGroup/glslang
+-[submodule "openfst"]
+-	path = openfst
+-	url = https://github.com/alphacep/openfst
+-[submodule "kaldi"]
+-	path = kaldi
+-	url = https://github.com/alphacep/kaldi
+-	branch = vosk
+-[submodule "vosk-api"]
+-	path = vosk-api
+-	url = https://github.com/alphacep/vosk-api
+diff --git a/Makefile.in b/Makefile.in
+index cbebe144..ff735c90 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -546,81 +546,6 @@ $(OBJ)/.steamexe-post-build64:
+ 	cp $(STEAMEXE_SRC)/64/libsteam_api.so $(DST_LIBDIR64)/
+ 	touch $@
+ 
+-##
+-## openfst
+-##
+-
+-OPENFST_SOURCE_ARGS = \
+-  --include src/include/fst/config.h.in \
+-  --exclude aclocal.m4 \
+-  --exclude ar-lib \
+-  --exclude autom4te.cache \
+-  --exclude compile \
+-  --exclude config.guess \
+-  --exclude config.h.in \
+-  --exclude config.sub \
+-  --exclude configure \
+-  --exclude depcomp \
+-  --exclude install-sh \
+-  --exclude ltmain.sh \
+-  --exclude m4/libtool.m4 \
+-  --exclude m4/ltoptions.m4 \
+-  --exclude m4/ltsugar.m4 \
+-  --exclude m4/ltversion.m4 \
+-  --exclude m4/lt~obsolete.m4 \
+-  --exclude Makefile.in \
+-  --exclude missing \
+-  --exclude test-driver \
+-
+-OPENFST_CONFIGURE_ARGS = \
+-  --enable-silent-rules \
+-  --enable-static \
+-  --disable-shared \
+-  --enable-far \
+-  --enable-ngram-fsts \
+-  --enable-lookahead-fsts \
+-  --with-pic \
+-  --disable-bin \
+-
+-$(eval $(call rules-source,openfst,$(SRCDIR)/openfst))
+-$(eval $(call rules-autoconf,openfst,32))
+-$(eval $(call rules-autoconf,openfst,64))
+-
+-
+-##
+-## kaldi
+-##
+-
+-KALDI_SOURCE_ARGS = \
+-  --exclude src/**/CMakeLists.txt \
+-
+-KALDI_CMAKE_ARGS = \
+-  -DKALDI_VERSION=5.5-proton \
+-  -DBLAS_LIBRARIES=-lblas \
+-  -DLAPACK_LIBRARIES=-llapack \
+-  -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+-  -DBUILD_SHARED_LIBS=OFF \
+-  -DKALDI_BUILD_TEST=OFF \
+-  -DKALDI_BUILD_EXE=OFF \
+-
+-KALDI_DEPENDS = openfst
+-
+-$(eval $(call rules-source,kaldi,$(SRCDIR)/kaldi))
+-$(eval $(call rules-cmake,kaldi,32))
+-$(eval $(call rules-cmake,kaldi,64))
+-
+-##
+-## vosk
+-##
+-
+-VOSK_CMAKE_ARGS = \
+-  -DBUILD_SHARED_LIBS=ON \
+-
+-VOSK_DEPENDS = openfst kaldi
+-
+-$(eval $(call rules-source,vosk,$(SRCDIR)/vosk-api))
+-$(eval $(call rules-cmake,vosk,32))
+-$(eval $(call rules-cmake,vosk,64))
+ 
+ ##
+ ## wine
+@@ -657,7 +582,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))
+diff --git a/kaldi b/kaldi
+deleted file mode 160000
+index a25f216f..00000000
+--- a/kaldi
++++ /dev/null
+@@ -1 +0,0 @@
+-Subproject commit a25f216f5ce4eec5e45a6ab7651e20c9840a05cd
+diff --git a/openfst b/openfst
+deleted file mode 160000
+index 7dfd8081..00000000
+--- a/openfst
++++ /dev/null
+@@ -1 +0,0 @@
+-Subproject commit 7dfd808194105162f20084bb4d8e4ee4b65266d5
+diff --git a/vosk-api b/vosk-api
+deleted file mode 160000
+index 12f29a34..00000000
+--- a/vosk-api
++++ /dev/null
+@@ -1 +0,0 @@
+-Subproject commit 12f29a3415e4967e088ed09202bfb0007e5a1787
+-- 
+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
deleted file mode 100644
index 3148119f2779..000000000000
--- a/0003-AUR-Remove-opensft-kaldi-and-vosk-from-build-because.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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 a52bc942cc21..496b4b3770d1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton-ge-custom
-_srctag=GE-Proton8-5
-_commit=c10e04a5b7d858dce00d7cb55ad2eb8f404162f9
+_srctag=GE-Proton8-6
+_commit=610dead69d75fe548b4349dadb3ab04e7e466095
 pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=8.0.0
-pkgrel=3
+pkgrel=1
 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"
@@ -108,9 +108,6 @@ source=(
     gst-plugins-rs::git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
     dxil-spirv::git+https://github.com/HansKristian-Work/dxil-spirv.git
     graphene::git+https://github.com/ebassi/graphene.git
-    openfst::git+https://github.com/alphacep/openfst.git
-    kaldi::git+https://github.com/alphacep/kaldi.git
-    vosk-api::git+https://github.com/alphacep/vosk-api.git
     libdisplay-info-dxvk::git+https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info.git
     wine-staging::git+https://github.com/wine-staging/wine-staging.git
     protonfixes-gloriouseggroll::git+https://github.com/gloriouseggroll/protonfixes.git
@@ -120,11 +117,11 @@ 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
+    0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
+    fix_hwnd_changes_meaning.patch
 )
 # Optional patches
 source+=(
-    fix_hwnd_changes_meaning.patch
 )
 noextract=(
     wine-gecko-${_geckover}-{x86,x86_64}.tar.xz
@@ -198,9 +195,6 @@ prepare() {
         dav1d
         gst-plugins-rs
         graphene
-        openfst
-        kaldi
-        vosk-api
         wine-staging
         protonfixes-gloriouseggroll::protonfixes
         gst-plugins-bad
@@ -257,7 +251,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"/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
     patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch
 
     # Remove repos from srcdir to save space
@@ -374,17 +368,14 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
             '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
             '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
             '14c7d76780b79dc62d8ed9d1759e7adcfa332bb2406e2e694dee7b2128cc7a77'
             '9266599d3eccde9cf6189358c9b7e7518cbf68717260093ebee7dc886ac646cc'
             '3029f2ebc347c59f9dc64525e31bb0f22a05322d9dffcbe846feb44a79747c18'
-            '66d12c661b00082233b44ed22bd44df752b92be9bee7701789e2cb9b2acb2ee0')
+            'd9b78a6879ae6d96070c947a10aa2c1818f6aecc0e7a2b34ff1a8424f320df69'
+            '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f')
 # Optional patches
 sha256sums+=(
-            '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f'
 )
 
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index b5dca0a39ee1..0f4c6ab08d8e 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -1,12 +1,12 @@
 # Maintainer: loathingkernel <loathingkernel _a_ gmail _d_ com>
 
 pkgname=proton-ge-custom
-_srctag=GE-Proton8-5
-_commit=c10e04a5b7d858dce00d7cb55ad2eb8f404162f9
+_srctag=GE-Proton8-6
+_commit=610dead69d75fe548b4349dadb3ab04e7e466095
 pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=8.0.0
-pkgrel=3
+pkgrel=1
 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"
@@ -108,9 +108,6 @@ source=(
     gst-plugins-rs::git+https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
     dxil-spirv::git+https://github.com/HansKristian-Work/dxil-spirv.git
     graphene::git+https://github.com/ebassi/graphene.git
-    openfst::git+https://github.com/alphacep/openfst.git
-    kaldi::git+https://github.com/alphacep/kaldi.git
-    vosk-api::git+https://github.com/alphacep/vosk-api.git
     libdisplay-info-dxvk::git+https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info.git
     wine-staging::git+https://github.com/wine-staging/wine-staging.git
     protonfixes-gloriouseggroll::git+https://github.com/gloriouseggroll/protonfixes.git
@@ -120,11 +117,11 @@ 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
+    0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
+    fix_hwnd_changes_meaning.patch
 )
 # Optional patches
 source+=(
-    fix_hwnd_changes_meaning.patch
 )
 noextract=(
     wine-gecko-${_geckover}-{x86,x86_64}.tar.xz
@@ -198,9 +195,6 @@ prepare() {
         dav1d
         gst-plugins-rs
         graphene
-        openfst
-        kaldi
-        vosk-api
         wine-staging
         protonfixes-gloriouseggroll::protonfixes
         gst-plugins-bad
@@ -257,7 +251,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"/0003-AUR-Remove-kaldi-openfst-vosk-api-modules-because-of.patch
     patch -p1 -i "$srcdir"/fix_hwnd_changes_meaning.patch
 
     # Remove repos from srcdir to save space
@@ -377,17 +371,14 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            'SKIP'
-            'SKIP'
             '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
             '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
             '14c7d76780b79dc62d8ed9d1759e7adcfa332bb2406e2e694dee7b2128cc7a77'
             'SKIP'
             'SKIP'
-            'SKIP')
+            'SKIP'
+            '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f')
 # Optional patches
 sha256sums+=(
-            '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f'
 )