[proton-ge-custom] Disable gst-plugins-bad qsv

8 files changed, 40 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ac4083ac9d03..e7f19eaddc99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -186,11 +186,11 @@ pkgbase = proton-ge-custom
 	sha256sums = 08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3
 	sha256sums = 0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75
 	sha256sums = 83f65c9292137a740c4b8ea730b61cee0dbbb82e4eb3607590ba2f4377827464
-	sha256sums = 4cf125da2bdf3a5289b457089d73a6c2c25b8475d3fdf1e9917611cb6401bbeb
-	sha256sums = 99453e3e68643b2fa1e84182a6e25e5cec8031ee17fdeb6e8c205c5612dd18d1
-	sha256sums = 7010fe40d1eef828ad8696dde6dc2679e2d97d1039536b140776a86fc12e1c0d
-	sha256sums = 4471abf7dc935e36b8288d51bae8a11dc87c83635bf39ec17971f5d722ee07ea
-	sha256sums = eeee053de9dfb1eab2522ee307023538771d88c8e5526c606585659826dcd564
-	sha256sums = 7dcb882969c8d40766cf03f32b858a60f5c560357894717c0e5f920d5376c48b
+	sha256sums = 38dc4a96734cc62d22933a03f488bfe0f6113c409ed9a2ed48be589ea1a756db
+	sha256sums = 804e3b8b56477b7a73252f5771b9369b2b653302b9558e3e68e72d82ffd32133
+	sha256sums = 74edad3bb8d94cd9cca14872f498722398a604bd8e07870b4fa92f125752d189
+	sha256sums = 3ee16f02f91008663e60e0ce00fa0a2b59d89ac845c9755801c6bfabb6841792
+	sha256sums = 18d3d31bdf1f5b79bdb613560bd7a12aac3948d2b0228e3b36010bc2d1adbb73
+	sha256sums = d58b437a0a56350498b837f01cfcceb033267e1b977eea36474e6f9b99ed2cd9
 
 pkgname = proton-ge-custom
diff --git a/0001-AUR-Pkgbuild-changes.patch b/0001-AUR-Pkgbuild-changes.patch
index bfd0a82a3e32..c27d76c29734 100644
--- a/0001-AUR-Pkgbuild-changes.patch
+++ b/0001-AUR-Pkgbuild-changes.patch
@@ -1,10 +1,10 @@
-From 9a4fc83b5e88ff440481364cd6a19487df758452 Mon Sep 17 00:00:00 2001
+From 108bd702494d8b6a1cbb776c6b3801b2e0ee7c80 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/6] AUR Pkgbuild changes
 
 ---
- Makefile.in                    | 86 +++++++++++++++++++++++++++-------
+ Makefile.in                    | 87 +++++++++++++++++++++++++++-------
  compatibilitytool.vdf.template |  2 +-
  configure.sh                   |  2 +
  make/rules-autoconf.mk         |  4 +-
@@ -17,10 +17,10 @@ Subject: [PATCH 1/6] AUR Pkgbuild changes
  make/rules-winemaker.mk        |  2 +-
  proton                         |  6 +--
  toolmanifest_runtime.vdf       |  3 --
- 13 files changed, 100 insertions(+), 42 deletions(-)
+ 13 files changed, 101 insertions(+), 42 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index 256acc2b..a07dece7 100644
+index 256acc2b..b08d8b88 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -50,11 +50,12 @@ else
@@ -158,20 +158,21 @@ index 256acc2b..a07dece7 100644
  	-Dfbdev=disabled \
  	-Ddecklink=disabled \
  	-Dcurl=disabled \
-@@ -362,7 +398,12 @@ GST_BAD_MESON_ARGS := \
+@@ -362,7 +398,13 @@ GST_BAD_MESON_ARGS := \
  	-Dvoamrwbenc=disabled \
  	-Dnvcodec=disabled \
  	-Dx265=disabled \
 +	-Dopenexr=disabled \
 +	-Dzxing=disabled \
 +	-Dva=disabled \
++	-Dqsv=disabled \
 +	-Dexamples=disabled \
  	-Dtests=disabled \
 +	-Dintrospection=disabled \
  	-Dgobject-cast-checks=disabled \
  	-Dglib-asserts=disabled \
  	-Dglib-checks=disabled \
-@@ -380,6 +421,7 @@ $(eval $(call rules-meson,gst_bad,64))
+@@ -380,6 +422,7 @@ $(eval $(call rules-meson,gst_bad,64))
  ##
  
  GST_UGLY_MESON_ARGS := \
@@ -179,7 +180,7 @@ index 256acc2b..a07dece7 100644
          -Ddoc='disabled' \
  	-Dtests=disabled \
  	-Dgobject-cast-checks=disabled \
-@@ -542,6 +584,9 @@ OPENFST_CONFIGURE_ARGS = \
+@@ -542,6 +585,9 @@ OPENFST_CONFIGURE_ARGS = \
    --with-pic \
    --disable-bin \
  
@@ -189,7 +190,7 @@ index 256acc2b..a07dece7 100644
  $(eval $(call rules-source,openfst,$(SRCDIR)/openfst))
  $(eval $(call rules-autoconf,openfst,32))
  $(eval $(call rules-autoconf,openfst,64))
-@@ -604,7 +649,11 @@ WINE_SOURCE_ARGS = \
+@@ -604,7 +650,11 @@ WINE_SOURCE_ARGS = \
    --exclude dlls/winevulkan/winevulkan.spec
  
  WINE_CONFIGURE_ARGS = \
@@ -201,7 +202,7 @@ index 256acc2b..a07dece7 100644
    --disable-tests
  
  WINE_CONFIGURE_ARGS32 = \
-@@ -661,6 +710,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
+@@ -661,6 +711,9 @@ DXVK_MESON_ARGS32 = --bindir=$(DXVK_DST32)/lib/wine/dxvk
  DXVK_MESON_ARGS64 = --bindir=$(DXVK_DST64)/lib64/wine/dxvk
  DXVK_DEPENDS = glslang
  
@@ -211,7 +212,7 @@ index 256acc2b..a07dece7 100644
  $(eval $(call rules-source,dxvk,$(SRCDIR)/dxvk))
  $(eval $(call rules-meson,dxvk,32,CROSS))
  $(eval $(call rules-meson,dxvk,64,CROSS))
-@@ -688,6 +740,9 @@ $(OBJ)/.dxvk-post-build32:
+@@ -688,6 +741,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
  
@@ -221,7 +222,7 @@ index 256acc2b..a07dece7 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))
-@@ -762,6 +817,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
+@@ -762,6 +818,9 @@ ifneq ($(UNSTRIPPED_BUILD),)
  	VKD3D_PROTON_MESON_ARGS = -Denable_trace=true
  endif
  
@@ -231,7 +232,7 @@ index 256acc2b..a07dece7 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))
-@@ -1058,14 +1116,14 @@ $(FONTS_OBJ)/source-han/%.ttf: $$(%.ttf_CIDFONT) $$(%.ttf_FEATURES) $$(%.ttf_SEQ
+@@ -1058,14 +1117,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
@@ -249,7 +250,7 @@ index 256acc2b..a07dece7 100644
  	mv $@.tmp $@
  
  $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
-@@ -1075,12 +1133,12 @@ $(FONTS_OBJ)/ume-gothic/%.ttf: $$(%.ttf_FONT) $$(%.ttf_NAMETABLE_PATCH)
+@@ -1075,12 +1134,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)
@@ -265,7 +266,7 @@ index 256acc2b..a07dece7 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) \
-@@ -1206,8 +1264,8 @@ all-dist: $(DIST_OVR32) $(DIST_OVR64)
+@@ -1206,8 +1265,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
@@ -276,7 +277,7 @@ index 256acc2b..a07dece7 100644
  	rm -rf $(abspath $(DIST_PREFIX))
  	python3 $(SRCDIR)/default_pfx.py $(abspath $(DIST_PREFIX)) $(abspath $(DST_DIR))
  
-@@ -1349,7 +1407,6 @@ ifeq ($(ENABLE_CCACHE),1)
+@@ -1349,7 +1408,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
@@ -284,7 +285,7 @@ index 256acc2b..a07dece7 100644
  	override DOCKER_OPTS := $(CCACHE_ENV) -e CCACHE_DISABLE=1 $(DOCKER_OPTS)
  endif
  
-@@ -1364,9 +1421,6 @@ ifeq ($(CONTAINER_ENGINE),)
+@@ -1364,9 +1422,6 @@ ifeq ($(CONTAINER_ENGINE),)
  	CONTAINER_ENGINE := docker
  endif
  
@@ -496,7 +497,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 34bb6e9c..40cd310c 100755
+index cfe865bc..5912d15d 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 47aecc4aa203..f45ec272a562 100644
--- a/0002-AUR-Do-not-update-cargo-crates.patch
+++ b/0002-AUR-Do-not-update-cargo-crates.patch
@@ -1,4 +1,4 @@
-From feaf18422e15bc0e13c38399f0c7816c3a6fb3c4 Mon Sep 17 00:00:00 2001
+From 5efca543839b98e44435ca2f9762b2b84b162cbb 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/6] 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 4f368c183841..ac330da24349 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 a0a73ac99f986405b8bf903272a9dc29946ab8e6 Mon Sep 17 00:00:00 2001
+From db80a2a3db8b5ce6e25d482f93b6edc7eb1c9755 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/6] AUR Remove kaldi, openfst, vosk-api modules because of
@@ -9,10 +9,10 @@ Subject: [PATCH 3/6] AUR Remove kaldi, openfst, vosk-api modules because of
  1 file changed, 1 insertion(+), 81 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index a07dece7..cb1d748e 100644
+index b08d8b88..d7dd17fc 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -548,86 +548,6 @@ $(OBJ)/.steamexe-post-build64:
+@@ -549,86 +549,6 @@ $(OBJ)/.steamexe-post-build64:
  	cp $(SRC)/steam_helper/64/libsteam_api.so $(DST_LIBDIR64)/
  	touch $@
  
@@ -99,7 +99,7 @@ index a07dece7..cb1d748e 100644
  
  ##
  ## wine
-@@ -664,7 +584,7 @@ WINE_CONFIGURE_ARGS64 = --enable-win64 \
+@@ -665,7 +585,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"
  
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 f1857051010b..4d28ef78360e 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 ab8c9778e81c9029fa7146507ed09b12dbfea42f Mon Sep 17 00:00:00 2001
+From 210e85f00679ed8f3ab6acf73244a64c3d7cf752 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/6] AUR Copy DLL dependencies of 32bit libvkd3d dlls into the
@@ -20,7 +20,7 @@ a runtime dependency.
  1 file changed, 9 insertions(+)
 
 diff --git a/proton b/proton
-index 40cd310c..a3516a32 100755
+index 5912d15d..f45f461e 100755
 --- a/proton
 +++ b/proton
 @@ -1084,6 +1084,15 @@ class CompatData:
diff --git a/0005-AUR-Strip-binaries-early.patch b/0005-AUR-Strip-binaries-early.patch
index 648675a9a436..65dc16ac7be1 100644
--- a/0005-AUR-Strip-binaries-early.patch
+++ b/0005-AUR-Strip-binaries-early.patch
@@ -1,4 +1,4 @@
-From 329d2bef57b00d868f07c5921f0ea31178ea9813 Mon Sep 17 00:00:00 2001
+From 1829ddfc48a60fe4d23cffcfb20a2eddfef530dc Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Wed, 23 Aug 2023 19:31:35 +0300
 Subject: [PATCH 5/6] AUR Strip binaries early
@@ -8,7 +8,7 @@ Subject: [PATCH 5/6] AUR Strip binaries early
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index cb1d748e..1b904ece 100644
+index d7dd17fc..1a4e1751 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -54,7 +54,7 @@ CFLAGS         ?= -O2 -march=nocona -mtune=core-avx2
diff --git a/0006-AUR-Fix-hwnd-redefinition.patch b/0006-AUR-Fix-hwnd-redefinition.patch
index 9cb39e1640b9..29831e5cfb40 100644
--- a/0006-AUR-Fix-hwnd-redefinition.patch
+++ b/0006-AUR-Fix-hwnd-redefinition.patch
@@ -1,4 +1,4 @@
-From 69dbb7af66fe0e882ba4da996ff5d258b1147cd0 Mon Sep 17 00:00:00 2001
+From 6cb0bce75984ddbfafbefc175360f669417dc45c Mon Sep 17 00:00:00 2001
 From: Stelios Tsampas <loathingkernel@gmail.com>
 Date: Thu, 28 Sep 2023 14:16:04 +0300
 Subject: [PATCH 6/6] AUR: Fix hwnd redefinition
diff --git a/PKGBUILD b/PKGBUILD
index 6713dced1330..12f89ab395ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -264,12 +264,12 @@ sha256sums=('SKIP'
             '08d318f3dd6440a8a777cf044ccab039b0d9c8809991d2180eb3c9f903135db3'
             '0beac419c20ee2e68a1227b6e3fa8d59fec0274ed5e82d0da38613184716ef75'
             '83f65c9292137a740c4b8ea730b61cee0dbbb82e4eb3607590ba2f4377827464'
-            '4cf125da2bdf3a5289b457089d73a6c2c25b8475d3fdf1e9917611cb6401bbeb'
-            '99453e3e68643b2fa1e84182a6e25e5cec8031ee17fdeb6e8c205c5612dd18d1'
-            '7010fe40d1eef828ad8696dde6dc2679e2d97d1039536b140776a86fc12e1c0d'
-            '4471abf7dc935e36b8288d51bae8a11dc87c83635bf39ec17971f5d722ee07ea'
-            'eeee053de9dfb1eab2522ee307023538771d88c8e5526c606585659826dcd564'
-            '7dcb882969c8d40766cf03f32b858a60f5c560357894717c0e5f920d5376c48b')
+            '38dc4a96734cc62d22933a03f488bfe0f6113c409ed9a2ed48be589ea1a756db'
+            '804e3b8b56477b7a73252f5771b9369b2b653302b9558e3e68e72d82ffd32133'
+            '74edad3bb8d94cd9cca14872f498722398a604bd8e07870b4fa92f125752d189'
+            '3ee16f02f91008663e60e0ce00fa0a2b59d89ac845c9755801c6bfabb6841792'
+            '18d3d31bdf1f5b79bdb613560bd7a12aac3948d2b0228e3b36010bc2d1adbb73'
+            'd58b437a0a56350498b837f01cfcceb033267e1b977eea36474e6f9b99ed2cd9')
 # Optional patches
 sha256sums+=(
 )