diff options
| author | Daniel Schürmann <daschuer@mixxx.org> | 2021-09-02 22:23:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 13:23:35 -0700 |
| commit | a35b42633c56923608a4f7222d4aa7b996015bf2 (patch) | |
| tree | f48d33a263c379bfab705c3596b314ba741764ea | |
| parent | 9f73bc1a0e71b8883f20cae72a4e63ce347a3493 (diff) | |
| download | vcpkg-a35b42633c56923608a4f7222d4aa7b996015bf2.tar.gz vcpkg-a35b42633c56923608a4f7222d4aa7b996015bf2.zip | |
[portmidi] add osx support (#19366)
* [portmidi] add osx support
* [portmidi] replace CONTROL with vcpkg.json
* [portmidi] Introduce "port-version": 1
* [portmidi] quote all path strings
* [portmidi] update version database
* [portmidi] make use of ${PORT}
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
| -rw-r--r-- | ports/portmidi/CONTROL | 5 | ||||
| -rw-r--r-- | ports/portmidi/portfile.cmake | 45 | ||||
| -rw-r--r-- | ports/portmidi/vcpkg.json | 8 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/p-/portmidi.json | 5 |
5 files changed, 46 insertions, 19 deletions
diff --git a/ports/portmidi/CONTROL b/ports/portmidi/CONTROL deleted file mode 100644 index 9f9f60c36..000000000 --- a/ports/portmidi/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: portmidi -Version: 0.234 -Homepage: https://sourceforge.net/projects/portmedia/ -Description: Free, cross-platform, open-source I/O library for MIDI -Supports: windows&!uwp&!arm diff --git a/ports/portmidi/portfile.cmake b/ports/portmidi/portfile.cmake index a2049278b..5fc9d62e3 100644 --- a/ports/portmidi/portfile.cmake +++ b/ports/portmidi/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_TARGET "linux" "osx" "uwp" ON_ARCH "arm") +vcpkg_fail_port_install(ON_TARGET "linux" "uwp" ON_ARCH "arm") vcpkg_from_sourceforge( OUT_SOURCE_PATH SOURCE_PATH @@ -10,13 +10,19 @@ vcpkg_from_sourceforge( # 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}/CMakeLists.txt" PM_CMAKE) +string(REPLACE + "set(CMAKE_OSX_ARCHITECTURES i386 ppc x86_64 CACHE STRING \"change to needed architecture for a smaller library\" FORCE)" + "# Removed preconfigured CMAKE_OSX_ARCHITECTURES" PM_CMAKE "${PM_CMAKE}") +file(WRITE "${SOURCE_PATH}/CMakeLists.txt" "${PM_CMAKE}") +# Mark portmidi-static as static, disable pmjni library depending on the Java SDK file(READ "${SOURCE_PATH}/pm_common/CMakeLists.txt" PM_CMAKE) string(REPLACE "add_library(portmidi-static \${LIBSRC})" "add_library(portmidi-static STATIC \${LIBSRC})" PM_CMAKE "${PM_CMAKE}") string(REPLACE "add_library(pmjni SHARED \${JNISRC})" "# Removed pmjni" PM_CMAKE "${PM_CMAKE}") string(REPLACE "target_link_libraries(pmjni \${JNI_EXTRA_LIBS})" "# Removed pmjni" PM_CMAKE "${PM_CMAKE}") string(REPLACE "set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION \"jnilib\")" "# Removed pmjni" PM_CMAKE "${PM_CMAKE}") +string(REPLACE "INSTALL(TARGETS portmidi-static pmjni" "INSTALL(TARGETS portmidi-static" PM_CMAKE "${PM_CMAKE}") file(WRITE "${SOURCE_PATH}/pm_common/CMakeLists.txt" "${PM_CMAKE}") # Run cmake configure step @@ -26,22 +32,35 @@ vcpkg_configure_cmake( -DJAVA_INCLUDE_PATH= -DJAVA_INCLUDE_PATH2= -DJAVA_JVM_LIBRARY= + -DCMAKE_CACHEFILE_DIR=.. ) # Run cmake build step, nothing is installed on Windows vcpkg_build_cmake() -file(INSTALL ${SOURCE_PATH}/pm_common/portmidi.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) -file(INSTALL ${SOURCE_PATH}/porttime/porttime.h DESTINATION ${CURRENT_PACKAGES_DIR}/include) +file(INSTALL "${SOURCE_PATH}/pm_common/portmidi.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") +file(INSTALL "${SOURCE_PATH}/porttime/porttime.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi_s.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi_s.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi_s.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi_s.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + else() + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi.lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + endif() else() - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/portmidi.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/Debug/portmidi.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -endif() + if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libportmidi_s.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libportmidi_s.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + else() + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libportmidi.a" DESTINATION "${CURRENT_PACKAGES_DIR}/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/libportmidi.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libportmidi.a" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/libportmidi.dylib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + endif() +endif() -file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/portmidi RENAME copyright) +file(INSTALL "${SOURCE_PATH}/license.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") diff --git a/ports/portmidi/vcpkg.json b/ports/portmidi/vcpkg.json new file mode 100644 index 000000000..5d95f2ef9 --- /dev/null +++ b/ports/portmidi/vcpkg.json @@ -0,0 +1,8 @@ +{ + "name": "portmidi", + "version-string": "0.234", + "port-version": 1, + "description": "Free, cross-platform, open-source I/O library for MIDI", + "homepage": "https://sourceforge.net/projects/portmedia/", + "supports": "windows & osx & !uwp & !arm" +} diff --git a/versions/baseline.json b/versions/baseline.json index 3240c7631..9bd4e2e4c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5078,7 +5078,7 @@ }, "portmidi": { "baseline": "0.234", - "port-version": 0 + "port-version": 1 }, "portsmf": { "baseline": "0.238", diff --git a/versions/p-/portmidi.json b/versions/p-/portmidi.json index 240a39a25..5e1b3dd93 100644 --- a/versions/p-/portmidi.json +++ b/versions/p-/portmidi.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "74273108463488d1c268248429a06de79521506b", + "version-string": "0.234", + "port-version": 1 + }, + { "git-tree": "16f079de23d02226d49bd22659392d85e568528e", "version-string": "0.234", "port-version": 0 |
