From be54aa883f20d9cc28bed5dc1f907e27d53c3884 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:27:27 +0800
Subject: [PATCH 1/8] [rtmidi] update to 3.0.0

---
 ports/rtmidi/fix-cmake-install.patch | 13 -----------
 ports/rtmidi/fix-cmake-usage.patch   | 32 ----------------------------
 ports/rtmidi/portfile.cmake          |  7 ++----
 ports/rtmidi/vcpkg.json              |  3 +--
 4 files changed, 3 insertions(+), 52 deletions(-)
 delete mode 100644 ports/rtmidi/fix-cmake-install.patch
 delete mode 100644 ports/rtmidi/fix-cmake-usage.patch

diff --git a/ports/rtmidi/fix-cmake-install.patch b/ports/rtmidi/fix-cmake-install.patch
deleted file mode 100644
index 3e02c92f5d8bb0..00000000000000
--- 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
-                                     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
--                                    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-+                                    $<INSTALL_INTERFACE:include>)
- 
- # 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 8e6c6efee876c6..00000000000000
--- 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 0d8583716e2744..b0d2e4e75c2ac6 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 "v${VERSION}"
+    SHA512 8975a63e7be9102af70401cef48c702597b87efe2d8fa30a978fe280e26da1dfa90d6f30cfbd3df587462f0dd085d0f29e1c014e67d7fcd3a36960b6bcfb3e55
     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 f242870f46ccce..80cc67ed0296bc 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": "3.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",

From 4479e206610e8ecd027fb3d3a77bc95ea2707c1b Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:27:28 +0800
Subject: [PATCH 2/8] [rtmidi] add version

---
 versions/baseline.json  | 4 ++--
 versions/r-/rtmidi.json | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index faf37fb1481c02..0b91a9395b8b71 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8013,8 +8013,8 @@
       "port-version": 0
     },
     "rtmidi": {
-      "baseline": "5.0.0",
-      "port-version": 3
+      "baseline": "3.0.0",
+      "port-version": 0
     },
     "rttr": {
       "baseline": "0.9.6+20210811",
diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json
index 6dcf99a4a671bc..ef34d53b23cad3 100644
--- a/versions/r-/rtmidi.json
+++ b/versions/r-/rtmidi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "147bd0564f8c8363ec52f07247a2d9eca3aefc44",
+      "version": "3.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "83f2bd1bc41359997ee59a894bbfe5aab7e5a5df",
       "version": "5.0.0",

From c5e332c252400bf4dfbc58f2ffb62b3c9591c6b2 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:46:37 +0800
Subject: [PATCH 3/8] [rtmidi] update to 6.0.0

---
 ports/rtmidi/portfile.cmake | 6 +++---
 ports/rtmidi/vcpkg.json     | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake
index b0d2e4e75c2ac6..286e7dc3fcd83e 100644
--- a/ports/rtmidi/portfile.cmake
+++ b/ports/rtmidi/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO thestk/rtmidi
-    REF "v${VERSION}"
-    SHA512 8975a63e7be9102af70401cef48c702597b87efe2d8fa30a978fe280e26da1dfa90d6f30cfbd3df587462f0dd085d0f29e1c014e67d7fcd3a36960b6bcfb3e55
+    REF "${VERSION}"
+    SHA512 7ff7f85ff86fc019ab7906a46efc986b2a340b2f9a9d504bda85d0afc75921b905b32cb37f87e30ab9d1f13e62587c4ade736dad1609a0880eeab3fe5a936acb
     HEAD_REF master
 )
 
@@ -30,4 +30,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+mfile(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/rtmidi/vcpkg.json b/ports/rtmidi/vcpkg.json
index 80cc67ed0296bc..36b70afaf59cc4 100644
--- a/ports/rtmidi/vcpkg.json
+++ b/ports/rtmidi/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "rtmidi",
-  "version": "3.0.0",
+  "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",

From fa05b80dae0c1d06454db1127bd2d4f9595a819d Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:46:37 +0800
Subject: [PATCH 4/8] [rtmidi] add version

---
 versions/baseline.json  | 2 +-
 versions/r-/rtmidi.json | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/versions/baseline.json b/versions/baseline.json
index 0b91a9395b8b71..74628bab7945b1 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8013,7 +8013,7 @@
       "port-version": 0
     },
     "rtmidi": {
-      "baseline": "3.0.0",
+      "baseline": "6.0.0",
       "port-version": 0
     },
     "rttr": {
diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json
index ef34d53b23cad3..224bfe3df464ea 100644
--- a/versions/r-/rtmidi.json
+++ b/versions/r-/rtmidi.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "8fa68092720b91e151a0a7580707525fd1dd2895",
+      "version": "6.0.0",
+      "port-version": 0
+    },
     {
       "git-tree": "147bd0564f8c8363ec52f07247a2d9eca3aefc44",
       "version": "3.0.0",

From 953ebb290375d61af53c62eadab07ac89fe19034 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:49:06 +0800
Subject: [PATCH 5/8] bde tmp

---
 ports/rtmidi/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake
index 286e7dc3fcd83e..777822493e2dc6 100644
--- a/ports/rtmidi/portfile.cmake
+++ b/ports/rtmidi/portfile.cmake
@@ -30,4 +30,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
 vcpkg_fixup_pkgconfig()
 
-mfile(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

From 0c7c2b36abd89bfbe297730d42a3a002687f32e6 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Fri, 18 Oct 2024 13:49:27 +0800
Subject: [PATCH 6/8] bde tmp

---
 versions/r-/rtmidi.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json
index 224bfe3df464ea..34ca056589a068 100644
--- a/versions/r-/rtmidi.json
+++ b/versions/r-/rtmidi.json
@@ -1,15 +1,10 @@
 {
   "versions": [
     {
-      "git-tree": "8fa68092720b91e151a0a7580707525fd1dd2895",
+      "git-tree": "cd6d5a044a924c8ba7f3a1243ab28ca22c224f28",
       "version": "6.0.0",
       "port-version": 0
     },
-    {
-      "git-tree": "147bd0564f8c8363ec52f07247a2d9eca3aefc44",
-      "version": "3.0.0",
-      "port-version": 0
-    },
     {
       "git-tree": "83f2bd1bc41359997ee59a894bbfe5aab7e5a5df",
       "version": "5.0.0",

From b0543954fa96f16b77e0ec4aca99151e3cb57e91 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Tue, 22 Oct 2024 11:20:16 +0800
Subject: [PATCH 7/8] baseline

---
 scripts/ci.baseline.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index d9a56e951b0259..37ebd15a657cc4 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -998,6 +998,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:x86-android=fail
 salome-medcoupling:x64-linux=fail
 scintilla:arm-neon-android=fail
 scintilla:arm64-android=fail

From 79a1c7d6a4b821ed1809f298769c8a8bd895f3e9 Mon Sep 17 00:00:00 2001
From: jiayuehua <3423893+jiayuehua@users.noreply.github.com>
Date: Tue, 22 Oct 2024 11:51:29 +0800
Subject: [PATCH 8/8] baseline

---
 scripts/ci.baseline.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 37ebd15a657cc4..076f2431c4fda6 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1000,7 +1000,7 @@ rpclib:arm64-uwp=fail
 rpclib:x64-uwp=fail
 rtmidi:arm-neon-android=fail
 rtmidi:arm64-android=fail
-rtmidi:x86-android=fail
+rtmidi:x64-android=fail
 salome-medcoupling:x64-linux=fail
 scintilla:arm-neon-android=fail
 scintilla:arm64-android=fail