diff --git a/ports/rtmidi/fix-cmake-install.patch b/ports/rtmidi/fix-cmake-install.patch deleted file mode 100644 index 3e02c92f5d..0000000000 --- a/ports/rtmidi/fix-cmake-install.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e6af930..f3eadf2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -191,7 +191,7 @@ set_target_properties(rtmidi PROPERTIES - target_include_directories(rtmidi PRIVATE ${INCDIRS} - PUBLIC - $ -- $) -+ $) - - # Set compile-time definitions - target_compile_definitions(rtmidi PRIVATE ${API_DEFS}) diff --git a/ports/rtmidi/fix-cmake-usage.patch b/ports/rtmidi/fix-cmake-usage.patch deleted file mode 100644 index 8e6c6efee8..0000000000 --- a/ports/rtmidi/fix-cmake-usage.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 616fdaf..e6af930 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -280,7 +280,7 @@ include(CMakePackageConfigHelpers) - - # Write cmake package version file - write_basic_package_version_file( -- RtMidi-config-version.cmake -+ rtmidi-config-version.cmake - VERSION ${FULL_VER} - COMPATIBILITY SameMajorVersion - ) -@@ -288,15 +288,15 @@ write_basic_package_version_file( - # Write cmake package config file - configure_package_config_file ( - cmake/RtMidi-config.cmake.in -- RtMidi-config.cmake -+ rtmidi-config.cmake - INSTALL_DESTINATION "${RTMIDI_CMAKE_DESTINATION}" - ) - - # Install package files - install ( - FILES -- "${CMAKE_CURRENT_BINARY_DIR}/RtMidi-config.cmake" -- "${CMAKE_CURRENT_BINARY_DIR}/RtMidi-config-version.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/rtmidi-config.cmake" -+ "${CMAKE_CURRENT_BINARY_DIR}/rtmidi-config-version.cmake" - DESTINATION - "${RTMIDI_CMAKE_DESTINATION}" - ) diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake index 0d8583716e..777822493e 100644 --- a/ports/rtmidi/portfile.cmake +++ b/ports/rtmidi/portfile.cmake @@ -5,12 +5,9 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO thestk/rtmidi - REF 84a99422a3faf1ab417fe71c0903a48debb9376a # 5.0.0 - SHA512 388e280b7966281e22b0048d6fb2541921df1113d84e49bbc444fff591d2025588edd8d61dbe5ff017afd76c26fd05edc8f9f15d0cce16315ccc15e6aac1d57f + REF "${VERSION}" + SHA512 7ff7f85ff86fc019ab7906a46efc986b2a340b2f9a9d504bda85d0afc75921b905b32cb37f87e30ab9d1f13e62587c4ade736dad1609a0880eeab3fe5a936acb HEAD_REF master - PATCHES - fix-cmake-usage.patch # Remove this patch in the next update - fix-cmake-install.patch # Remove this patch in the next update ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS diff --git a/ports/rtmidi/vcpkg.json b/ports/rtmidi/vcpkg.json index f242870f46..36b70afaf5 100644 --- a/ports/rtmidi/vcpkg.json +++ b/ports/rtmidi/vcpkg.json @@ -1,7 +1,6 @@ { "name": "rtmidi", - "version": "5.0.0", - "port-version": 3, + "version": "6.0.0", "description": "A set of C++ classes that provide a common API for realtime MIDI input/output across Linux (ALSA & JACK), Macintosh OS X (CoreMidi & JACK) and Windows (Multimedia)", "homepage": "https://github.com/thestk/rtmidi", "license": "MIT", diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index cc14caa9da..d7eae6ba8c 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -993,6 +993,9 @@ rest-rpc:arm64-osx=skip rpclib:arm64-windows=fail rpclib:arm64-uwp=fail rpclib:x64-uwp=fail +rtmidi:arm-neon-android=fail +rtmidi:arm64-android=fail +rtmidi:x64-android=fail salome-medcoupling:x64-linux=fail scintilla:arm-neon-android=fail scintilla:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 0239daddb3..1cb5f0bffc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8005,8 +8005,8 @@ "port-version": 0 }, "rtmidi": { - "baseline": "5.0.0", - "port-version": 3 + "baseline": "6.0.0", + "port-version": 0 }, "rttr": { "baseline": "0.9.6+20210811", diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json index 6dcf99a4a6..34ca056589 100644 --- a/versions/r-/rtmidi.json +++ b/versions/r-/rtmidi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cd6d5a044a924c8ba7f3a1243ab28ca22c224f28", + "version": "6.0.0", + "port-version": 0 + }, { "git-tree": "83f2bd1bc41359997ee59a894bbfe5aab7e5a5df", "version": "5.0.0",