aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCheney Wang <38240633+Cheney-W@users.noreply.github.com>2021-08-09 08:56:48 -0700
committerGitHub <noreply@github.com>2021-08-09 08:56:48 -0700
commit8aa1541d793e159454d4fd2884924bbb3484db47 (patch)
tree2da5d61520fe7fb2804635630288866a9db9c9ef
parentd95f86ca08386f4a999ff4ca9db696b228f1dc52 (diff)
downloadvcpkg-8aa1541d793e159454d4fd2884924bbb3484db47.tar.gz
vcpkg-8aa1541d793e159454d4fd2884924bbb3484db47.zip
[rtmidi] Fix fatal error C1083: Cannot open include file: jack/jack.h (#19458)
* [rtmidi] Fix fatal error C1083: Cannot open include file:jack/jack.h * Update json file * Modify the format of portfile.cmake * Update json
-rw-r--r--ports/rtmidi/CONTROL6
-rw-r--r--ports/rtmidi/portfile.cmake13
-rw-r--r--ports/rtmidi/vcpkg.json8
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/r-/rtmidi.json5
5 files changed, 21 insertions, 13 deletions
diff --git a/ports/rtmidi/CONTROL b/ports/rtmidi/CONTROL
deleted file mode 100644
index 7c2c39f2a..000000000
--- a/ports/rtmidi/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: rtmidi
-Version: 4.0.0
-Port-Version: 2
-Homepage: https://github.com/thestk/rtmidi
-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)
-Supports: !uwp
diff --git a/ports/rtmidi/portfile.cmake b/ports/rtmidi/portfile.cmake
index 4a9fccbcc..8d1316ff6 100644
--- a/ports/rtmidi/portfile.cmake
+++ b/ports/rtmidi/portfile.cmake
@@ -15,15 +15,16 @@ vcpkg_from_github(
)
vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- PREFER_NINJA
- OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
- OPTIONS -DRTMIDI_API_ALSA=OFF
+ SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
+ OPTIONS
+ -DRTMIDI_API_ALSA=OFF
+ -DRTMIDI_API_JACK=OFF
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/rtmidi/vcpkg.json b/ports/rtmidi/vcpkg.json
new file mode 100644
index 000000000..82d6c482c
--- /dev/null
+++ b/ports/rtmidi/vcpkg.json
@@ -0,0 +1,8 @@
+{
+ "name": "rtmidi",
+ "version-semver": "4.0.0",
+ "port-version": 3,
+ "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",
+ "supports": "!uwp"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 271dc491d..0b72c0093 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5666,7 +5666,7 @@
},
"rtmidi": {
"baseline": "4.0.0",
- "port-version": 2
+ "port-version": 3
},
"rttr": {
"baseline": "0.9.6-2",
diff --git a/versions/r-/rtmidi.json b/versions/r-/rtmidi.json
index 49e3bb230..07e63c77a 100644
--- a/versions/r-/rtmidi.json
+++ b/versions/r-/rtmidi.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "4c13583da321fa3efa7a075032d0ed880dd15e48",
+ "version-semver": "4.0.0",
+ "port-version": 3
+ },
+ {
"git-tree": "65614f322a89cff92478b3f6736d287653085a34",
"version-string": "4.0.0",
"port-version": 2