From a02f8e11de64c83dde6cfe2a038a5be42693b256 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Thu, 12 Aug 2021 19:26:09 -0700 Subject: [PATCH] [rtaudio] Fix hidden dependencies on Linux (#19516) --- ports/rtaudio/LICENSE | 26 -------------------------- ports/rtaudio/portfile.cmake | 17 ++++++++++------- ports/rtaudio/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/r-/rtaudio.json | 5 +++++ 5 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 ports/rtaudio/LICENSE diff --git a/ports/rtaudio/LICENSE b/ports/rtaudio/LICENSE deleted file mode 100644 index 4a6357c2b0..0000000000 --- a/ports/rtaudio/LICENSE +++ /dev/null @@ -1,26 +0,0 @@ -RtAudio: a set of realtime audio i/o C++ classes -Copyright (c) 2001-2019 Gary P. Scavone - -Permission is hereby granted, free of charge, to any person -obtaining a copy of this software and associated documentation files -(the "Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -Any person wishing to distribute modifications to the Software is -asked to send the modifications to the original developer so that -they can be incorporated into the canonical version. This is, -however, not a binding provision of this license. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF -CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/ports/rtaudio/portfile.cmake b/ports/rtaudio/portfile.cmake index 2a10e34e93..bd01993ae6 100644 --- a/ports/rtaudio/portfile.cmake +++ b/ports/rtaudio/portfile.cmake @@ -8,6 +8,10 @@ vcpkg_from_github( HEAD_REF master ) +if(VCPKG_HOST_IS_LINUX) + message(WARNING "rtaudio requires ALSA on Linux; this is available on ubuntu via apt install libasound2-dev") +endif() + if(VCPKG_CRT_LINKAGE STREQUAL static) set(RTAUDIO_STATIC_MSVCRT ON) else() @@ -22,7 +26,11 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA - OPTIONS -DRTAUDIO_STATIC_MSVCRT=${RTAUDIO_STATIC_MSVCRT} ${FEATURE_OPTIONS} + OPTIONS + -DRTAUDIO_STATIC_MSVCRT=${RTAUDIO_STATIC_MSVCRT} + -DRTAUDIO_API_JACK=OFF + -DRTAUDIO_API_PULSE=OFF + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() @@ -31,9 +39,4 @@ vcpkg_fixup_cmake_targets() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) - -# Version 5.1.0 has the license text embedded in the README.md, so we are including it as a standalone file in the vcpkg port -# Current master version of rtaudio has a LICENSE file which should be used instead for ports of future releases -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) - +configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/rtaudio/vcpkg.json b/ports/rtaudio/vcpkg.json index 7ad1c148d7..1dc3e1df8f 100644 --- a/ports/rtaudio/vcpkg.json +++ b/ports/rtaudio/vcpkg.json @@ -1,6 +1,7 @@ { "name": "rtaudio", "version-date": "2021-05-18", + "port-version": 1, "description": "A set of C++ classes that provide a common API for realtime audio input/output across Linux (native ALSA, JACK, PulseAudio and OSS), Macintosh OS X (CoreAudio and JACK), and Windows (DirectSound, ASIO and WASAPI) operating systems.", "homepage": "https://github.com/thestk/rtaudio", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 1f34323f21..e135641ae6 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5666,7 +5666,7 @@ }, "rtaudio": { "baseline": "2021-05-18", - "port-version": 0 + "port-version": 1 }, "rtlsdr": { "baseline": "2020-04-16-1", diff --git a/versions/r-/rtaudio.json b/versions/r-/rtaudio.json index caf165f36f..5978c80e68 100644 --- a/versions/r-/rtaudio.json +++ b/versions/r-/rtaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "73b803ac8a870dd48165b34aecc29f2155b5b172", + "version-date": "2021-05-18", + "port-version": 1 + }, { "git-tree": "0c7518511b154ea4ca636e2f6c43248b59cb47ed", "version-date": "2021-05-18",