[proton-ge-custom] Remove deprecated vkd3d-proton option

4 files changed, 31 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d53ea7b982e3..0ac7529ccb9a 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.Proton7.42
-	pkgrel = 3
+	pkgrel = 4
 	epoch = 2
 	url = https://github.com/GloriousEggroll/proton-ge-custom
 	install = proton-ge-custom.install
@@ -279,6 +279,6 @@ pkgbase = proton-ge-custom
 	sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3
 	sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75
 	sha256sums = 9249ece664bcf2fecb1308ea1d2542c72923df9fe3df891986f137b2266a9ba3
-	sha256sums = b2cc798fe8a7b8a482db058930d526d30237839eada28cc2262a86270731d2f7
+	sha256sums = 7ffc91ada69c8cdaceeac3cfa2fa27c42c8498cd51cd8993c4ac00926eb6afd0
 
 pkgname = proton-ge-custom
diff --git a/0001-AUR-pkgbuild-changes.patch b/0001-AUR-pkgbuild-changes.patch
index 59ea4aa17bfb..4bfb8e1c8687 100644
--- a/0001-AUR-pkgbuild-changes.patch
+++ b/0001-AUR-pkgbuild-changes.patch
@@ -1,10 +1,10 @@
-From ae2534b0d7d4c81ec77c6f34770519fdde5ba365 Mon Sep 17 00:00:00 2001
+From 894e1c71ab605878be140a5f288ab270110c170f Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Mon, 27 Jun 2022 01:26:56 +0300
 Subject: [PATCH] AUR pkgbuild changes
 
 ---
- Makefile.in                    | 74 +++++++++++++++++++++++++++++-----
+ Makefile.in                    | 73 +++++++++++++++++++++++++++++-----
  compatibilitytool.vdf.template |  2 +-
  configure.sh                   |  2 +
  make/rules-autoconf.mk         |  4 +-
@@ -15,10 +15,10 @@ Subject: [PATCH] AUR pkgbuild changes
  make/rules-meson.mk            |  3 +-
  make/rules-winemaker.mk        |  2 +-
  proton                         |  6 +--
- 11 files changed, 91 insertions(+), 32 deletions(-)
+ 11 files changed, 90 insertions(+), 32 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 5ad5b576..be92bc8f 100644
+index f356ed56..722d29a6 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -63,7 +63,6 @@ ifeq ($(ENABLE_CCACHE),1)
@@ -88,7 +88,7 @@ index 5ad5b576..be92bc8f 100644
  	-Dorc-test=disabled \
  	-Dexamples=disabled \
  	-Dtests=disabled \
-@@ -457,10 +472,14 @@ $(eval $(call rules-meson,gst_orc,64))
+@@ -456,10 +471,14 @@ $(eval $(call rules-meson,gst_orc,64))
  ##
  
  GSTREAMER_MESON_ARGS := \
@@ -102,8 +102,8 @@ index 5ad5b576..be92bc8f 100644
 +	-Ddbghelp=disabled \
  	-Dexamples=disabled \
  	-Dtests=disabled \
- 	-Dgtk_doc=disabled \
-@@ -482,6 +501,11 @@ $(eval $(call rules-meson,gstreamer,64))
+ 	-Dintrospection=disabled \
+@@ -480,6 +499,11 @@ $(eval $(call rules-meson,gstreamer,64))
  ## graphene
  ##
  
@@ -115,7 +115,7 @@ index 5ad5b576..be92bc8f 100644
  $(eval $(call rules-source,graphene,$(SRCDIR)/graphene))
  $(eval $(call rules-meson,graphene,32))
  $(eval $(call rules-meson,graphene,64))
-@@ -492,6 +516,9 @@ $(eval $(call rules-meson,graphene,64))
+@@ -490,6 +514,9 @@ $(eval $(call rules-meson,graphene,64))
  ##
  
  GST_BASE_MESON_ARGS := \
@@ -125,7 +125,7 @@ index 5ad5b576..be92bc8f 100644
  	-Dalsa=disabled \
  	-Daudiomixer=disabled \
  	-Daudiorate=disabled \
-@@ -535,6 +562,8 @@ $(eval $(call rules-meson,gst_base,64))
+@@ -533,6 +560,8 @@ $(eval $(call rules-meson,gst_base,64))
  ##
  
  GST_GOOD_MESON_ARGS := \
@@ -134,7 +134,7 @@ index 5ad5b576..be92bc8f 100644
  	-Daalib=disabled \
  	-Dalpha=disabled \
  	-Dapetag=disabled \
-@@ -609,6 +638,7 @@ $(eval $(call rules-meson,gst_good,64))
+@@ -607,6 +636,7 @@ $(eval $(call rules-meson,gst_good,64))
  
  FFMPEG_CONFIGURE_ARGS := \
  	--enable-shared \
@@ -142,7 +142,7 @@ index 5ad5b576..be92bc8f 100644
  	--disable-static \
  	--disable-everything \
  	--disable-programs \
-@@ -632,6 +662,9 @@ FFMPEG_CONFIGURE_ARGS := \
+@@ -630,6 +660,9 @@ FFMPEG_CONFIGURE_ARGS := \
  	--enable-decoder=aac \
  	--enable-demuxer=xwma
  
@@ -152,7 +152,7 @@ index 5ad5b576..be92bc8f 100644
  $(eval $(call rules-source,ffmpeg,$(SRCDIR)/FFmpeg))
  $(eval $(call rules-configure,ffmpeg,32))
  $(eval $(call rules-configure,ffmpeg,64))
-@@ -676,6 +709,8 @@ $(OBJ)/.gst_plugins_rs-post-build32:
+@@ -674,6 +707,8 @@ $(OBJ)/.gst_plugins_rs-post-build32:
  ##
  
  GST_BAD_MESON_ARGS := \
@@ -161,7 +161,7 @@ index 5ad5b576..be92bc8f 100644
  	-Dfbdev=disabled \
  	-Ddecklink=disabled \
  	-Dcurl=disabled \
-@@ -695,7 +730,9 @@ GST_BAD_MESON_ARGS := \
+@@ -693,7 +728,9 @@ GST_BAD_MESON_ARGS := \
  	-Dvoamrwbenc=disabled \
  	-Dnvcodec=disabled \
  	-Dx265=disabled \
@@ -171,7 +171,7 @@ index 5ad5b576..be92bc8f 100644
  	-Dgobject-cast-checks=disabled \
  	-Dglib-asserts=disabled \
  	-Dglib-checks=disabled \
-@@ -713,6 +750,7 @@ $(eval $(call rules-meson,gst_bad,64))
+@@ -711,6 +748,7 @@ $(eval $(call rules-meson,gst_bad,64))
  ##
  
  GST_UGLY_MESON_ARGS := \
@@ -179,7 +179,7 @@ index 5ad5b576..be92bc8f 100644
          -Ddoc='disabled' \
  	-Dtests=disabled \
  	-Dgobject-cast-checks=disabled \
-@@ -888,7 +926,11 @@ WINE_SOURCE_ARGS = \
+@@ -886,7 +924,11 @@ WINE_SOURCE_ARGS = \
    --exclude include/config.h.in \
  
  WINE_CONFIGURE_ARGS = \
@@ -191,7 +191,7 @@ index 5ad5b576..be92bc8f 100644
    --disable-tests
  
  WINE_CONFIGURE_ARGS64 = --enable-win64
-@@ -952,6 +994,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
+@@ -950,6 +992,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
  DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
  DXVK_DEPENDS = glslang
  
@@ -201,7 +201,7 @@ index 5ad5b576..be92bc8f 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -974,6 +1019,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -972,6 +1017,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
  
@@ -211,12 +211,7 @@ index 5ad5b576..be92bc8f 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))
-@@ -1037,10 +1085,14 @@ VKD3D_PROTON_SOURCE_ARGS = \
-   --exclude vkd3d_build.h.in \
-   --exclude vkd3d_version.h.in \
- 
-+VKD3D_PROTON_MESON_ARGS = -Denable_d3d12=true
- VKD3D_PROTON_MESON_ARGS32 = --bindir=$(VKD3D_PROTON_DST32)/lib/wine/vkd3d-proton
+@@ -1039,6 +1087,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
  
@@ -226,7 +221,7 @@ index 5ad5b576..be92bc8f 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))
-@@ -1278,14 +1330,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -1276,14 +1327,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
@@ -244,7 +239,7 @@ index 5ad5b576..be92bc8f 100644
  	mv $@.tmp $@
  
  $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -1295,10 +1347,10 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -1293,10 +1344,10 @@ $(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)
@@ -271,7 +266,7 @@ index 5ac60e8b..e580cd20 100644
        "from_oslist"  "windows"
        "to_oslist"    "linux"
 diff --git a/configure.sh b/configure.sh
-index 68168bff..09cd2b7f 100755
+index 70d45204..00ae3407 100755
 --- a/configure.sh
 +++ b/configure.sh
 @@ -126,6 +126,7 @@ function configure() {
@@ -443,10 +438,10 @@ index 69688a03..1c0d1d3b 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 dfeab12a..2a58d345 100755
+index 83a20563..79f8ede1 100755
 --- a/proton
 +++ b/proton
-@@ -417,7 +417,6 @@ class Proton:
+@@ -423,7 +423,6 @@ class Proton:
          self.wine_bin = self.bin_dir + "wine"
          self.wine64_bin = self.bin_dir + "wine64"
          self.wineserver_bin = self.bin_dir + "wineserver"
@@ -454,7 +449,7 @@ index dfeab12a..2a58d345 100755
  
      def path(self, d):
          return self.base_dir + d
-@@ -1693,8 +1692,6 @@ if __name__ == "__main__":
+@@ -1793,8 +1792,6 @@ if __name__ == "__main__":
  
      g_proton = Proton(os.path.dirname(sys.argv[0]))
  
@@ -463,7 +458,7 @@ index dfeab12a..2a58d345 100755
  
      g_compatdata = CompatData(os.environ["STEAM_COMPAT_DATA_PATH"])
  
-@@ -1703,7 +1700,8 @@ if __name__ == "__main__":
+@@ -1803,7 +1800,8 @@ if __name__ == "__main__":
      g_session.init_wine()
  
      if g_proton.missing_default_prefix():
@@ -474,5 +469,5 @@ index dfeab12a..2a58d345 100755
      g_session.init_session(sys.argv[1] != "runinprefix")
  
 -- 
-2.37.3
+2.38.1
 
diff --git a/PKGBUILD b/PKGBUILD
index f896c1a0c414..651087af9a7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ _commit=
 pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=7.4.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"
@@ -389,4 +389,4 @@ sha256sums=('SKIP'
             '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
             '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
             '9249ece664bcf2fecb1308ea1d2542c72923df9fe3df891986f137b2266a9ba3'
-            'b2cc798fe8a7b8a482db058930d526d30237839eada28cc2262a86270731d2f7')
+            '7ffc91ada69c8cdaceeac3cfa2fa27c42c8498cd51cd8993c4ac00926eb6afd0')
diff --git a/PKGBUILD.testing b/PKGBUILD.testing
index 1758223ffa10..0c90ce73ba6b 100644
--- a/PKGBUILD.testing
+++ b/PKGBUILD.testing
@@ -6,7 +6,7 @@ _commit=
 pkgver=${_srctag//-/.}
 _geckover=2.47.3
 _monover=7.4.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"