From 6e017c65e25ee932b450e8fb1fdba72bb5af571c Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 26 Jul 2014 03:53:13 +0200 Subject: [PATCH] Pull in latest version of winepulse patches (rebase only). --- patches/Makefile | 4 ++-- ...winmm-Load-winealsa-if-winepulse-is-found.patch | 6 +++--- ...e-Add-initial-stub-for-pulseaudio-support.patch | 14 +++++++------- ...3-winepulse-Add-format-and-period-probing.patch | 6 +++--- .../0004-winepulse-Add-audioclient.patch | 6 +++--- ...dd-IAudioRenderClient-and-IAudioCaptureCl.patch | 6 +++--- ...inepulse-Add-IAudioClock-and-IAudioClock2.patch | 6 +++--- .../0007-winepulse-Add-audiostreamvolume.patch | 6 +++--- .../0008-winepulse-Add-session-support.patch | 6 +++--- .../0009-fix-fdels-trailing-whitespaces.patch | 6 +++--- .../0010-winepulse-v12.patch | 6 +++--- ...15-Add-support-for-missing-formats-and-si.patch | 6 +++--- ...16-Add-official-warning-wine-doesn-t-want.patch | 6 +++--- .../0013-winepulse-v17-Fix-winmm-tests.patch | 6 +++--- ...-v18-Latency-and-compilation-improvements.patch | 6 +++--- ...se-API-Compatibility-with-1.5.2-onward-v2.patch | 6 +++--- .../0016-winepulse-Fix-low-latency-support.patch | 6 +++--- ...rop-realtime-priority-before-thread-destr.patch | 6 +++--- ...emove-bogus-SetEvent-from-pulse_started_c.patch | 6 +++--- ...isable-the-setevent-part-of-the-latency-h.patch | 6 +++--- ...e-v20-fix-the-checks-in-IsFormatSupported.patch | 6 +++--- ...1-winepulse-fixup-IsFormatSupported-calls.patch | 6 +++--- ...v21-return-early-if-padding-didn-t-update.patch | 6 +++--- ...0023-winepulse-fix-unneeded-free-in-write.patch | 6 +++--- ...ulse-v23-fixup-a-invalid-free-in-mmdevapi.patch | 6 +++--- ...inepulse-use-a-pi-mutex-for-serialization.patch | 6 +++--- .../0026-winepulse-add-support-for-IMarshal.patch | 6 +++--- ...se-handle-stream-create-failing-correctly.patch | 6 +++--- patches/winepulse-PulseAudio_Support/definition | 2 +- 29 files changed, 88 insertions(+), 88 deletions(-) diff --git a/patches/Makefile b/patches/Makefile index ff4c03b1..372e4f77 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -427,7 +427,7 @@ wineboot-HKEY_DYN_DATA.ok: # | # | Included patches: # | * Winepulse patches extracted from https://launchpad.net/~ubuntu- -# | wine/+archive/ubuntu/ppa/+files/wine1.7_1.7.21-0ubuntu1~ppa1.debian.tar.gz. [rev 4, by Maarten Lankhorst] +# | wine/+archive/ubuntu/ppa/+files/wine1.7_1.7.22-0ubuntu1.debian.tar.gz. [rev 4, by Maarten Lankhorst] # | # | Modified files: # | * configure.ac, dlls/mmdevapi/main.c, dlls/mmdevapi/tests/render.c, dlls/winepulse.drv/Makefile.in, @@ -462,7 +462,7 @@ winepulse-PulseAudio_Support.ok: $(PATCH) < winepulse-PulseAudio_Support/0026-winepulse-add-support-for-IMarshal.patch $(PATCH) < winepulse-PulseAudio_Support/0027-winepulse-handle-stream-create-failing-correctly.patch ( \ - echo "+ { \"winepulse-PulseAudio_Support\", \"Maarten Lankhorst\", \"Winepulse patches extracted from https://launchpad.net/~ubuntu-wine/+archive/ubuntu/ppa/+files/wine1.7_1.7.21-0ubuntu1~ppa1.debian.tar.gz. [rev 4]\" },"; \ + echo "+ { \"winepulse-PulseAudio_Support\", \"Maarten Lankhorst\", \"Winepulse patches extracted from https://launchpad.net/~ubuntu-wine/+archive/ubuntu/ppa/+files/wine1.7_1.7.22-0ubuntu1.debian.tar.gz. [rev 4]\" },"; \ ) > winepulse-PulseAudio_Support.ok # Patchset winex11-XEMBED diff --git a/patches/winepulse-PulseAudio_Support/0001-winmm-Load-winealsa-if-winepulse-is-found.patch b/patches/winepulse-PulseAudio_Support/0001-winmm-Load-winealsa-if-winepulse-is-found.patch index 6203df78..27a0f208 100644 --- a/patches/winepulse-PulseAudio_Support/0001-winmm-Load-winealsa-if-winepulse-is-found.patch +++ b/patches/winepulse-PulseAudio_Support/0001-winmm-Load-winealsa-if-winepulse-is-found.patch @@ -1,7 +1,7 @@ -From 9c64dcb14a77b7b1835bb06e03c90c502a1109f0 Mon Sep 17 00:00:00 2001 +From 170413df2bcce9416f55c1fd6feeeb49794ef530 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:45 +0200 -Subject: [PATCH 08/43] winmm: Load winealsa if winepulse is found +Date: Mon, 14 Jul 2014 09:50:02 +0200 +Subject: [PATCH 08/42] winmm: Load winealsa if winepulse is found Fixes midi on winepulse --- diff --git a/patches/winepulse-PulseAudio_Support/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch b/patches/winepulse-PulseAudio_Support/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch index 03c72e19..b980bade 100644 --- a/patches/winepulse-PulseAudio_Support/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch +++ b/patches/winepulse-PulseAudio_Support/0002-winepulse-Add-initial-stub-for-pulseaudio-support.patch @@ -1,7 +1,7 @@ -From 182d5c5625ea79c4506daa6856de158558de24d8 Mon Sep 17 00:00:00 2001 +From 94131bae285db20ad8f771100816ef65de6381a8 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:45 +0200 -Subject: [PATCH 09/43] winepulse: Add initial stub for pulseaudio support +Date: Mon, 14 Jul 2014 09:50:02 +0200 +Subject: [PATCH 09/42] winepulse: Add initial stub for pulseaudio support --- Just the basic of initialization and pulseaudio mainloop support is @@ -18,7 +18,7 @@ added here. create mode 100644 dlls/winepulse.drv/winepulse.drv.spec diff --git a/configure.ac b/configure.ac -index eccf19c..d4939c7 100644 +index c913f9f..6539100 100644 --- a/configure.ac +++ b/configure.ac @@ -70,6 +70,7 @@ AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound @@ -29,7 +29,7 @@ index eccf19c..d4939c7 100644 AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) -@@ -1516,6 +1517,30 @@ then +@@ -1518,6 +1519,30 @@ then [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) fi @@ -60,7 +60,7 @@ index eccf19c..d4939c7 100644 dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then -@@ -1734,13 +1759,15 @@ fi +@@ -1736,13 +1761,15 @@ fi dnl **** Disable unsupported winmm drivers **** test -n "$ALSA_LIBS" || enable_winealsa_drv=${enable_winealsa_drv:-no} test -n "$COREAUDIO_LIBS" || enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-no} @@ -78,7 +78,7 @@ index eccf19c..d4939c7 100644 then WINE_WARNING([No sound system was found. Windows applications will be silent.]) fi -@@ -3235,6 +3262,7 @@ WINE_CONFIG_DLL(winemp3.acm) +@@ -3239,6 +3266,7 @@ WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv,,[clean,po]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) diff --git a/patches/winepulse-PulseAudio_Support/0003-winepulse-Add-format-and-period-probing.patch b/patches/winepulse-PulseAudio_Support/0003-winepulse-Add-format-and-period-probing.patch index 2b2fc71a..cfe389a1 100644 --- a/patches/winepulse-PulseAudio_Support/0003-winepulse-Add-format-and-period-probing.patch +++ b/patches/winepulse-PulseAudio_Support/0003-winepulse-Add-format-and-period-probing.patch @@ -1,7 +1,7 @@ -From 66366363c2c99a359dfea648d2de409e362b5557 Mon Sep 17 00:00:00 2001 +From 560601710fa0fae144f31be450e5be556ee5c338 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:46 +0200 -Subject: [PATCH 10/43] winepulse: Add format and period probing +Date: Mon, 14 Jul 2014 09:50:02 +0200 +Subject: [PATCH 10/42] winepulse: Add format and period probing --- dlls/winepulse.drv/mmdevdrv.c | 128 ++++++++++++++++++++++++++++++++++++++++++ diff --git a/patches/winepulse-PulseAudio_Support/0004-winepulse-Add-audioclient.patch b/patches/winepulse-PulseAudio_Support/0004-winepulse-Add-audioclient.patch index 5878f498..da0c8e39 100644 --- a/patches/winepulse-PulseAudio_Support/0004-winepulse-Add-audioclient.patch +++ b/patches/winepulse-PulseAudio_Support/0004-winepulse-Add-audioclient.patch @@ -1,7 +1,7 @@ -From 26cd0e172f299c7e63c51af9f67035f4e5865822 Mon Sep 17 00:00:00 2001 +From 51460530bd39fcac3d44759ca3ae34cbb5c85e9f Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:46 +0200 -Subject: [PATCH 11/43] winepulse: Add audioclient +Date: Mon, 14 Jul 2014 09:50:03 +0200 +Subject: [PATCH 11/42] winepulse: Add audioclient --- Without AudioRenderClient and AudioCaptureClient it won't work, diff --git a/patches/winepulse-PulseAudio_Support/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch b/patches/winepulse-PulseAudio_Support/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch index 83096f8d..6a9a30d4 100644 --- a/patches/winepulse-PulseAudio_Support/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch +++ b/patches/winepulse-PulseAudio_Support/0005-winepulse-Add-IAudioRenderClient-and-IAudioCaptureCl.patch @@ -1,7 +1,7 @@ -From 9cca5914bed2a12edcafc8cebf5918d51e2570de Mon Sep 17 00:00:00 2001 +From ad8e16a8030be3579609e4dc9ce9727b3dbce2da Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:46 +0200 -Subject: [PATCH 12/43] winepulse: Add IAudioRenderClient and +Date: Mon, 14 Jul 2014 09:50:03 +0200 +Subject: [PATCH 12/42] winepulse: Add IAudioRenderClient and IAudioCaptureClient --- diff --git a/patches/winepulse-PulseAudio_Support/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch b/patches/winepulse-PulseAudio_Support/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch index 14eb3ee1..6b50f1bd 100644 --- a/patches/winepulse-PulseAudio_Support/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch +++ b/patches/winepulse-PulseAudio_Support/0006-winepulse-Add-IAudioClock-and-IAudioClock2.patch @@ -1,7 +1,7 @@ -From 6b97d362c570ec4a813db1d58574a94ad61f9015 Mon Sep 17 00:00:00 2001 +From d9c51b0534a261c95cea362195dcba1688be815b Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:46 +0200 -Subject: [PATCH 13/43] winepulse: Add IAudioClock and IAudioClock2 +Date: Mon, 14 Jul 2014 09:50:03 +0200 +Subject: [PATCH 13/42] winepulse: Add IAudioClock and IAudioClock2 --- dlls/winepulse.drv/mmdevdrv.c | 172 ++++++++++++++++++++++++++++++++++++++++++ diff --git a/patches/winepulse-PulseAudio_Support/0007-winepulse-Add-audiostreamvolume.patch b/patches/winepulse-PulseAudio_Support/0007-winepulse-Add-audiostreamvolume.patch index e6e933f4..5bd72cb1 100644 --- a/patches/winepulse-PulseAudio_Support/0007-winepulse-Add-audiostreamvolume.patch +++ b/patches/winepulse-PulseAudio_Support/0007-winepulse-Add-audiostreamvolume.patch @@ -1,7 +1,7 @@ -From 0f827300a5f9d66de488f43fa5f544e97335ea35 Mon Sep 17 00:00:00 2001 +From 9cefd9930adad40581db955cf9291708e282d8b5 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:46 +0200 -Subject: [PATCH 14/43] winepulse: Add audiostreamvolume +Date: Mon, 14 Jul 2014 09:50:03 +0200 +Subject: [PATCH 14/42] winepulse: Add audiostreamvolume --- Pulse allows streams to set volume, but for various reasons it's diff --git a/patches/winepulse-PulseAudio_Support/0008-winepulse-Add-session-support.patch b/patches/winepulse-PulseAudio_Support/0008-winepulse-Add-session-support.patch index 66de882c..7d163675 100644 --- a/patches/winepulse-PulseAudio_Support/0008-winepulse-Add-session-support.patch +++ b/patches/winepulse-PulseAudio_Support/0008-winepulse-Add-session-support.patch @@ -1,7 +1,7 @@ -From 313c40a06e4b535ea524c0393c466a52d9c1e8eb Mon Sep 17 00:00:00 2001 +From 5672b4a48c95114e55577c676ebc68d00e5b6908 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:46 +0200 -Subject: [PATCH 15/43] winepulse: Add session support +Date: Mon, 14 Jul 2014 09:50:03 +0200 +Subject: [PATCH 15/42] winepulse: Add session support --- Copied verbatim from winealsa diff --git a/patches/winepulse-PulseAudio_Support/0009-fix-fdels-trailing-whitespaces.patch b/patches/winepulse-PulseAudio_Support/0009-fix-fdels-trailing-whitespaces.patch index 2c5180df..d0bd6ce7 100644 --- a/patches/winepulse-PulseAudio_Support/0009-fix-fdels-trailing-whitespaces.patch +++ b/patches/winepulse-PulseAudio_Support/0009-fix-fdels-trailing-whitespaces.patch @@ -1,7 +1,7 @@ -From 379ef856e7d5c5d691a8aabbb77a95dc3b0e6d9c Mon Sep 17 00:00:00 2001 +From 48782b64e7a62612d8166e74271dbeb1cd83bb3c Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:46 +0200 -Subject: [PATCH 16/43] fix fdels trailing whitespaces +Date: Mon, 14 Jul 2014 09:50:03 +0200 +Subject: [PATCH 16/42] fix fdels trailing whitespaces Happy? :P --- diff --git a/patches/winepulse-PulseAudio_Support/0010-winepulse-v12.patch b/patches/winepulse-PulseAudio_Support/0010-winepulse-v12.patch index 6712b0b3..44f27cb0 100644 --- a/patches/winepulse-PulseAudio_Support/0010-winepulse-v12.patch +++ b/patches/winepulse-PulseAudio_Support/0010-winepulse-v12.patch @@ -1,7 +1,7 @@ -From 99756a89f015bdf24d42ef75b59736d2cfd930c5 Mon Sep 17 00:00:00 2001 +From 1f92761fc130d432299df976841b77b60b64efa5 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:46 +0200 -Subject: [PATCH 17/43] winepulse v12 +Date: Mon, 14 Jul 2014 09:50:03 +0200 +Subject: [PATCH 17/42] winepulse v12 Changes since v11: - Fix incorrect assertions which may fail on moving a capture device diff --git a/patches/winepulse-PulseAudio_Support/0011-winepulse-v15-Add-support-for-missing-formats-and-si.patch b/patches/winepulse-PulseAudio_Support/0011-winepulse-v15-Add-support-for-missing-formats-and-si.patch index 18dec136..2791ed91 100644 --- a/patches/winepulse-PulseAudio_Support/0011-winepulse-v15-Add-support-for-missing-formats-and-si.patch +++ b/patches/winepulse-PulseAudio_Support/0011-winepulse-v15-Add-support-for-missing-formats-and-si.patch @@ -1,7 +1,7 @@ -From 8bdeceb10d8f3d69cc6835e53d3a3137a276d756 Mon Sep 17 00:00:00 2001 +From 5761af9a26e1d84f53b698669efb9f33ee886635 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:46 +0200 -Subject: [PATCH 18/43] winepulse v15: Add support for missing formats, and +Date: Mon, 14 Jul 2014 09:50:03 +0200 +Subject: [PATCH 18/42] winepulse v15: Add support for missing formats, and silence an error for missing format tags --- diff --git a/patches/winepulse-PulseAudio_Support/0012-winepulse-v16-Add-official-warning-wine-doesn-t-want.patch b/patches/winepulse-PulseAudio_Support/0012-winepulse-v16-Add-official-warning-wine-doesn-t-want.patch index 5f077048..d7a29227 100644 --- a/patches/winepulse-PulseAudio_Support/0012-winepulse-v16-Add-official-warning-wine-doesn-t-want.patch +++ b/patches/winepulse-PulseAudio_Support/0012-winepulse-v16-Add-official-warning-wine-doesn-t-want.patch @@ -1,7 +1,7 @@ -From a3b41022c8746ecf5036adf6c5582f8fe1f7e7b4 Mon Sep 17 00:00:00 2001 +From f54d61ca3af7f60aa6e99046ea42542ac89305aa Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:46 +0200 -Subject: [PATCH 19/43] winepulse v16: Add official warning wine doesn't want +Date: Mon, 14 Jul 2014 09:50:03 +0200 +Subject: [PATCH 19/42] winepulse v16: Add official warning wine doesn't want to support winepulse And give an alternative place to ask for support. diff --git a/patches/winepulse-PulseAudio_Support/0013-winepulse-v17-Fix-winmm-tests.patch b/patches/winepulse-PulseAudio_Support/0013-winepulse-v17-Fix-winmm-tests.patch index 1daef138..1a279e07 100644 --- a/patches/winepulse-PulseAudio_Support/0013-winepulse-v17-Fix-winmm-tests.patch +++ b/patches/winepulse-PulseAudio_Support/0013-winepulse-v17-Fix-winmm-tests.patch @@ -1,7 +1,7 @@ -From 384845108243ed6592df164f13e00dd88705b8bf Mon Sep 17 00:00:00 2001 +From 534909554951611437c1c137d650dee651c4a7d9 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:47 +0200 -Subject: [PATCH 20/43] winepulse v17: Fix winmm tests +Date: Mon, 14 Jul 2014 09:50:03 +0200 +Subject: [PATCH 20/42] winepulse v17: Fix winmm tests Handle dwChannelMask = SPEAKER_ALL better so WAVE_FORMAT_EXTENSIBLE tests pass too --- diff --git a/patches/winepulse-PulseAudio_Support/0014-winepulse-v18-Latency-and-compilation-improvements.patch b/patches/winepulse-PulseAudio_Support/0014-winepulse-v18-Latency-and-compilation-improvements.patch index d4fd06af..4a6cf3f4 100644 --- a/patches/winepulse-PulseAudio_Support/0014-winepulse-v18-Latency-and-compilation-improvements.patch +++ b/patches/winepulse-PulseAudio_Support/0014-winepulse-v18-Latency-and-compilation-improvements.patch @@ -1,7 +1,7 @@ -From e07df6656ffbccbf4974ca9103c5953f5ff090f3 Mon Sep 17 00:00:00 2001 +From 4a9c7326546604233be84528ba56e10731296ca8 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:47 +0200 -Subject: [PATCH 21/43] winepulse v18: Latency and compilation improvements +Date: Mon, 14 Jul 2014 09:50:04 +0200 +Subject: [PATCH 21/42] winepulse v18: Latency and compilation improvements Changes since v17: - Remove clock_pulse interpolation diff --git a/patches/winepulse-PulseAudio_Support/0015-winepulse-API-Compatibility-with-1.5.2-onward-v2.patch b/patches/winepulse-PulseAudio_Support/0015-winepulse-API-Compatibility-with-1.5.2-onward-v2.patch index 19438174..fe7aac14 100644 --- a/patches/winepulse-PulseAudio_Support/0015-winepulse-API-Compatibility-with-1.5.2-onward-v2.patch +++ b/patches/winepulse-PulseAudio_Support/0015-winepulse-API-Compatibility-with-1.5.2-onward-v2.patch @@ -1,7 +1,7 @@ -From a1e43cc033dd64d05bcfc6189b332227facc24cf Mon Sep 17 00:00:00 2001 +From 87c12ec0ab5179a9460ee10096ace6e3fe8fa7d3 Mon Sep 17 00:00:00 2001 From: Juergen Tretthahn -Date: Tue, 24 Jun 2014 08:48:47 +0200 -Subject: [PATCH 22/43] winepulse: API Compatibility with 1.5.2 onward, v2 +Date: Mon, 14 Jul 2014 09:50:04 +0200 +Subject: [PATCH 22/42] winepulse: API Compatibility with 1.5.2 onward, v2 V2: Add winepulse.drv.spec to commit too V1: Original version diff --git a/patches/winepulse-PulseAudio_Support/0016-winepulse-Fix-low-latency-support.patch b/patches/winepulse-PulseAudio_Support/0016-winepulse-Fix-low-latency-support.patch index df6339e6..a16a06f8 100644 --- a/patches/winepulse-PulseAudio_Support/0016-winepulse-Fix-low-latency-support.patch +++ b/patches/winepulse-PulseAudio_Support/0016-winepulse-Fix-low-latency-support.patch @@ -1,7 +1,7 @@ -From cf251ef3bc965d723003723fc86a995ed0808c17 Mon Sep 17 00:00:00 2001 +From c85625f7f671ee68050d9f83f2958fbb6d583c70 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:47 +0200 -Subject: [PATCH 23/43] winepulse: Fix low latency support +Date: Mon, 14 Jul 2014 09:50:04 +0200 +Subject: [PATCH 23/42] winepulse: Fix low latency support Some games request a 20 ms buffer and will only fill 20 ms. Since 10 ms periods are too long in this case for winepulse, diff --git a/patches/winepulse-PulseAudio_Support/0017-winepulse-drop-realtime-priority-before-thread-destr.patch b/patches/winepulse-PulseAudio_Support/0017-winepulse-drop-realtime-priority-before-thread-destr.patch index dd6df85e..492f401d 100644 --- a/patches/winepulse-PulseAudio_Support/0017-winepulse-drop-realtime-priority-before-thread-destr.patch +++ b/patches/winepulse-PulseAudio_Support/0017-winepulse-drop-realtime-priority-before-thread-destr.patch @@ -1,7 +1,7 @@ -From 94b06acf43a3687efabf329ab32190ebc54147e5 Mon Sep 17 00:00:00 2001 +From 4c58956caeaf8721ccbfd612175caf742797fffb Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:47 +0200 -Subject: [PATCH 24/43] winepulse: drop realtime priority before thread +Date: Mon, 14 Jul 2014 09:50:04 +0200 +Subject: [PATCH 24/42] winepulse: drop realtime priority before thread destruction prevents having to handle a kernel RT Watchdog Timeout. diff --git a/patches/winepulse-PulseAudio_Support/0018-winepulse-remove-bogus-SetEvent-from-pulse_started_c.patch b/patches/winepulse-PulseAudio_Support/0018-winepulse-remove-bogus-SetEvent-from-pulse_started_c.patch index af3dc405..ca6d4b92 100644 --- a/patches/winepulse-PulseAudio_Support/0018-winepulse-remove-bogus-SetEvent-from-pulse_started_c.patch +++ b/patches/winepulse-PulseAudio_Support/0018-winepulse-remove-bogus-SetEvent-from-pulse_started_c.patch @@ -1,7 +1,7 @@ -From 363670394eb26ede216523dfbaca4c22032f35b8 Mon Sep 17 00:00:00 2001 +From c35b2f43436e6237542fe210d65c6e4e3b0819bd Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:47 +0200 -Subject: [PATCH 25/43] winepulse: remove bogus SetEvent from +Date: Mon, 14 Jul 2014 09:50:04 +0200 +Subject: [PATCH 25/42] winepulse: remove bogus SetEvent from pulse_started_callback --- diff --git a/patches/winepulse-PulseAudio_Support/0019-winepulse-disable-the-setevent-part-of-the-latency-h.patch b/patches/winepulse-PulseAudio_Support/0019-winepulse-disable-the-setevent-part-of-the-latency-h.patch index 6fac24ab..97ce6259 100644 --- a/patches/winepulse-PulseAudio_Support/0019-winepulse-disable-the-setevent-part-of-the-latency-h.patch +++ b/patches/winepulse-PulseAudio_Support/0019-winepulse-disable-the-setevent-part-of-the-latency-h.patch @@ -1,7 +1,7 @@ -From 5cfd0ad9a87b738a7bce79c966b476a682892506 Mon Sep 17 00:00:00 2001 +From 647aa74bd4a7a11065e8ee2c513d3fdd0584d1e7 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:47 +0200 -Subject: [PATCH 26/43] winepulse: disable the setevent part of the latency +Date: Mon, 14 Jul 2014 09:50:04 +0200 +Subject: [PATCH 26/42] winepulse: disable the setevent part of the latency hack If you get playback glitches in skyrim or other games as a result of diff --git a/patches/winepulse-PulseAudio_Support/0020-winepulse-v20-fix-the-checks-in-IsFormatSupported.patch b/patches/winepulse-PulseAudio_Support/0020-winepulse-v20-fix-the-checks-in-IsFormatSupported.patch index ec8cae19..40c3e5aa 100644 --- a/patches/winepulse-PulseAudio_Support/0020-winepulse-v20-fix-the-checks-in-IsFormatSupported.patch +++ b/patches/winepulse-PulseAudio_Support/0020-winepulse-v20-fix-the-checks-in-IsFormatSupported.patch @@ -1,7 +1,7 @@ -From b5e9e9af838afe41a7e82ba8c5c1e0c4bd5bd517 Mon Sep 17 00:00:00 2001 +From 824fc6ecfad213000ca8e93c147687530c34ea87 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:47 +0200 -Subject: [PATCH 27/43] winepulse v20: fix the checks in IsFormatSupported +Date: Mon, 14 Jul 2014 09:50:04 +0200 +Subject: [PATCH 27/42] winepulse v20: fix the checks in IsFormatSupported Thanks to DGhost001 for reporting and isolating the issue. --- diff --git a/patches/winepulse-PulseAudio_Support/0021-winepulse-fixup-IsFormatSupported-calls.patch b/patches/winepulse-PulseAudio_Support/0021-winepulse-fixup-IsFormatSupported-calls.patch index 16e20dc2..93b37576 100644 --- a/patches/winepulse-PulseAudio_Support/0021-winepulse-fixup-IsFormatSupported-calls.patch +++ b/patches/winepulse-PulseAudio_Support/0021-winepulse-fixup-IsFormatSupported-calls.patch @@ -1,7 +1,7 @@ -From 2813e16dbbefcccbf4b8b29bf65c30e4d7f2605c Mon Sep 17 00:00:00 2001 +From e94c6ccaef68dbda1906e94c9f69dab20dacae4e Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:47 +0200 -Subject: [PATCH 28/43] winepulse: fixup IsFormatSupported calls +Date: Mon, 14 Jul 2014 09:50:04 +0200 +Subject: [PATCH 28/42] winepulse: fixup IsFormatSupported calls --- dlls/mmdevapi/tests/render.c | 164 +++++++++++++++++++++++++++++++++++++++ diff --git a/patches/winepulse-PulseAudio_Support/0022-winepulse-v21-return-early-if-padding-didn-t-update.patch b/patches/winepulse-PulseAudio_Support/0022-winepulse-v21-return-early-if-padding-didn-t-update.patch index 8741f376..0e152019 100644 --- a/patches/winepulse-PulseAudio_Support/0022-winepulse-v21-return-early-if-padding-didn-t-update.patch +++ b/patches/winepulse-PulseAudio_Support/0022-winepulse-v21-return-early-if-padding-didn-t-update.patch @@ -1,7 +1,7 @@ -From e95e4533229ef499e6e2ecb793e3054b8be3809a Mon Sep 17 00:00:00 2001 +From c334a7107c408e86154e4968003a28b8a5322e62 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:48 +0200 -Subject: [PATCH 29/43] winepulse v21: return early if padding didn't update +Date: Mon, 14 Jul 2014 09:50:04 +0200 +Subject: [PATCH 29/42] winepulse v21: return early if padding didn't update --- dlls/winepulse.drv/mmdevdrv.c | 5 ++++- diff --git a/patches/winepulse-PulseAudio_Support/0023-winepulse-fix-unneeded-free-in-write.patch b/patches/winepulse-PulseAudio_Support/0023-winepulse-fix-unneeded-free-in-write.patch index 6b749f39..c791ff86 100644 --- a/patches/winepulse-PulseAudio_Support/0023-winepulse-fix-unneeded-free-in-write.patch +++ b/patches/winepulse-PulseAudio_Support/0023-winepulse-fix-unneeded-free-in-write.patch @@ -1,7 +1,7 @@ -From 0a2ea36a38fccd41fa3387be71fea39462e4102c Mon Sep 17 00:00:00 2001 +From 653e4912a248101e5451eec21a9e7a07dce8a49a Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:48 +0200 -Subject: [PATCH 30/43] winepulse: fix unneeded free in write.. +Date: Mon, 14 Jul 2014 09:50:05 +0200 +Subject: [PATCH 30/42] winepulse: fix unneeded free in write.. --- dlls/winepulse.drv/mmdevdrv.c | 6 +++++- diff --git a/patches/winepulse-PulseAudio_Support/0024-winepulse-v23-fixup-a-invalid-free-in-mmdevapi.patch b/patches/winepulse-PulseAudio_Support/0024-winepulse-v23-fixup-a-invalid-free-in-mmdevapi.patch index 82523984..fbc82f86 100644 --- a/patches/winepulse-PulseAudio_Support/0024-winepulse-v23-fixup-a-invalid-free-in-mmdevapi.patch +++ b/patches/winepulse-PulseAudio_Support/0024-winepulse-v23-fixup-a-invalid-free-in-mmdevapi.patch @@ -1,7 +1,7 @@ -From 46f5df733fba376a7d6bbb3804fb25e108b760f0 Mon Sep 17 00:00:00 2001 +From 6a3d42407535ce71761d41f47e6b0a49938d77d1 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:48 +0200 -Subject: [PATCH 31/43] winepulse v23: fixup a invalid free in mmdevapi +Date: Mon, 14 Jul 2014 09:50:05 +0200 +Subject: [PATCH 31/42] winepulse v23: fixup a invalid free in mmdevapi array members of ids should be dynamically allocated, judging from valgrind output. --- diff --git a/patches/winepulse-PulseAudio_Support/0025-winepulse-use-a-pi-mutex-for-serialization.patch b/patches/winepulse-PulseAudio_Support/0025-winepulse-use-a-pi-mutex-for-serialization.patch index a527f7e9..e2928822 100644 --- a/patches/winepulse-PulseAudio_Support/0025-winepulse-use-a-pi-mutex-for-serialization.patch +++ b/patches/winepulse-PulseAudio_Support/0025-winepulse-use-a-pi-mutex-for-serialization.patch @@ -1,7 +1,7 @@ -From 8d23cea7bd4c530d352d0358bb078e7c9eea4b43 Mon Sep 17 00:00:00 2001 +From d6baba9b8c742b672121ad283fdee54135f46e7a Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:48 +0200 -Subject: [PATCH 38/43] winepulse: use a pi-mutex for serialization. +Date: Mon, 14 Jul 2014 09:50:05 +0200 +Subject: [PATCH 38/42] winepulse: use a pi-mutex for serialization. The winepulse thread is realtime, to prevent blocking it indefinitely use priority inheritance. Only initialize and release are potentially diff --git a/patches/winepulse-PulseAudio_Support/0026-winepulse-add-support-for-IMarshal.patch b/patches/winepulse-PulseAudio_Support/0026-winepulse-add-support-for-IMarshal.patch index 318c4f75..ea0bb978 100644 --- a/patches/winepulse-PulseAudio_Support/0026-winepulse-add-support-for-IMarshal.patch +++ b/patches/winepulse-PulseAudio_Support/0026-winepulse-add-support-for-IMarshal.patch @@ -1,7 +1,7 @@ -From 0db6f5427a3a74f23c8833680a53df63cb1ab339 Mon Sep 17 00:00:00 2001 +From 2e64f15c657e318118c582361bee81ad37dca872 Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst -Date: Tue, 24 Jun 2014 08:48:49 +0200 -Subject: [PATCH 39/43] winepulse: add support for IMarshal +Date: Mon, 14 Jul 2014 09:50:05 +0200 +Subject: [PATCH 39/42] winepulse: add support for IMarshal Fixes bug 32161 for winepulse. Based On Jeff Klein's patches for the other drivers. diff --git a/patches/winepulse-PulseAudio_Support/0027-winepulse-handle-stream-create-failing-correctly.patch b/patches/winepulse-PulseAudio_Support/0027-winepulse-handle-stream-create-failing-correctly.patch index 8f14dd48..5a7d398c 100644 --- a/patches/winepulse-PulseAudio_Support/0027-winepulse-handle-stream-create-failing-correctly.patch +++ b/patches/winepulse-PulseAudio_Support/0027-winepulse-handle-stream-create-failing-correctly.patch @@ -1,7 +1,7 @@ -From 0f7b5851573569ddf40e36e48670bf9d09765920 Mon Sep 17 00:00:00 2001 +From 2d638b335a2d9cdddfa9cfd7d7b6e889d124503c Mon Sep 17 00:00:00 2001 From: Mark Harmstone -Date: Tue, 24 Jun 2014 08:48:49 +0200 -Subject: [PATCH 43/43] winepulse: handle stream create failing correctly +Date: Mon, 14 Jul 2014 09:50:06 +0200 +Subject: [PATCH 42/42] winepulse: handle stream create failing correctly --- dlls/winepulse.drv/mmdevdrv.c | 6 ++++++ diff --git a/patches/winepulse-PulseAudio_Support/definition b/patches/winepulse-PulseAudio_Support/definition index 54c02549..341cb0a6 100644 --- a/patches/winepulse-PulseAudio_Support/definition +++ b/patches/winepulse-PulseAudio_Support/definition @@ -1,4 +1,4 @@ Author: Maarten Lankhorst -Subject: Winepulse patches extracted from https://launchpad.net/~ubuntu-wine/+archive/ubuntu/ppa/+files/wine1.7_1.7.21-0ubuntu1~ppa1.debian.tar.gz. +Subject: Winepulse patches extracted from https://launchpad.net/~ubuntu-wine/+archive/ubuntu/ppa/+files/wine1.7_1.7.22-0ubuntu1.debian.tar.gz. Revision: 4 Fixes: Support for PulseAudio backend for audio