diff --git a/ports/projectm/portfile.cmake b/ports/projectm/portfile.cmake index dc1a2ad2ee..9b0be57135 100644 --- a/ports/projectm/portfile.cmake +++ b/ports/projectm/portfile.cmake @@ -1,57 +1,62 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO projectM-visualizer/projectm - REF "v${VERSION}" - SHA512 "9102e5136653abb81da2f36f4b08446ef553fe2d49879d8e906bd4cd30728f97ca87075e6561605cf05e0f4ecf8cbd3d95f372a99b2af893058f5c522864ea69" - HEAD_REF master - PATCHES - macos-pkgconfig.patch -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - "boost-filesystem" ENABLE_BOOST_FILESYSTEM -) - -if (NOT ENABLE_BOOST_FILESYSTEM) - message(STATUS - "If your current vcpkg target triplet or toolchain does not support C++17 or lacks std::filesystem support, " - "please enable the \"boost-filesystem\" feature.") -endif () - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTIONS} - - # Use projectm-eval and GLM from ports as well - -DENABLE_SYSTEM_PROJECTM_EVAL=ON - -DENABLE_SYSTEM_GLM=ON - - # Enforce additional build flags - -DENABLE_PLAYLIST=ON - -DENABLE_SDL_UI=OFF - -DBUILD_TESTING=OFF - -DBUILD_DOCS=OFF -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup( - PACKAGE_NAME "projectM4" - CONFIG_PATH "lib/cmake/projectM4" - DO_NOT_DELETE_PARENT_CONFIG_PATH -) - -vcpkg_cmake_config_fixup( - PACKAGE_NAME "projectM4Playlist" - CONFIG_PATH "lib/cmake/projectM4Playlist" -) - -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO projectM-visualizer/projectm + REF "v${VERSION}" + SHA512 "dbb3088c5a0db9eaabd4d2c3232df2dd939a4b1ce5928916a63e7b10cd4321b749d779a5e39a883a12318c613f91f3b4241973958edf52291d53e1b3dc348c77" + HEAD_REF master + PATCHES + macos-pkgconfig.patch +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "boost-filesystem" ENABLE_BOOST_FILESYSTEM +) + +if (NOT ENABLE_BOOST_FILESYSTEM) + message(STATUS + "If your current vcpkg target triplet or toolchain does not support C++17 or lacks std::filesystem support, " + "please enable the \"boost-filesystem\" feature.") +endif () + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTIONS} + + # Use projectm-eval and GLM from ports as well + -DENABLE_SYSTEM_PROJECTM_EVAL=ON + -DENABLE_SYSTEM_GLM=ON + + # Enforce additional build flags + -DENABLE_PLAYLIST=ON + -DENABLE_SDL_UI=OFF + -DBUILD_TESTING=OFF + -DBUILD_DOCS=OFF +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup( + PACKAGE_NAME "projectM4" + CONFIG_PATH "lib/cmake/projectM4" + DO_NOT_DELETE_PARENT_CONFIG_PATH +) + +vcpkg_cmake_config_fixup( + PACKAGE_NAME "projectM4Playlist" + CONFIG_PATH "lib/cmake/projectM4Playlist" +) + +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +vcpkg_install_copyright( + COMMENT "The bundled SOIL2 sources include MIT-0 code, Apache-2.0-licensed ETC1 code, and MIT-licensed PowerVR code, but upstream does not provide their complete license texts as separate files." + FILE_LIST + "${SOURCE_PATH}/LICENSE.txt" + "${SOURCE_PATH}/vendor/hlslparser/LICENSE" +) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/projectm/usage b/ports/projectm/usage index 6003873e92..5503cb6747 100644 --- a/ports/projectm/usage +++ b/ports/projectm/usage @@ -1,9 +1,9 @@ -projectm provides CMake targets: - - find_package(projectM4 REQUIRED) - target_link_libraries(main PRIVATE libprojectM::projectM) - -To use and link the playlist library component: - - find_package(projectM4 REQUIRED COMPONENTS Playlist) - target_link_libraries(main PRIVATE libprojectM::playlist) +projectm provides CMake targets: + + find_package(projectM4 REQUIRED) + target_link_libraries(main PRIVATE libprojectM::projectM) + +To use and link the playlist library component: + + find_package(projectM4 REQUIRED COMPONENTS Playlist) + target_link_libraries(main PRIVATE libprojectM::playlist) diff --git a/ports/projectm/vcpkg.json b/ports/projectm/vcpkg.json index dac24a55db..491082648c 100644 --- a/ports/projectm/vcpkg.json +++ b/ports/projectm/vcpkg.json @@ -1,9 +1,9 @@ { "name": "projectm", - "version": "4.1.6", + "version": "4.1.7", "description": "The projectM Music Visualizer. A cross-platform, OpenGL-based reimplementation of Milkdrop as a reusable library.", "homepage": "https://github.com/projectM-visualizer/projectm", - "license": "LGPL-2.1-only AND MIT AND MIT-0", + "license": "LGPL-2.1-only AND MIT AND MIT-0 AND Apache-2.0", "dependencies": [ { "name": "glew", diff --git a/versions/baseline.json b/versions/baseline.json index 07a690a281..b6a18b8a1c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8029,7 +8029,7 @@ "port-version": 0 }, "projectm": { - "baseline": "4.1.6", + "baseline": "4.1.7", "port-version": 0 }, "projectm-eval": { diff --git a/versions/p-/projectm.json b/versions/p-/projectm.json index 6faed43ac7..db77bb2168 100644 --- a/versions/p-/projectm.json +++ b/versions/p-/projectm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f2c5cd6c06c6ec8aebaaa16496f11d946f88cbeb", + "version": "4.1.7", + "port-version": 0 + }, { "git-tree": "6dac9b7f7940cf8a2b902b6d76f7750492bf5a01", "version": "4.1.6",