winepulse-PulseAudio_Support: Drop patch to use delay import for winealsa.drv.

This patch is not targetting any specific bug.

patches/patchinstall.sh

@@ -7140,19 +7140,17 @@ fi
 # |   *	[#37042] Implement exclusive mode in PulseAudio backend
 # |
 # | Modified files:
-# |   *	configure.ac, dlls/winealsa.drv/Makefile.in, dlls/winepulse.drv/Makefile.in, dlls/winepulse.drv/mmdevdrv.c
+# |   *	dlls/winepulse.drv/Makefile.in, dlls/winepulse.drv/mmdevdrv.c
 # |
 if test "$enable_winepulse_PulseAudio_Support" -eq 1; then
-	patch_apply winepulse-PulseAudio_Support/0001-winepulse.drv-Use-delay-import-for-winealsa.drv.patch
-	patch_apply winepulse-PulseAudio_Support/0002-winepulse.drv-Use-a-separate-mainloop-and-ctx-for-pu.patch
-	patch_apply winepulse-PulseAudio_Support/0003-winepulse-expose-audio-devices-directly-to-programs.patch
-	patch_apply winepulse-PulseAudio_Support/0004-winepulse-implement-exclusive-mode.patch
-	patch_apply winepulse-PulseAudio_Support/0005-winepulse-fix-segfault-in-pulse_rd_loop.patch
-	patch_apply winepulse-PulseAudio_Support/0006-winepulse-implement-GetPropValue.patch
-	patch_apply winepulse-PulseAudio_Support/0007-winepulse-fetch-actual-program-name-if-possible.patch
-	patch_apply winepulse-PulseAudio_Support/0008-winepulse-return-PKEY_AudioEndpoint_PhysicalSpeakers.patch
+	patch_apply winepulse-PulseAudio_Support/0001-winepulse.drv-Use-a-separate-mainloop-and-ctx-for-pu.patch
+	patch_apply winepulse-PulseAudio_Support/0002-winepulse-expose-audio-devices-directly-to-programs.patch
+	patch_apply winepulse-PulseAudio_Support/0003-winepulse-implement-exclusive-mode.patch
+	patch_apply winepulse-PulseAudio_Support/0004-winepulse-fix-segfault-in-pulse_rd_loop.patch
+	patch_apply winepulse-PulseAudio_Support/0005-winepulse-implement-GetPropValue.patch
+	patch_apply winepulse-PulseAudio_Support/0006-winepulse-fetch-actual-program-name-if-possible.patch
+	patch_apply winepulse-PulseAudio_Support/0007-winepulse-return-PKEY_AudioEndpoint_PhysicalSpeakers.patch
 	(
-		echo '+    { "Sebastian Lackner", "winepulse.drv: Use delay import for winealsa.drv.", 1 },';
 		echo '+    { "Sebastian Lackner", "winepulse.drv: Use a separate mainloop and ctx for pulse_test_connect.", 1 },';
 		echo '+    { "Mark Harmstone", "winepulse: Expose audio devices directly to programs.", 1 },';
 		echo '+    { "Mark Harmstone", "winepulse: Implement exclusive mode.", 1 },';

patches/winepulse-PulseAudio_Support/0001-winepulse.drv-Use-delay-import-for-winealsa.drv.patch

@@ -1,46 +0,0 @@
-From 29b49ce62019b7cbd268336db2794af1176205a2 Mon Sep 17 00:00:00 2001
-From: Sebastian Lackner <sebastian@fds-team.de>
-Date: Wed, 4 Nov 2015 02:20:43 +0100
-Subject: winepulse.drv: Use delay import for winealsa.drv.
-
----
- configure.ac                   | 2 +-
- dlls/winealsa.drv/Makefile.in  | 1 +
- dlls/winepulse.drv/Makefile.in | 1 +
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 68fd411..33f02b7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3404,5 +3404,5 @@ WINE_CONFIG_TEST(dlls/windowscodecs/tests)
- WINE_CONFIG_DLL(windowscodecsext,,[implib])
- WINE_CONFIG_TEST(dlls/windowscodecsext/tests)
--WINE_CONFIG_DLL(winealsa.drv)
-+WINE_CONFIG_DLL(winealsa.drv,,[implib])
- WINE_CONFIG_DLL(winecoreaudio.drv)
- WINE_CONFIG_LIB(winecrt0)
-diff --git a/dlls/winealsa.drv/Makefile.in b/dlls/winealsa.drv/Makefile.in
-index 3158371..1fec37f 100644
---- a/dlls/winealsa.drv/Makefile.in
-+++ b/dlls/winealsa.drv/Makefile.in
-@@ -1,4 +1,5 @@
- MODULE    = winealsa.drv
-+IMPORTLIB = winealsa.drv
- IMPORTS   = uuid ole32 advapi32
- DELAYIMPORTS = winmm
- EXTRALIBS = $(ALSA_LIBS)
-diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
-index d660063..5671c0d 100644
---- a/dlls/winepulse.drv/Makefile.in
-+++ b/dlls/winepulse.drv/Makefile.in
-@@ -1,5 +1,6 @@
- MODULE    = winepulse.drv
- IMPORTS   = dxguid uuid winmm user32 advapi32 ole32
-+DELAYIMPORTS = winealsa.drv
- EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS)
- EXTRAINCL = $(PULSE_CFLAGS)
- 
--- 
-2.6.2
-

patches/winepulse-PulseAudio_Support/0006-winepulse-fetch-actual-program-name-if-possible.patch

@@ -1,4 +1,4 @@
-From 8062444d53d6bc1c669e4480abda2ada06477c18 Mon Sep 17 00:00:00 2001
+From f6619eb1fb100c8f6f39b4828030434f0aab9a38 Mon Sep 17 00:00:00 2001
 From: Mark Harmstone <mark@harmstone.com>
 Date: Sun, 21 Dec 2014 23:49:41 +0000
 Subject: winepulse: fetch actual program name if possible
@@ -14,18 +14,18 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
  2 files changed, 116 insertions(+), 9 deletions(-)
 
 diff --git a/dlls/winepulse.drv/Makefile.in b/dlls/winepulse.drv/Makefile.in
-index 5671c0d..ae49221 100644
+index d660063..2448789 100644
 --- a/dlls/winepulse.drv/Makefile.in
 +++ b/dlls/winepulse.drv/Makefile.in
 @@ -1,5 +1,5 @@
  MODULE    = winepulse.drv
 -IMPORTS   = dxguid uuid winmm user32 advapi32 ole32
 +IMPORTS   = dxguid uuid winmm user32 advapi32 ole32 version
- DELAYIMPORTS = winealsa.drv
  EXTRALIBS = $(PULSE_LIBS) $(PTHREAD_LIBS)
  EXTRAINCL = $(PULSE_CFLAGS)
+ 
 diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c
-index f9f421a..ca60dcb 100644
+index bf9f3c0..2f20873 100644
 --- a/dlls/winepulse.drv/mmdevdrv.c
 +++ b/dlls/winepulse.drv/mmdevdrv.c
 @@ -43,6 +43,7 @@
@@ -36,7 +36,7 @@ index f9f421a..ca60dcb 100644
  #include "dshow.h"
  #include "dsound.h"
  #include "propsys.h"
-@@ -458,6 +459,109 @@ static void pulse_probe_settings(pa_mainloop *ml, pa_context *ctx, int render, W
+@@ -468,6 +469,109 @@ static void pulse_probe_settings(pa_mainloop *ml, pa_context *ctx, int render, W
      fmt->dwChannelMask = pulse_channel_map_to_channel_mask(&map);
  }
  
@@ -146,7 +146,7 @@ index f9f421a..ca60dcb 100644
  static HRESULT pulse_connect(void)
  {
      int len;
-@@ -481,14 +585,17 @@ static HRESULT pulse_connect(void)
+@@ -491,14 +595,17 @@ static HRESULT pulse_connect(void)
          pa_context_unref(pulse_ctx);
  
      GetModuleFileNameW(NULL, path, sizeof(path)/sizeof(*path));
@@ -173,5 +173,5 @@ index f9f421a..ca60dcb 100644
      pulse_ctx = pa_context_new(pa_mainloop_get_api(pulse_ml), str);
      pa_xfree(str);
 -- 
-2.6.2
+2.7.1