From 4e4a8b7d32501e9a5fdc1ad564f62ef396b46825 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 26 Aug 2014 23:23:59 +0200 Subject: [PATCH] Fix issue in winepulse patches (wrong syntax in configure script). --- ...-initial-stub-for-pulseaudio-support.patch | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) 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 b980bade..772a7b42 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,27 +1,24 @@ -From 94131bae285db20ad8f771100816ef65de6381a8 Mon Sep 17 00:00:00 2001 +From c6b3ebf94a0713ab7c5cd10ca0021d9f1359a62a Mon Sep 17 00:00:00 2001 From: Maarten Lankhorst 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 -added here. ---- - configure.ac | 32 +++- - dlls/mmdevapi/main.c | 2 +- - dlls/winepulse.drv/Makefile.in | 7 + - dlls/winepulse.drv/mmdevdrv.c | 290 ++++++++++++++++++++++++++++++++++ - dlls/winepulse.drv/winepulse.drv.spec | 5 + - 6 files changed, 430 insertions(+), 5 deletions(-) + configure.ac | 31 +++- + dlls/mmdevapi/main.c | 2 +- + dlls/winepulse.drv/Makefile.in | 7 + + dlls/winepulse.drv/mmdevdrv.c | 290 +++++++++++++++++++++++++++++++++ + dlls/winepulse.drv/winepulse.drv.spec | 5 + + 5 files changed, 332 insertions(+), 3 deletions(-) create mode 100644 dlls/winepulse.drv/Makefile.in create mode 100644 dlls/winepulse.drv/mmdevdrv.c create mode 100644 dlls/winepulse.drv/winepulse.drv.spec diff --git a/configure.ac b/configure.ac -index c913f9f..6539100 100644 +index 7de7a87..84ec52f 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 +@@ -72,6 +72,7 @@ AC_ARG_WITH(pcap, AS_HELP_STRING([--without-pcap],[do not use the Packet Ca AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG])) AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the pthread library]), [if test "x$withval" = "xno"; then ac_cv_header_pthread_h=no; fi]) @@ -29,7 +26,7 @@ index c913f9f..6539100 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)])) -@@ -1518,6 +1519,30 @@ then +@@ -1537,6 +1538,30 @@ then [GetText ${notice_platform}development files not found (or too old), po files can't be rebuilt.]) fi @@ -60,7 +57,7 @@ index c913f9f..6539100 100644 dnl **** Check for gstreamer **** if test "x$with_gstreamer" != "xno" then -@@ -1736,13 +1761,15 @@ fi +@@ -1755,13 +1780,14 @@ 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} @@ -71,14 +68,13 @@ index c913f9f..6539100 100644 dnl **** Check for any sound system **** -if test "x$ALSA_LIBS$COREAUDIO_LIBS" = "x" -a \ +if test "x$ALSA_LIBS$COREAUDIO_LIBS$PULSELIBS" = "x" -a \ -+if test "x$ALSALIBS$COREAUDIO$PULSELIBS" = "x" -a \ "x$ac_cv_member_oss_sysinfo_numaudioengines" != xyes -a \ - "x$with_alsa$with_coreaudio$with_oss" != xnonono + "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono then WINE_WARNING([No sound system was found. Windows applications will be silent.]) fi -@@ -3239,6 +3266,7 @@ WINE_CONFIG_DLL(winemp3.acm) +@@ -3258,6 +3284,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) @@ -420,5 +416,5 @@ index 0000000..a089166 +@ stdcall -private GetAudioEndpoint(ptr ptr long ptr) AUDDRV_GetAudioEndpoint +@ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager -- -2.0.0 +1.7.9.5