aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Kyne <xskyne@gmail.com>2020-08-21 18:44:38 +0200
committerGitHub <noreply@github.com>2020-08-21 09:44:38 -0700
commit0d2c77cdb761a405cbe57017c278547fafd1b5b7 (patch)
tree49695ab64fed1f73cf69fd7018b34436c68437c3
parent7b285940a8279eae24a9a1f847b3c61bfcbe0494 (diff)
downloadvcpkg-0d2c77cdb761a405cbe57017c278547fafd1b5b7.tar.gz
vcpkg-0d2c77cdb761a405cbe57017c278547fafd1b5b7.zip
[portmidi] Updated portmidi package to use alternative code source (#12046)
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
-rw-r--r--ports/portmidi/CONTROL4
-rw-r--r--ports/portmidi/portfile.cmake12
-rw-r--r--scripts/ci.baseline.txt4
3 files changed, 9 insertions, 11 deletions
diff --git a/ports/portmidi/CONTROL b/ports/portmidi/CONTROL
index f5518c3e1..9f9f60c36 100644
--- a/ports/portmidi/CONTROL
+++ b/ports/portmidi/CONTROL
@@ -1,5 +1,5 @@
Source: portmidi
-Version: 0.217.1-4
+Version: 0.234
Homepage: https://sourceforge.net/projects/portmedia/
Description: Free, cross-platform, open-source I/O library for MIDI
-Supports: !uwp \ No newline at end of file
+Supports: windows&!uwp&!arm
diff --git a/ports/portmidi/portfile.cmake b/ports/portmidi/portfile.cmake
index b78b34fb4..a2049278b 100644
--- a/ports/portmidi/portfile.cmake
+++ b/ports/portmidi/portfile.cmake
@@ -1,13 +1,15 @@
-vcpkg_fail_port_install(ON_TARGET "UWP")
+vcpkg_fail_port_install(ON_TARGET "linux" "osx" "uwp" ON_ARCH "arm")
vcpkg_from_sourceforge(
OUT_SOURCE_PATH SOURCE_PATH
- REPO portmedia/portmidi
- REF 217
- FILENAME "portmidi-src-217.zip"
- SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
+ REPO portmedia
+ FILENAME "portmedia-code-r234.zip"
+ SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794
)
+# Alter path to main portmidi root
+set(SOURCE_PATH "${SOURCE_PATH}/portmidi/trunk")
+
# Mark portmidi-static as static, disable pmjni library depending on the Java SDK
file(READ "${SOURCE_PATH}/pm_common/CMakeLists.txt" PM_CMAKE)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index e5292ed5c..65294b6bf 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1346,10 +1346,6 @@ portaudio:x64-uwp=fail
portaudio:x64-windows-static=fail
portaudio:x64-windows=fail
portaudio:x86-windows=fail
-portmidi:arm-uwp=fail
-portmidi:x64-linux=fail
-portmidi:x64-osx=fail
-portmidi:x64-uwp=fail
pqp:arm-uwp=fail
pqp:x64-uwp=fail
proj4:arm64-windows=fail