diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 0c5dffbe..302a7ce1 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "fa9f4a20f5305b7cbcfe3a644d39d4b759f89203" + echo "cce4f36e214125173a8df84d27ba5b33df8d1434" } # Show version information diff --git a/patches/winepulse-PulseAudio_Support/0003-winepulse-expose-audio-devices-directly-to-programs.patch b/patches/winepulse-PulseAudio_Support/0003-winepulse-expose-audio-devices-directly-to-programs.patch index 1de7d84d..f5a3af87 100644 --- a/patches/winepulse-PulseAudio_Support/0003-winepulse-expose-audio-devices-directly-to-programs.patch +++ b/patches/winepulse-PulseAudio_Support/0003-winepulse-expose-audio-devices-directly-to-programs.patch @@ -1,4 +1,4 @@ -From 5e002013b359e3278e9c1ef30514e4be274ea032 Mon Sep 17 00:00:00 2001 +From 4e795dd8fda937cc61bf393880eafd28e8dea98f Mon Sep 17 00:00:00 2001 From: Mark Harmstone Date: Mon, 3 Nov 2014 02:06:40 +0000 Subject: [PATCH] winepulse: expose audio devices directly to programs @@ -20,7 +20,7 @@ Changes by Sebastian Lackner : 1 file changed, 224 insertions(+), 28 deletions(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c -index 7fc7dccb367..59cfa3db4f2 100644 +index 6d4ffecaca8..4d91aa60151 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -79,12 +79,25 @@ static pthread_mutex_t pulse_lock; @@ -77,7 +77,7 @@ index 7fc7dccb367..59cfa3db4f2 100644 -static const WCHAR defaultW[] = {'P','u','l','s','e','a','u','d','i','o',0}; - - static const IAudioClientVtbl AudioClient_Vtbl; + static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; @@ -605,12 +624,92 @@ fail: @@ -403,7 +403,7 @@ index 7fc7dccb367..59cfa3db4f2 100644 This->vol[i] = 1.f; + strcpy(This->device, pulse_name); - hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient_iface, &This->marshal); + hr = CoCreateFreeThreadedMarshaler((IUnknown*)&This->IAudioClient3_iface, &This->marshal); if (hr) { -- 2.28.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index df523bbc..6b46e5a6 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -fa9f4a20f5305b7cbcfe3a644d39d4b759f89203 +cce4f36e214125173a8df84d27ba5b33df8d1434