diff options
| author | Cullen Jennings <fluffy@iii.ca> | 2021-02-14 16:29:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-14 15:29:32 -0800 |
| commit | 17c3670b069e57723deddc1645bda547bb77bad5 (patch) | |
| tree | fbabd30997d3043e61576d1aceecdc16f624891b | |
| parent | f79c681fc2b42f9c7c5024459b5a867d56ac6123 (diff) | |
| download | vcpkg-17c3670b069e57723deddc1645bda547bb77bad5.tar.gz vcpkg-17c3670b069e57723deddc1645bda547bb77bad5.zip | |
[portaudio] Update port to latest on github (#16197)
* Update portaudio port to latest on github
* correct port version info
* remove the port-version when it is zero
* update version file
| -rw-r--r-- | ports/portaudio/fix-include.patch | 22 | ||||
| -rw-r--r-- | ports/portaudio/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/portaudio/vcpkg.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/p-/portaudio.json | 5 |
5 files changed, 11 insertions, 30 deletions
diff --git a/ports/portaudio/fix-include.patch b/ports/portaudio/fix-include.patch deleted file mode 100644 index 4003959f7..000000000 --- a/ports/portaudio/fix-include.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1024016..7e6ea20 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -365,7 +365,7 @@ IF(PA_BUILD_SHARED)
- ADD_LIBRARY(portaudio SHARED ${PA_INCLUDES} ${PA_COMMON_INCLUDES} ${PA_SOURCES} ${PA_NON_UNICODE_SOURCES} ${PA_EXTRA_SHARED_SOURCES})
- SET_PROPERTY(TARGET portaudio APPEND_STRING PROPERTY COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS})
- TARGET_INCLUDE_DIRECTORIES(portaudio PRIVATE ${PA_PRIVATE_INCLUDE_PATHS})
-- TARGET_INCLUDE_DIRECTORIES(portaudio PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>")
-+ TARGET_INCLUDE_DIRECTORIES(portaudio PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" "$<INSTALL_INTERFACE:include>")
- TARGET_LINK_LIBRARIES(portaudio ${PA_LIBRARY_DEPENDENCIES})
- ENDIF()
-
-@@ -374,7 +374,7 @@ IF(PA_BUILD_STATIC)
- ADD_LIBRARY(portaudio_static STATIC ${PA_INCLUDES} ${PA_COMMON_INCLUDES} ${PA_SOURCES} ${PA_NON_UNICODE_SOURCES})
- SET_PROPERTY(TARGET portaudio_static APPEND_STRING PROPERTY COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS})
- TARGET_INCLUDE_DIRECTORIES(portaudio_static PRIVATE ${PA_PRIVATE_INCLUDE_PATHS})
-- TARGET_INCLUDE_DIRECTORIES(portaudio_static PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>")
-+ TARGET_INCLUDE_DIRECTORIES(portaudio_static PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>" "$<INSTALL_INTERFACE:include>")
- TARGET_LINK_LIBRARIES(portaudio_static ${PA_LIBRARY_DEPENDENCIES})
- IF(NOT PA_LIBNAME_ADD_SUFFIX)
- SET_PROPERTY(TARGET portaudio_static PROPERTY OUTPUT_NAME portaudio)
diff --git a/ports/portaudio/portfile.cmake b/ports/portaudio/portfile.cmake index 35e212212..4c312b15c 100644 --- a/ports/portaudio/portfile.cmake +++ b/ports/portaudio/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_fail_port_install(ON_TARGET "uwp")
vcpkg_from_git(
OUT_SOURCE_PATH SOURCE_PATH
- URL https://git.assembla.com/portaudio.git
- REF c5d2c51bd6fe354d0ee1119ba932bfebd3ebfacc
+ URL https://github.com/PortAudio/portaudio.git
+ REF 0ac93f8634d113cf90aa5801c204e1e8adbc14e8
PATCHES
fix-library-can-not-be-found.patch
- fix-include.patch
)
string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} dynamic PA_BUILD_SHARED)
diff --git a/ports/portaudio/vcpkg.json b/ports/portaudio/vcpkg.json index 1dce28b1b..90becf827 100644 --- a/ports/portaudio/vcpkg.json +++ b/ports/portaudio/vcpkg.json @@ -1,8 +1,7 @@ { "name": "portaudio", - "version-string": "2020-02-02", - "port-version": 2, + "version-date": "2020-02-20", "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.", - "homepage": "https://app.assembla.com/spaces/portaudio/wiki", + "homepage": "http://www.portaudio.com", "supports": "!uwp" } diff --git a/versions/baseline.json b/versions/baseline.json index e93726249..a757fd473 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4689,8 +4689,8 @@ "port-version": 0 }, "portaudio": { - "baseline": "2020-02-02", - "port-version": 2 + "baseline": "2020-02-20", + "port-version": 0 }, "portmidi": { "baseline": "0.234", diff --git a/versions/p-/portaudio.json b/versions/p-/portaudio.json index 31f3cf32f..35efce993 100644 --- a/versions/p-/portaudio.json +++ b/versions/p-/portaudio.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "5c048383171fcac71dd7b78d6d5e8821d0956c65", + "version-date": "2020-02-20", + "port-version": 0 + }, + { "git-tree": "9e434db8e8407121b84aa66774792451540eec9d", "version-string": "2020-02-02", "port-version": 2 |
