From 0e79ac5be550b1bf26d0a0c179b51fa4d479f4c6 Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Thu, 18 May 2023 00:15:39 +0800 Subject: [PATCH] [freetype-gl] Add feature glad (#31436) * [freetype-gl] Add feature glad * format vcpkg.json * update version * update rependences * update version --- ports/freetype-gl/portfile.cmake | 10 ++++++++-- ports/freetype-gl/vcpkg.json | 12 ++++++++++-- versions/baseline.json | 2 +- versions/f-/freetype-gl.json | 5 +++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/ports/freetype-gl/portfile.cmake b/ports/freetype-gl/portfile.cmake index 36c0282bc10..6632f01f6c2 100644 --- a/ports/freetype-gl/portfile.cmake +++ b/ports/freetype-gl/portfile.cmake @@ -14,6 +14,12 @@ vcpkg_from_github( 0005-add-version.patch ) +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + "glad" freetype-gl_WITH_GLAD +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -21,6 +27,7 @@ vcpkg_cmake_configure( -Dfreetype-gl_BUILD_DEMOS=OFF -Dfreetype-gl_BUILD_TESTS=OFF -Dfreetype-gl_BUILD_MAKEFONT=OFF + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() @@ -32,6 +39,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_fixup_pkgconfig() -# Handle copyright -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/freetype-gl" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/freetype-gl/vcpkg.json b/ports/freetype-gl/vcpkg.json index 3acfe4cbb6a..80d4541f7be 100644 --- a/ports/freetype-gl/vcpkg.json +++ b/ports/freetype-gl/vcpkg.json @@ -1,7 +1,7 @@ { "name": "freetype-gl", "version-date": "2022-01-17", - "port-version": 1, + "port-version": 2, "description": "OpenGL text using one vertex buffer, one texture and FreeType", "homepage": "https://github.com/rougier/freetype-gl", "dependencies": [ @@ -15,5 +15,13 @@ "name": "vcpkg-cmake-config", "host": true } - ] + ], + "features": { + "glad": { + "description": "Use the GLAD gl loader", + "dependencies": [ + "glad" + ] + } + } } diff --git a/versions/baseline.json b/versions/baseline.json index 801ec94a005..3354d15302f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2626,7 +2626,7 @@ }, "freetype-gl": { "baseline": "2022-01-17", - "port-version": 1 + "port-version": 2 }, "freexl": { "baseline": "1.0.6", diff --git a/versions/f-/freetype-gl.json b/versions/f-/freetype-gl.json index 0e74040b060..bd11fbff9fd 100644 --- a/versions/f-/freetype-gl.json +++ b/versions/f-/freetype-gl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a356f56c15dd0a66094c00cc35670791c545027e", + "version-date": "2022-01-17", + "port-version": 2 + }, { "git-tree": "c966935c663878c91381818cae1b87590be48191", "version-date": "2022-01-17",