[proton-ge-custom] Try to fix ddraw.dll

6 files changed, 20 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 43359db41663..7b0cba4f8e34 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.6
-	pkgrel = 3
+	pkgrel = 4
 	epoch = 2
 	url = https://github.com/GloriousEggroll/proton-ge-custom
 	install = proton-ge-custom.install
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index 73db6447a7c9..5fd5bfc4e472 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,10 +1,10 @@
-From b41ec35863a8d8f197dda3b509164663e0bb3db9 Mon Sep 17 00:00:00 2001
+From 7733c5aebe66b9309cb76cacfaec191a1c96e9b5 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/3] AUR Pkgbuild changes
 
 ---
- Makefile.in                    | 78 +++++++++++++++++++++++++++-------
+ Makefile.in                    | 80 ++++++++++++++++++++++++++--------
  compatibilitytool.vdf.template |  2 +-
  configure.sh                   |  2 +
  make/rules-autoconf.mk         |  4 +-
@@ -16,10 +16,10 @@ Subject: [PATCH 1/3] AUR Pkgbuild changes
  make/rules-winemaker.mk        |  2 +-
  proton                         |  6 +--
  toolmanifest_runtime.vdf       |  3 --
- 12 files changed, 90 insertions(+), 40 deletions(-)
+ 12 files changed, 91 insertions(+), 41 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 9726d2f1..cbebe144 100644
+index 9726d2f1..86278f43 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -24,7 +24,6 @@ SHELL := /bin/bash
@@ -201,6 +201,15 @@ index 9726d2f1..cbebe144 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))
+@@ -741,7 +788,7 @@ VKD3D_CONFIGURE_ARGS = \
+   --disable-demos \
+   --without-ncurses \
+ 
+-VKD3D_LDFLAGS = -static-libgcc $(CROSSLDFLAGS)
++VKD3D_LDFLAGS = -static -static-libgcc -static-libstdc++ $(CROSSLDFLAGS)
+ VKD3D_DEPENDS = vulkan-loader vulkan-headers spirv-headers
+ 
+ $(eval $(call rules-source,vkd3d,$(SRCDIR)/vkd3d))
 @@ -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
@@ -460,7 +469,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 0e6fde18..789e1cec 100755
+index 35b0d144..c581144f 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 03618900a8b0..d288b1299ad9 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From 5dafef68c2f8dce71781b6e69a69f90256a65684 Mon Sep 17 00:00:00 2001
+From 68bec939cb5080d447a9f1810a457aa71c4a9869 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/3] 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 fdbb87741bc9..875328b24676 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 060ec92c2d16339f9f9dcbf0d97ca9a5329d2620 Mon Sep 17 00:00:00 2001
+From 6bfc91a708597efeab077b37907cd8b1deae1dcb 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
@@ -19,7 +19,7 @@ This reverts commit 9c5af861877180a4a1c9966a51c7f0b7afbcabbc.
  delete mode 160000 vosk-api
 
 diff --git a/Makefile.in b/Makefile.in
-index cbebe144..ff735c90 100644
+index 86278f43..eb0248bf 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -546,81 +546,6 @@ $(OBJ)/.steamexe-post-build64:
diff --git a/PKGBUILD b/PKGBUILD
index 952d1242123a..73d8c0f1a92a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=610dead69d75fe548b4349dadb3ab04e7e466095
 pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=8.0.0
-pkgrel=3
+pkgrel=4
 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"
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index 2ba1f8769e31..c2f8b94f753c 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -6,7 +6,7 @@ _commit=610dead69d75fe548b4349dadb3ab04e7e466095
 pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=8.0.0
-pkgrel=3
+pkgrel=4
 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"