From 5ed66ab293f3e0c2fa62a4d0f15feb6af36936ac Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 7 Dec 2023 13:26:26 +0800 Subject: [PATCH] [rtaudio] update to 6.0.1 (#35520) --- ports/rtaudio/fix-alsa.patch | 19 ------------------- ports/rtaudio/portfile.cmake | 5 ++--- ports/rtaudio/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/r-/rtaudio.json | 5 +++++ 5 files changed, 10 insertions(+), 26 deletions(-) delete mode 100644 ports/rtaudio/fix-alsa.patch diff --git a/ports/rtaudio/fix-alsa.patch b/ports/rtaudio/fix-alsa.patch deleted file mode 100644 index 3953aadae2cb45..00000000000000 --- a/ports/rtaudio/fix-alsa.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a59e8bb..1334f5a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -123,12 +123,12 @@ endif() - # ALSA - if (RTAUDIO_API_ALSA) - set(NEED_PTHREAD ON) -- find_package(ALSA) -+ find_package(ALSA REQUIRED) - if (NOT ALSA_FOUND) - message(FATAL_ERROR "ALSA API requested but no ALSA dev libraries found") - endif() - list(APPEND INCDIRS ${ALSA_INCLUDE_DIR}) -- list(APPEND LINKLIBS ${ALSA_LIBRARY}) -+ list(APPEND LINKLIBS ${ALSA_LIBRARY} dl) - list(APPEND PKGCONFIG_REQUIRES "alsa") - list(APPEND API_DEFS "-D__LINUX_ALSA__") - list(APPEND API_LIST "alsa") diff --git a/ports/rtaudio/portfile.cmake b/ports/rtaudio/portfile.cmake index fd28a3aa2cca8c..1ccb885709b031 100644 --- a/ports/rtaudio/portfile.cmake +++ b/ports/rtaudio/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thestk/rtaudio - REF 46b01b5b134f33d8ddc3dab76829d4b1350e0522 - SHA512 f26f64fe77aa18c9adf401a720fc3d929af8655827f2c149539a1b73736efb3757ac2eaf5a6535a3c801df13e5f49728a49b6ffe5c01c2f91ab23e145bad5355 + REF ${VERSION} + SHA512 085feb2673185460717ba45fc87254961e477823759e11281092c1ba13301303de1cd36aa9efeba0710cbf2c70f2e2f7f9e41173cf372ded528c41612b19acd5 HEAD_REF master - PATCHES fix-alsa.patch ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" RTAUDIO_STATIC_MSVCRT) diff --git a/ports/rtaudio/vcpkg.json b/ports/rtaudio/vcpkg.json index c77a9a52790f28..204980ad24e240 100644 --- a/ports/rtaudio/vcpkg.json +++ b/ports/rtaudio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rtaudio", - "version-date": "2021-11-16", - "port-version": 2, + "version": "6.0.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", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index b9cd72b057541d..08a9ed1c3fec69 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7573,8 +7573,8 @@ "port-version": 3 }, "rtaudio": { - "baseline": "2021-11-16", - "port-version": 2 + "baseline": "6.0.1", + "port-version": 0 }, "rtlsdr": { "baseline": "2020-04-16", diff --git a/versions/r-/rtaudio.json b/versions/r-/rtaudio.json index 5be0172e806ad0..b0cc7141a3fd92 100644 --- a/versions/r-/rtaudio.json +++ b/versions/r-/rtaudio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b97a9859776e7d23b21a9660e9b31e69fdb84185", + "version": "6.0.1", + "port-version": 0 + }, { "git-tree": "989c7dceafbd4ea849445d86bdc1b4bbf7133960", "version-date": "2021-11-16",