From 48cacddf2aa429302c862618d85773a292758367 Mon Sep 17 00:00:00 2001 From: Daniel Reuter Date: Mon, 10 May 2021 11:13:00 +0200 Subject: [PATCH 1/6] add port for `rubberband` [rubberband](https://www.breakfastquay.com/rubberband/) is a small library for stretching sounds. This is the minimal portfile to make vcpkg happy, but probably still needs some improvement, i.e. not picking up system libraries. --- ports/rubberband/portfile.cmake | 24 ++++++++++++++++++++++++ ports/rubberband/vcpkg.json | 9 +++++++++ 2 files changed, 33 insertions(+) create mode 100644 ports/rubberband/portfile.cmake create mode 100644 ports/rubberband/vcpkg.json diff --git a/ports/rubberband/portfile.cmake b/ports/rubberband/portfile.cmake new file mode 100644 index 00000000000000..93b61026497b84 --- /dev/null +++ b/ports/rubberband/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_download_distfile( + ARCHIVE URLS "https://breakfastquay.com/files/releases/rubberband-1.9.1.tar.bz2" + FILENAME "rubberband-1.9.1.tar.bz2" + SHA512 cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3 +) + +vcpkg_extract_source_archive_ex( + OUT_SOURCE_PATH SOURCE_PATH + ARCHIVE ${ARCHIVE} +) + +vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH}) + +vcpkg_install_meson() + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + +file( + INSTALL ${SOURCE_PATH}/COPYING + DESTINATION ${CURRENT_PACKAGES_DIR}/share/rubberband + RENAME copyright +) diff --git a/ports/rubberband/vcpkg.json b/ports/rubberband/vcpkg.json new file mode 100644 index 00000000000000..a25ee20e7529e4 --- /dev/null +++ b/ports/rubberband/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "rubberband", + "version": "1.9.1", + "description": "High quality software library for audio time-stretching and pitch-shifting.", + "homepage": "https://www.breakfastquay.com/rubberband/", + "dependencies": [ + "kissfft" + ] +} From b0e82df169b6e9ee9f983a343acbcbbb7ebc8552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 5 May 2022 10:00:49 +0200 Subject: [PATCH 2/6] [rubberband] Update to 2.0.2 --- ports/rubberband/portfile.cmake | 55 ++++++++++++++++++++++++--------- ports/rubberband/vcpkg.json | 40 +++++++++++++++++++++--- versions/baseline.json | 4 +++ versions/r-/rubberband.json | 9 ++++++ 4 files changed, 90 insertions(+), 18 deletions(-) create mode 100644 versions/r-/rubberband.json diff --git a/ports/rubberband/portfile.cmake b/ports/rubberband/portfile.cmake index 93b61026497b84..9ea45cd734c778 100644 --- a/ports/rubberband/portfile.cmake +++ b/ports/rubberband/portfile.cmake @@ -1,24 +1,51 @@ -vcpkg_download_distfile( - ARCHIVE URLS "https://breakfastquay.com/files/releases/rubberband-1.9.1.tar.bz2" - FILENAME "rubberband-1.9.1.tar.bz2" - SHA512 cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3 +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO breakfastquay/rubberband + REF v2.0.2 + SHA512 56e33f3a6f5755242e46f9cb224e372bea7a367756f08d3322c8951a40b3907f1a2957775de6f2584a093e6adf82ca91015119650d5a624afe39086a47843ddc + HEAD_REF default ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} -) - -vcpkg_configure_meson(SOURCE_PATH ${SOURCE_PATH}) +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dfft=fftw # 'auto', 'builtin', 'kissfft', 'fftw', 'vdsp', 'ipp' 'FFT library to use. The default (auto) will use vDSP if available, the builtin implementation otherwise.') + -Dresampler=libsamplerate # 'auto', 'builtin', 'libsamplerate', 'speex', 'ipp' 'Resampler library to use. The default (auto) simply uses the builtin implementation.' + -Dipp_path= # 'Path to Intel IPP libraries, if selected for any of the other options.' + -Dextra_include_dirs= # 'Additional local header directories to search for dependencies.' + -Dextra_lib_dirs= # 'Additional local library directories to search for dependencies.' + ) vcpkg_install_meson() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +vcpkg_fixup_pkgconfig() +vcpkg_copy_pdbs() + +vcpkg_cmake_get_vars(cmake_vars_file) +include("${cmake_vars_file}") + +if(VCPKG_DETECTED_MSVC) + set(RUBBERBAND_PROGRAM_NAME rubberband-program) +else() + set(RUBBERBAND_PROGRAM_NAME rubberband) +endif() + +# Features cli and lv2 are build whenever suficient dependencies are installed, +# Remove them when not enabled. +if("cli" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES "${RUBBERBAND_PROGRAM_NAME}" AUTO_CLEAN) +else() + vcpkg_clean_executables_in_bin(FILE_NAMES "${RUBBERBAND_PROGRAM_NAME}") +endif() + +# lv2 feature is not supported on Windows yet because vcpkg can't isntall to +# %APPDATA%\LV2 or %COMMONPROGRAMFILES%\LV2 but also complains about dlls in "${CURRENT_PACKAGES_DIR}/lib/lv2" +if(NOT "lv2" IN_LIST FEATURES) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/lv2" "${CURRENT_PACKAGES_DIR}/debug/lib/lv2") endif() file( - INSTALL ${SOURCE_PATH}/COPYING - DESTINATION ${CURRENT_PACKAGES_DIR}/share/rubberband + INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright ) diff --git a/ports/rubberband/vcpkg.json b/ports/rubberband/vcpkg.json index a25ee20e7529e4..eef69995beef89 100644 --- a/ports/rubberband/vcpkg.json +++ b/ports/rubberband/vcpkg.json @@ -1,9 +1,41 @@ { "name": "rubberband", - "version": "1.9.1", - "description": "High quality software library for audio time-stretching and pitch-shifting.", + "version": "2.0.2", + "description": "A high quality software library for audio time-stretching and pitch-shifting.", "homepage": "https://www.breakfastquay.com/rubberband/", + "license": "GPL-2.0-or-later", + "supports": "!uwp", "dependencies": [ - "kissfft" - ] + "fftw3", + "libsamplerate", + { + "name": "vcpkg-cmake-get-vars", + "host": true + }, + { + "name": "vcpkg-tool-meson", + "host": true + } + ], + "features": { + "cli": { + "description": "Build the command-line utility", + "dependencies": [ + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } + ] + }, + "lv2": { + "description": "Build the LV2 plugin", + "supports": "!windows", + "dependencies": [ + "lv2" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index df8f9b99b4c61b..a844525a885333 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6304,6 +6304,10 @@ "baseline": "0.9.6", "port-version": 4 }, + "rubberband": { + "baseline": "2.0.2", + "port-version": 0 + }, "rxcpp": { "baseline": "4.1.0", "port-version": 2 diff --git a/versions/r-/rubberband.json b/versions/r-/rubberband.json new file mode 100644 index 00000000000000..4ddfccda12d118 --- /dev/null +++ b/versions/r-/rubberband.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "d006b646ea2747c896f59715ba1ce27053dd67dd", + "version": "2.0.2", + "port-version": 0 + } + ] +} From 440cd531d7048b58ed1e939d9299f3cb221a08ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Tue, 7 Jun 2022 20:59:15 +0200 Subject: [PATCH 3/6] [rubberband] remove lv2 feature, because the install location is out of the vcpkg install tree --- ports/rubberband/portfile.cmake | 6 ++---- ports/rubberband/vcpkg.json | 7 ------- versions/r-/rubberband.json | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/ports/rubberband/portfile.cmake b/ports/rubberband/portfile.cmake index 9ea45cd734c778..71f22e4e21cbd9 100644 --- a/ports/rubberband/portfile.cmake +++ b/ports/rubberband/portfile.cmake @@ -38,11 +38,9 @@ else() vcpkg_clean_executables_in_bin(FILE_NAMES "${RUBBERBAND_PROGRAM_NAME}") endif() -# lv2 feature is not supported on Windows yet because vcpkg can't isntall to +# lv2 feature is not supported yet because vcpkg can't isntall to # %APPDATA%\LV2 or %COMMONPROGRAMFILES%\LV2 but also complains about dlls in "${CURRENT_PACKAGES_DIR}/lib/lv2" -if(NOT "lv2" IN_LIST FEATURES) - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/lv2" "${CURRENT_PACKAGES_DIR}/debug/lib/lv2") -endif() +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/lv2" "${CURRENT_PACKAGES_DIR}/debug/lib/lv2") file( INSTALL "${SOURCE_PATH}/COPYING" diff --git a/ports/rubberband/vcpkg.json b/ports/rubberband/vcpkg.json index eef69995beef89..656a866cbd3a93 100644 --- a/ports/rubberband/vcpkg.json +++ b/ports/rubberband/vcpkg.json @@ -29,13 +29,6 @@ ] } ] - }, - "lv2": { - "description": "Build the LV2 plugin", - "supports": "!windows", - "dependencies": [ - "lv2" - ] } } } diff --git a/versions/r-/rubberband.json b/versions/r-/rubberband.json index 4ddfccda12d118..fc14261c459fb5 100644 --- a/versions/r-/rubberband.json +++ b/versions/r-/rubberband.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "d006b646ea2747c896f59715ba1ce27053dd67dd", + "git-tree": "ae68cabf01008125ca16d8cc90debf1ed0b0d300", "version": "2.0.2", "port-version": 0 } From c4fdb6827d09c09baa94601758a3b737bee85dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 10 Jun 2022 07:32:38 +0200 Subject: [PATCH 4/6] [rubberband] Remove vcpkg_cmake_get_vars dependency --- ports/rubberband/portfile.cmake | 7 +++---- ports/rubberband/vcpkg.json | 4 ---- versions/r-/rubberband.json | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/ports/rubberband/portfile.cmake b/ports/rubberband/portfile.cmake index 71f22e4e21cbd9..370bcae9511729 100644 --- a/ports/rubberband/portfile.cmake +++ b/ports/rubberband/portfile.cmake @@ -21,10 +21,9 @@ vcpkg_install_meson() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_cmake_get_vars(cmake_vars_file) -include("${cmake_vars_file}") - -if(VCPKG_DETECTED_MSVC) +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/rubberband-program${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + # Rubberband uses a different executable name when compiled with msvc + # Just looking for that file is faster than detecting msvc builds set(RUBBERBAND_PROGRAM_NAME rubberband-program) else() set(RUBBERBAND_PROGRAM_NAME rubberband) diff --git a/ports/rubberband/vcpkg.json b/ports/rubberband/vcpkg.json index 656a866cbd3a93..02368158203a6c 100644 --- a/ports/rubberband/vcpkg.json +++ b/ports/rubberband/vcpkg.json @@ -8,10 +8,6 @@ "dependencies": [ "fftw3", "libsamplerate", - { - "name": "vcpkg-cmake-get-vars", - "host": true - }, { "name": "vcpkg-tool-meson", "host": true diff --git a/versions/r-/rubberband.json b/versions/r-/rubberband.json index fc14261c459fb5..40368dfa2b1d9b 100644 --- a/versions/r-/rubberband.json +++ b/versions/r-/rubberband.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "ae68cabf01008125ca16d8cc90debf1ed0b0d300", + "git-tree": "36fb0f4ef0a3e3bdd46f1026dbf1de875eef2d97", "version": "2.0.2", "port-version": 0 } From ae7a9b3a594fc659a23e4638073e6f5db92536e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 27 Jun 2022 13:12:38 +0200 Subject: [PATCH 5/6] [rubberband] Disable static builds on windows because of broken libsndfile dependency --- ports/rubberband/vcpkg.json | 2 +- versions/r-/rubberband.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/rubberband/vcpkg.json b/ports/rubberband/vcpkg.json index 02368158203a6c..8c9bf8609bf33c 100644 --- a/ports/rubberband/vcpkg.json +++ b/ports/rubberband/vcpkg.json @@ -4,7 +4,7 @@ "description": "A high quality software library for audio time-stretching and pitch-shifting.", "homepage": "https://www.breakfastquay.com/rubberband/", "license": "GPL-2.0-or-later", - "supports": "!uwp", + "supports": "!uwp & !(windows & static)", "dependencies": [ "fftw3", "libsamplerate", diff --git a/versions/r-/rubberband.json b/versions/r-/rubberband.json index 40368dfa2b1d9b..378a1dfe38c283 100644 --- a/versions/r-/rubberband.json +++ b/versions/r-/rubberband.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "36fb0f4ef0a3e3bdd46f1026dbf1de875eef2d97", + "git-tree": "75aeab834246d0e2ba7de5f07901e5d7131397f7", "version": "2.0.2", "port-version": 0 } From 9cd401ea7f557189b7756c287cf708c3c8069905 Mon Sep 17 00:00:00 2001 From: David Chocholaty Date: Tue, 19 Jul 2022 18:47:05 +0200 Subject: [PATCH 6/6] [rubberband] create overlayed rubberband 3.0.0 This commit removes the rubberband 2.0.2 version from ports/rubberband to /overlay/ports/rubberband. It replaces the previous version in /overlay/ports/rubberband 1.9.0 and with that, the last 3.0.0 version is used. --- overlay/ports/rubberband/portfile.cmake | 76 ++++++++++++++----------- overlay/ports/rubberband/vcpkg.json | 29 +++++++--- ports/rubberband/portfile.cmake | 48 ---------------- ports/rubberband/vcpkg.json | 30 ---------- versions/baseline.json | 2 +- versions/r-/rubberband.json | 4 +- 6 files changed, 67 insertions(+), 122 deletions(-) delete mode 100644 ports/rubberband/portfile.cmake delete mode 100644 ports/rubberband/vcpkg.json diff --git a/overlay/ports/rubberband/portfile.cmake b/overlay/ports/rubberband/portfile.cmake index 80be439cc48dda..f3148bf8372b3f 100644 --- a/overlay/ports/rubberband/portfile.cmake +++ b/overlay/ports/rubberband/portfile.cmake @@ -1,40 +1,48 @@ -vcpkg_from_git( - OUT_SOURCE_PATH SOURCE_PATH - URL https://github.com/be-ing/rubberband.git - REF 3abe9d2ce8ada8b1d087cfc9d6f2f5199c727e14 +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO breakfastquay/rubberband + REF v3.0.0 + SHA512 384985e58a3fc5d9646428678ee6bcef2d232abed6d86b623302a78a4bf6e59e2fd5f5939e28bb988e82aa6f424fd1510e8e014a4ad1c96efe0010b61651a133 + HEAD_REF default ) -# Find cross-compiler prefix -if(VCPKG_CHAINLOAD_TOOLCHAIN_FILE) - include("${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}") -endif() -if(CMAKE_C_COMPILER) - vcpkg_execute_required_process( - COMMAND ${CMAKE_C_COMPILER} -dumpmachine - WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR} - LOGNAME dumpmachine-${TARGET_TRIPLET} - ) - file(READ ${CURRENT_BUILDTREES_DIR}/dumpmachine-${TARGET_TRIPLET}-out.log RUBBERBAND_HOST) - string(REPLACE "\n" "" RUBBERBAND_HOST "${RUBBERBAND_HOST}") - message(STATUS "Cross-compiling with ${CMAKE_C_COMPILER}") - message(STATUS "Detected autoconf triplet --host=${RUBBERBAND_HOST}") - message(STATUS "Options ${RUBBERBAND_OPTIONS}") - set(RUBBERBAND_OPTIONS - --host=${RUBBERBAND_HOST} - ${RUBBERBAND_OPTIONS} - ) -endif() - -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS ${RUBBERBAND_OPTIONS} +vcpkg_configure_meson( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -Dfft=fftw # 'auto', 'builtin', 'kissfft', 'fftw', 'vdsp', 'ipp' 'FFT library to use. The default (auto) will use vDSP if available, the builtin implementation otherwise.') + -Dresampler=libsamplerate # 'auto', 'builtin', 'libsamplerate', 'speex', 'ipp' 'Resampler library to use. The default (auto) simply uses the builtin implementation.' + -Dipp_path= # 'Path to Intel IPP libraries, if selected for any of the other options.' + -Dextra_include_dirs= # 'Additional local header directories to search for dependencies.' + -Dextra_lib_dirs= # 'Additional local library directories to search for dependencies.' ) -vcpkg_install_cmake() +vcpkg_install_meson() + +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/rubberband) -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/rubberband RENAME copyright) -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/rubberband-program${VCPKG_TARGET_EXECUTABLE_SUFFIX}") + # Rubberband uses a different executable name when compiled with msvc + # Just looking for that file is faster than detecting msvc builds + set(RUBBERBAND_PROGRAM_NAME rubberband-program) +else() + set(RUBBERBAND_PROGRAM_NAME rubberband) +endif() + +# Features cli and lv2 are build whenever suficient dependencies are installed, +# Remove them when not enabled. +if("cli" IN_LIST FEATURES) + vcpkg_copy_tools(TOOL_NAMES "${RUBBERBAND_PROGRAM_NAME}" AUTO_CLEAN) +else() + vcpkg_clean_executables_in_bin(FILE_NAMES "${RUBBERBAND_PROGRAM_NAME}") +endif() + +# lv2 feature is not supported yet because vcpkg can't isntall to +# %APPDATA%\LV2 or %COMMONPROGRAMFILES%\LV2 but also complains about dlls in "${CURRENT_PACKAGES_DIR}/lib/lv2" +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/lv2" "${CURRENT_PACKAGES_DIR}/debug/lib/lv2") + +file( + INSTALL "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" + RENAME copyright +) diff --git a/overlay/ports/rubberband/vcpkg.json b/overlay/ports/rubberband/vcpkg.json index b0c6dcc3b9ce8f..1f3d905bad04e3 100644 --- a/overlay/ports/rubberband/vcpkg.json +++ b/overlay/ports/rubberband/vcpkg.json @@ -1,15 +1,30 @@ { "name": "rubberband", - "version-string": "1.9.0", - "port-version": 2, - "description": "A high quality software library for audio time-stretching and pitch-shifting", - "homepage": "https://breakfastquay.com/rubberband/", + "version": "3.0.0", + "description": "A high quality software library for audio time-stretching and pitch-shifting.", + "homepage": "https://www.breakfastquay.com/rubberband/", + "license": "GPL-2.0-or-later", + "supports": "!uwp & !(windows & static)", "dependencies": [ "fftw3", "libsamplerate", { - "name": "libsndfile", - "default-features": false + "name": "vcpkg-tool-meson", + "host": true } - ] + ], + "features": { + "cli": { + "description": "Build the command-line utility", + "dependencies": [ + { + "name": "libsndfile", + "default-features": false, + "features": [ + "external-libs" + ] + } + ] + } + } } diff --git a/ports/rubberband/portfile.cmake b/ports/rubberband/portfile.cmake deleted file mode 100644 index 370bcae9511729..00000000000000 --- a/ports/rubberband/portfile.cmake +++ /dev/null @@ -1,48 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO breakfastquay/rubberband - REF v2.0.2 - SHA512 56e33f3a6f5755242e46f9cb224e372bea7a367756f08d3322c8951a40b3907f1a2957775de6f2584a093e6adf82ca91015119650d5a624afe39086a47843ddc - HEAD_REF default -) - -vcpkg_configure_meson( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -Dfft=fftw # 'auto', 'builtin', 'kissfft', 'fftw', 'vdsp', 'ipp' 'FFT library to use. The default (auto) will use vDSP if available, the builtin implementation otherwise.') - -Dresampler=libsamplerate # 'auto', 'builtin', 'libsamplerate', 'speex', 'ipp' 'Resampler library to use. The default (auto) simply uses the builtin implementation.' - -Dipp_path= # 'Path to Intel IPP libraries, if selected for any of the other options.' - -Dextra_include_dirs= # 'Additional local header directories to search for dependencies.' - -Dextra_lib_dirs= # 'Additional local library directories to search for dependencies.' - ) - -vcpkg_install_meson() - -vcpkg_fixup_pkgconfig() -vcpkg_copy_pdbs() - -if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/rubberband-program${VCPKG_TARGET_EXECUTABLE_SUFFIX}") - # Rubberband uses a different executable name when compiled with msvc - # Just looking for that file is faster than detecting msvc builds - set(RUBBERBAND_PROGRAM_NAME rubberband-program) -else() - set(RUBBERBAND_PROGRAM_NAME rubberband) -endif() - -# Features cli and lv2 are build whenever suficient dependencies are installed, -# Remove them when not enabled. -if("cli" IN_LIST FEATURES) - vcpkg_copy_tools(TOOL_NAMES "${RUBBERBAND_PROGRAM_NAME}" AUTO_CLEAN) -else() - vcpkg_clean_executables_in_bin(FILE_NAMES "${RUBBERBAND_PROGRAM_NAME}") -endif() - -# lv2 feature is not supported yet because vcpkg can't isntall to -# %APPDATA%\LV2 or %COMMONPROGRAMFILES%\LV2 but also complains about dlls in "${CURRENT_PACKAGES_DIR}/lib/lv2" -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/lv2" "${CURRENT_PACKAGES_DIR}/debug/lib/lv2") - -file( - INSTALL "${SOURCE_PATH}/COPYING" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright -) diff --git a/ports/rubberband/vcpkg.json b/ports/rubberband/vcpkg.json deleted file mode 100644 index 8c9bf8609bf33c..00000000000000 --- a/ports/rubberband/vcpkg.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "name": "rubberband", - "version": "2.0.2", - "description": "A high quality software library for audio time-stretching and pitch-shifting.", - "homepage": "https://www.breakfastquay.com/rubberband/", - "license": "GPL-2.0-or-later", - "supports": "!uwp & !(windows & static)", - "dependencies": [ - "fftw3", - "libsamplerate", - { - "name": "vcpkg-tool-meson", - "host": true - } - ], - "features": { - "cli": { - "description": "Build the command-line utility", - "dependencies": [ - { - "name": "libsndfile", - "default-features": false, - "features": [ - "external-libs" - ] - } - ] - } - } -} diff --git a/versions/baseline.json b/versions/baseline.json index a844525a885333..b13db329821476 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6305,7 +6305,7 @@ "port-version": 4 }, "rubberband": { - "baseline": "2.0.2", + "baseline": "3.0.0", "port-version": 0 }, "rxcpp": { diff --git a/versions/r-/rubberband.json b/versions/r-/rubberband.json index 378a1dfe38c283..1f6786ebe071a8 100644 --- a/versions/r-/rubberband.json +++ b/versions/r-/rubberband.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "75aeab834246d0e2ba7de5f07901e5d7131397f7", - "version": "2.0.2", + "git-tree": "5a88d8114ee2e769860aae2d477053bbeeaec1eb", + "version": "3.0.0", "port-version": 0 } ]