From 4a4ebec642561458a5209e6a9186cf8440f14f1c Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 5 May 2017 20:34:33 +0200
Subject: [PATCH] dxva2-Video_Decoder: Remove dependency on winecfg-Staging
 patchset.

---
 patches/dxva2-Video_Decoder/definition |  2 -
 patches/patchinstall.sh                | 52 +++++++++++---------------
 2 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/patches/dxva2-Video_Decoder/definition b/patches/dxva2-Video_Decoder/definition
index c3d4ed7a..eff3ac2e 100644
--- a/patches/dxva2-Video_Decoder/definition
+++ b/patches/dxva2-Video_Decoder/definition
@@ -1,4 +1,2 @@
 Fixes: Support for MPEG2 DXVA2 GPU video decoding through vaapi
 Fixes: Support for H264 DXVA2 GPU video decoding through vaapi
-Depends: winecfg-Staging
-
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 5273f369..ea8405ff 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -2422,13 +2422,6 @@ if test "$enable_imagehlp_ImageLoad" -eq 1; then
 	enable_imagehlp_Cleanup=1
 fi
 
-if test "$enable_dxva2_Video_Decoder" -eq 1; then
-	if test "$enable_winecfg_Staging" -gt 1; then
-		abort "Patchset winecfg-Staging disabled, but dxva2-Video_Decoder depends on that."
-	fi
-	enable_winecfg_Staging=1
-fi
-
 if test "$enable_dxdiagn_GetChildContainer_Leaf_Nodes" -eq 1; then
 	if test "$enable_dxdiagn_Enumerate_DirectSound" -gt 1; then
 		abort "Patchset dxdiagn-Enumerate_DirectSound disabled, but dxdiagn-GetChildContainer_Leaf_Nodes depends on that."
@@ -4152,32 +4145,8 @@ if test "$enable_dxgi_MakeWindowAssociation" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset winecfg-Staging
-# |
-# | Modified files:
-# |   *	programs/winecfg/Makefile.in, programs/winecfg/about.c, programs/winecfg/main.c, programs/winecfg/resource.h,
-# | 	programs/winecfg/staging.c, programs/winecfg/winecfg.h, programs/winecfg/winecfg.rc
-# |
-if test "$enable_winecfg_Staging" -eq 1; then
-	patch_apply winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch
-	patch_apply winecfg-Staging/0002-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch
-	patch_apply winecfg-Staging/0003-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch
-	patch_apply winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch
-	patch_apply winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch
-	(
-		printf '%s\n' '+    { "Michael Müller", "winecfg: Add staging tab for CSMT.", 1 },';
-		printf '%s\n' '+    { "Sebastian Lackner", "winecfg: Add checkbox to enable/disable vaapi GPU decoder.", 1 },';
-		printf '%s\n' '+    { "Mark Harmstone", "winecfg: Add checkbox to enable/disable EAX support.", 1 },';
-		printf '%s\n' '+    { "Sebastian Lackner", "winecfg: Add checkbox to enable/disable HideWineExports registry key.", 1 },';
-		printf '%s\n' '+    { "Michael Müller", "winecfg: Add option to enable/disable GTK3 theming.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset dxva2-Video_Decoder
 # |
-# | This patchset has the following (direct or indirect) dependencies:
-# |   *	winecfg-Staging
-# |
 # | Modified files:
 # |   *	configure.ac, dlls/dxva2/Makefile.in, dlls/dxva2/backend.idl, dlls/dxva2/devicemanager.c, dlls/dxva2/dxva2_private.h,
 # | 	dlls/dxva2/genericdecoder.c, dlls/dxva2/main.c, dlls/dxva2/softwareprocessor.c, dlls/dxva2/tests/Makefile.in,
@@ -8544,6 +8513,27 @@ if test "$enable_winecfg_Libraries" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset winecfg-Staging
+# |
+# | Modified files:
+# |   *	programs/winecfg/Makefile.in, programs/winecfg/about.c, programs/winecfg/main.c, programs/winecfg/resource.h,
+# | 	programs/winecfg/staging.c, programs/winecfg/winecfg.h, programs/winecfg/winecfg.rc
+# |
+if test "$enable_winecfg_Staging" -eq 1; then
+	patch_apply winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch
+	patch_apply winecfg-Staging/0002-winecfg-Add-checkbox-to-enable-disable-vaapi-GPU-dec.patch
+	patch_apply winecfg-Staging/0003-winecfg-Add-checkbox-to-enable-disable-EAX-support.patch
+	patch_apply winecfg-Staging/0004-winecfg-Add-checkbox-to-enable-disable-HideWineExpor.patch
+	patch_apply winecfg-Staging/0005-winecfg-Add-option-to-enable-disable-GTK3-theming.patch
+	(
+		printf '%s\n' '+    { "Michael Müller", "winecfg: Add staging tab for CSMT.", 1 },';
+		printf '%s\n' '+    { "Sebastian Lackner", "winecfg: Add checkbox to enable/disable vaapi GPU decoder.", 1 },';
+		printf '%s\n' '+    { "Mark Harmstone", "winecfg: Add checkbox to enable/disable EAX support.", 1 },';
+		printf '%s\n' '+    { "Sebastian Lackner", "winecfg: Add checkbox to enable/disable HideWineExports registry key.", 1 },';
+		printf '%s\n' '+    { "Michael Müller", "winecfg: Add option to enable/disable GTK3 theming.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset winecfg-Unmounted_Devices
 # |
 # | Modified files: