[proton-ge-custom] Fix some patch problems

5 files changed, 19 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3310a1d58895..b79d17b49bfc 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.7
-	pkgrel = 5
+	pkgrel = 6
 	epoch = 2
 	url = https://github.com/GloriousEggroll/proton-ge-custom
 	install = proton-ge-custom.install
@@ -186,8 +186,8 @@ pkgbase = proton-ge-custom
 	sha256sums = 14c7d76780b79dc62d8ed9d1759e7adcfa332bb2406e2e694dee7b2128cc7a77
 	sha256sums = 65238d0d045d87d2192ce5e33ed91aba7b6af23ccf509d802ace183a5df50bfc
 	sha256sums = f93d3559ee6580f2d8acefd2c94bcafffd26ef6e7943627ba93967cc96fbcf1d
-	sha256sums = f7993414c472a5307301714e90180d3becfb044dfb9b5650901365bf4b0685fd
-	sha256sums = 7540ee3290aa290e1c37f9054342e548026bb371a970ba9dfe5e120af5e5764e
+	sha256sums = 94458e34e592d81eab7ec9f1b1d2123cdaaaf3c1008bff26ad0e70ce7f18fe39
+	sha256sums = cfb8bb9e2bc32e0eaa8db381466f1bc6ac24456bc384fb0d84de50f4e7962150
 	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
index 203b54f98af5..3dfaa381d071 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,15 +1,15 @@
-From 97ee1c8416c2f8f3623ac2a87b91d7c059c19688 Mon Sep 17 00:00:00 2001
+From 307e69559597875c98f3bc28f0d7c5bf6b3605a0 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 | 92 ++++-------------------------------------------------
- 1 file changed, 6 insertions(+), 86 deletions(-)
+ Makefile.in | 82 +----------------------------------------------------
+ 1 file changed, 1 insertion(+), 81 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 149f9f62..1f5476b0 100644
+index 149f9f62..97315b19 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -551,86 +551,6 @@ $(OBJ)/.steamexe-post-build64:
@@ -99,39 +99,15 @@ index 149f9f62..1f5476b0 100644
  
  ##
  ## wine
-@@ -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
+@@ -667,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"
  
--DXVK_CPPFLAGS = -msse -msse2
--DXVK_LDFLAGS = -static -static-libgcc -static-libstdc++
-+DXVK_CPPFLAGS= -msse -msse2
-+DXVK_LDFLAGS= -static -static-libgcc -static-libstdc++
+-WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d openfst kaldi vosk
++WINE_DEPENDS = gst_orc gstreamer gst_base vkd3d
  
- $(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
- 
--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-source,wine,$(SRCDIR)/wine))
+ $(eval $(call rules-autoconf,wine,32))
 -- 
 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 68d351e44ef1..f3deb3b4abc5 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 cd28379b49eab5907fc0cf0fa73eb26843b32db7 Mon Sep 17 00:00:00 2001
+From 87c5ef5c9e783e83b5a9430ac129233398c3e3d1 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
diff --git a/PKGBUILD b/PKGBUILD
index 5c5d375067b9..adaa9611dc16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=c03528a75cb317aa19a8e65bbe5c82416ee16594
 pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=8.0.0
-pkgrel=5
+pkgrel=6
 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"
@@ -261,8 +261,8 @@ sha256sums=('SKIP'
             '14c7d76780b79dc62d8ed9d1759e7adcfa332bb2406e2e694dee7b2128cc7a77'
             '65238d0d045d87d2192ce5e33ed91aba7b6af23ccf509d802ace183a5df50bfc'
             'f93d3559ee6580f2d8acefd2c94bcafffd26ef6e7943627ba93967cc96fbcf1d'
-            'f7993414c472a5307301714e90180d3becfb044dfb9b5650901365bf4b0685fd'
-            '7540ee3290aa290e1c37f9054342e548026bb371a970ba9dfe5e120af5e5764e'
+            '94458e34e592d81eab7ec9f1b1d2123cdaaaf3c1008bff26ad0e70ce7f18fe39'
+            'cfb8bb9e2bc32e0eaa8db381466f1bc6ac24456bc384fb0d84de50f4e7962150'
             '20824bb565fefcad4aa978c54e0f8b9d9d17b7b52fb03fc87943150de148f06f')
 # Optional patches
 sha256sums+=(
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index 42ec3070fc8d..a1020608c882 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -6,7 +6,7 @@ _commit=c03528a75cb317aa19a8e65bbe5c82416ee16594
 pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=8.0.0
-pkgrel=5
+pkgrel=6
 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"