aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEtienne Dechamps <etienne@edechamps.fr>2018-11-08 07:45:26 +0000
committerRobert Schumacher <roschuma@microsoft.com>2018-11-07 23:45:26 -0800
commit52b2759a75ddff09c088ee6fc7d0eba81a132991 (patch)
treec981ec652d2dbb4c4d5f03deab5c8fe13699ca8e
parent40af541c5053e618741ad6aadcfdbbe520129c94 (diff)
downloadvcpkg-52b2759a75ddff09c088ee6fc7d0eba81a132991.tar.gz
vcpkg-52b2759a75ddff09c088ee6fc7d0eba81a132991.zip
[portaudio] Add pa_win_waveformat.h to public includes (#4582)
* [portaudio] Add pa_win_waveformat.h to public includes. pa_win_wasapi.h includes pa_win_waveformat.h, so it has to be distributed for pa_win_wasapi.h to be usable. * [portaudio] Bump control version
-rw-r--r--ports/portaudio/CONTROL2
-rw-r--r--ports/portaudio/pa_win_waveformat.patch27
-rw-r--r--ports/portaudio/portfile.cmake1
3 files changed, 29 insertions, 1 deletions
diff --git a/ports/portaudio/CONTROL b/ports/portaudio/CONTROL
index 8b74bfd6f..ceeec644c 100644
--- a/ports/portaudio/CONTROL
+++ b/ports/portaudio/CONTROL
@@ -1,3 +1,3 @@
Source: portaudio
-Version: 19.0.6.00-3
+Version: 19.0.6.00-4
Description: PortAudio Portable Cross-platform Audio I/O API PortAudio is a free, cross-platform, open-source, audio I/O library. It lets you write simple audio programs in 'C' or C++ that will compile and run on many platforms including Windows, Macintosh OS X, and Unix (OSS/ALSA). It is intended to promote the exchange of audio software between developers on different platforms. Many applications use PortAudio for Audio I/O.
diff --git a/ports/portaudio/pa_win_waveformat.patch b/ports/portaudio/pa_win_waveformat.patch
new file mode 100644
index 000000000..cba073947
--- /dev/null
+++ b/ports/portaudio/pa_win_waveformat.patch
@@ -0,0 +1,27 @@
+From fa727918e9e56c2a18dbdcfd276c60ac616c56ba Mon Sep 17 00:00:00 2001
+From: Etienne Dechamps <etienne@edechamps.fr>
+Date: Sat, 27 Oct 2018 15:14:27 +0100
+Subject: [PATCH] Add pa_win_waveformat.h to public includes.
+
+pa_win_wasapi.h includes pa_win_waveformat.h, so it has to be
+distributed for pa_win_wasapi.h to be usable.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 789671a..6a3ed8e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -210,7 +210,7 @@ IF(WIN32)
+ IF(PA_USE_WASAPI)
+ SET(PA_WASAPI_SOURCES src/hostapi/wasapi/pa_win_wasapi.c)
+ SOURCE_GROUP("hostapi\\wasapi" FILES ${PA_WASAPI_SOURCES})
+- SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wasapi.h)
++ SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wasapi.h include/pa_win_waveformat.h)
+ SET(PA_SOURCES ${PA_SOURCES} ${PA_WASAPI_SOURCES})
+ SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ole32 uuid)
+ IF(NOT MSVC)
+--
+2.14.1.windows.1
+
diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake
index 236cb2cea..349828158 100644
--- a/ports/portaudio/portfile.cmake
+++ b/ports/portaudio/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_extract_source_archive_ex(
find_dsound.patch
wasapi_support.patch
crt_linkage_build_config.patch
+ pa_win_waveformat.patch
)
# NOTE: the ASIO backend will be built automatically if the ASIO-SDK is provided