diff options
| author | chausner <15180557+chausner@users.noreply.github.com> | 2021-10-12 05:13:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 20:13:00 -0700 |
| commit | 20a4c683b3e7b13da436287cc864fa0d20997b89 (patch) | |
| tree | 532f9705e96ad5bf1ae506fba701411aadf1721f | |
| parent | f4922ef9991310705dce4f1ac95534f1218f6c24 (diff) | |
| download | vcpkg-20a4c683b3e7b13da436287cc864fa0d20997b89.tar.gz vcpkg-20a4c683b3e7b13da436287cc864fa0d20997b89.zip | |
[wildmidi] Update to 0.4.4 (#20609)
* Update wildmidi to 0.4.4
* Update CI baseline
* Remove double quotes
* update version
* Remove obsolete patch file
* Update git-tree hash
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
| -rw-r--r-- | ports/wildmidi/0001-add-install-target.patch | 30 | ||||
| -rw-r--r-- | ports/wildmidi/portfile.cmake | 37 | ||||
| -rw-r--r-- | ports/wildmidi/vcpkg.json | 15 | ||||
| -rw-r--r-- | versions/baseline.json | 4 | ||||
| -rw-r--r-- | versions/w-/wildmidi.json | 5 |
5 files changed, 30 insertions, 61 deletions
diff --git a/ports/wildmidi/0001-add-install-target.patch b/ports/wildmidi/0001-add-install-target.patch deleted file mode 100644 index 8270cd9ea..000000000 --- a/ports/wildmidi/0001-add-install-target.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/CMakeLists.txt 2017-10-02 14:06:57.163881000 +0000 -+++ b/src/CMakeLists.txt 2017-10-02 14:08:52.815977600 +0000 -@@ -313,6 +313,27 @@ - ENDIF (WIN32 AND CMAKE_COMPILER_IS_MINGW) - - IF (WIN32 AND MSVC) -+ # install our libraries -+ IF (WANT_STATIC) -+ INSTALL(TARGETS libwildmidi_static DESTINATION ${WILDMIDILIB_INSTALLDIR}) -+ IF (WANT_PLAYERSTATIC) -+ INSTALL(TARGETS wildmidi-static DESTINATION bin) -+ ENDIF () -+ ENDIF (WANT_STATIC) -+ -+ IF (BUILD_SHARED_LIBS) -+ INSTALL(TARGETS libwildmidi_dynamic -+ ARCHIVE DESTINATION ${WILDMIDILIB_INSTALLDIR} -+ LIBRARY DESTINATION ${WILDMIDILIB_INSTALLDIR} -+ RUNTIME DESTINATION ${WILDMIDIDLL_INSTALLDIR} -+ ) -+ IF (WANT_PLAYER) -+ INSTALL(TARGETS wildmidi DESTINATION bin) -+ ENDIF () -+ ENDIF () -+ -+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/include/wildmidi_lib.h DESTINATION include) -+ - IF (WANT_MP_BUILD) - SET(MT_BUILD "/MP") - ENDIF () diff --git a/ports/wildmidi/portfile.cmake b/ports/wildmidi/portfile.cmake index 2280c4aca..6dbfb7557 100644 --- a/ports/wildmidi/portfile.cmake +++ b/ports/wildmidi/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Mindwerks/wildmidi - REF wildmidi-0.4.3 - SHA512 7e86e998ee97cdf57328e4cf5ef52a64926fd01999879c0eae5b6c823be4e6d116f7026230bd15d209e6616fbc7ba1c29ebd1f3be04735e341ce5c83298f956f + REF wildmidi-0.4.4 + SHA512 5B74EE83F1D7CE3B45D2F996AAA30EC6E7D7808EAB294A3EAF6FCEF77443523DF1F54BB0FB1B3105EDD0D72D75885FDA1A2E97C68DEFB5BBD687BDA5077D3454 HEAD_REF master - PATCHES - 0001-add-install-target.patch ) if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -14,33 +12,20 @@ else() set(WANT_STATIC "ON") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DWANT_PLAYER=OFF -DWANT_STATIC=${WANT_STATIC} ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME WildMidi CONFIG_PATH lib/cmake/WildMidi) +vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -# Rename library to get rid of _dynamic and _static suffix -if(NOT VCPKG_CMAKE_SYSTEM_NAME) - if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/wildmidi_dynamic.lib ${CURRENT_PACKAGES_DIR}/lib/wildmidi.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi_dynamic.lib ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/wildmidi_dynamic.dll ${CURRENT_PACKAGES_DIR}/bin/wildmidi.dll) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/bin/wildmidi_dynamic.dll ${CURRENT_PACKAGES_DIR}/debug/bin/wildmidi.dll) - else() - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/wildmidi_static.lib ${CURRENT_PACKAGES_DIR}/lib/wildmidi.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/wildmidi.lib) - endif() -endif() - -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/man") -# Handle copyright -file(INSTALL ${SOURCE_PATH}/docs/license/LGPLv3.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/wildmidi RENAME copyright) +file(INSTALL "${SOURCE_PATH}/docs/license/LGPLv3.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/wildmidi/vcpkg.json b/ports/wildmidi/vcpkg.json index 8831d91f0..389ae4881 100644 --- a/ports/wildmidi/vcpkg.json +++ b/ports/wildmidi/vcpkg.json @@ -1,7 +1,16 @@ { "name": "wildmidi", - "version-string": "0.4.3", - "port-version": 2, + "version": "0.4.4", "description": "MIDI software synthesizer library.", - "homepage": "https://github.com/Mindwerks/wildmidi" + "homepage": "https://github.com/Mindwerks/wildmidi", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index b575bf12c..5e6731ddb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7029,8 +7029,8 @@ "port-version": 1 }, "wildmidi": { - "baseline": "0.4.3", - "port-version": 2 + "baseline": "0.4.4", + "port-version": 0 }, "wincrypt": { "baseline": "0.0", diff --git a/versions/w-/wildmidi.json b/versions/w-/wildmidi.json index 42a28b6c6..24cb0fe0a 100644 --- a/versions/w-/wildmidi.json +++ b/versions/w-/wildmidi.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "28dabf2a1d7a07e567c4d6a0b482d44a4994d17b", + "version": "0.4.4", + "port-version": 0 + }, + { "git-tree": "4270f5e1f8fdb45bf562991ab9cf42e52fbc7437", "version-string": "0.4.3", "port-version": 2 |
