From 383060ffb686cc87404cc972e39cb77d3b1ef4e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Fri, 27 Aug 2021 01:09:08 +0800 Subject: [PATCH] [many ports] Add vcpkg_fixup_pkgconfig (#19721) * [many ports]Add vcpkg_fixup_pkgconfig * version * Update ports/libepoxy/vcpkg.json Co-authored-by: Robert Schumacher * Update versions/l-/libepoxy.json * Update versions/l-/libepoxy.json Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: Robert Schumacher --- ports/c-ares/portfile.cmake | 13 +++++++------ ports/c-ares/vcpkg.json | 15 +++++++++++++-- ports/libepoxy/CONTROL | 5 ----- ports/libepoxy/portfile.cmake | 12 ++++++++---- ports/libepoxy/vcpkg.json | 10 ++++++++++ ports/physfs/portfile.cmake | 11 ++++++----- ports/physfs/vcpkg.json | 8 ++++++-- versions/baseline.json | 6 +++--- versions/c-/c-ares.json | 5 +++++ versions/l-/libepoxy.json | 5 +++++ versions/p-/physfs.json | 5 +++++ 11 files changed, 68 insertions(+), 27 deletions(-) delete mode 100644 ports/libepoxy/CONTROL create mode 100644 ports/libepoxy/vcpkg.json diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index 8f54a176d2..4e9ee82663 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -11,9 +11,8 @@ vcpkg_from_github( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DCARES_STATIC=${BUILD_STATIC} -DCARES_SHARED=${BUILD_SHARED} @@ -22,14 +21,16 @@ vcpkg_configure_cmake( -DCARES_BUILD_CONTAINER_TESTS=OFF ) -vcpkg_install_cmake() - -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/c-ares) +vcpkg_cmake_install() vcpkg_copy_pdbs() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/c-ares) +vcpkg_fixup_pkgconfig() + if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/ares.h + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/ares.h" "#ifdef CARES_STATICLIB" "#if 1" ) endif() diff --git a/ports/c-ares/vcpkg.json b/ports/c-ares/vcpkg.json index 331ca600f7..da731a90c7 100644 --- a/ports/c-ares/vcpkg.json +++ b/ports/c-ares/vcpkg.json @@ -1,7 +1,18 @@ { "name": "c-ares", - "version": "1.17.2", + "version-semver": "1.17.2", + "port-version": 1, "description": "A C library for asynchronous DNS requests", "homepage": "https://github.com/c-ares/c-ares", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libepoxy/CONTROL b/ports/libepoxy/CONTROL deleted file mode 100644 index 7e6b7e5325..0000000000 --- a/ports/libepoxy/CONTROL +++ /dev/null @@ -1,5 +0,0 @@ -Source: libepoxy -Version: 1.5.5 -Homepage: https://github.com/anholt/libepoxy -Description: Epoxy is a library for handling OpenGL function pointer management for you -Build-Depends: tool-meson diff --git a/ports/libepoxy/portfile.cmake b/ports/libepoxy/portfile.cmake index 90290b5a08..83a32bb74d 100644 --- a/ports/libepoxy/portfile.cmake +++ b/ports/libepoxy/portfile.cmake @@ -25,12 +25,16 @@ endif() vcpkg_configure_meson( SOURCE_PATH ${SOURCE_PATH} - OPTIONS ${OPTIONS} -Dtests=false + OPTIONS + ${OPTIONS} + -Dtests=false ) vcpkg_install_meson() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/pkgconfig) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig) +vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/pkgconfig") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/pkgconfig") + +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libepoxy/vcpkg.json b/ports/libepoxy/vcpkg.json new file mode 100644 index 0000000000..d5f7b4259c --- /dev/null +++ b/ports/libepoxy/vcpkg.json @@ -0,0 +1,10 @@ +{ + "name": "libepoxy", + "version-semver": "1.5.5", + "port-version": 1, + "description": "Epoxy is a library for handling OpenGL function pointer management for you", + "homepage": "https://github.com/anholt/libepoxy", + "dependencies": [ + "tool-meson" + ] +} diff --git a/ports/physfs/portfile.cmake b/ports/physfs/portfile.cmake index 593c84293e..879a2b0e0f 100644 --- a/ports/physfs/portfile.cmake +++ b/ports/physfs/portfile.cmake @@ -20,18 +20,19 @@ vcpkg_extract_source_archive_ex( string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" PHYSFS_STATIC) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" PHYSFS_SHARED) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DPHYSFS_BUILD_STATIC=${PHYSFS_STATIC} -DPHYSFS_BUILD_SHARED=${PHYSFS_SHARED} -DPHYSFS_BUILD_TEST=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_fixup_pkgconfig() -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/physfs/vcpkg.json b/ports/physfs/vcpkg.json index a61a338818..b740565caf 100644 --- a/ports/physfs/vcpkg.json +++ b/ports/physfs/vcpkg.json @@ -1,10 +1,14 @@ { "name": "physfs", - "version-string": "3.0.2", - "port-version": 5, + "version-semver": "3.0.2", + "port-version": 6, "description": "a library to provide abstract access to various archives", "homepage": "https://icculus.org/physfs/", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/versions/baseline.json b/versions/baseline.json index 40c921882a..6dea4286ca 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1110,7 +1110,7 @@ }, "c-ares": { "baseline": "1.17.2", - "port-version": 0 + "port-version": 1 }, "c4core": { "baseline": "2021-07-18", @@ -3182,7 +3182,7 @@ }, "libepoxy": { "baseline": "1.5.5", - "port-version": 0 + "port-version": 1 }, "libevent": { "baseline": "2.1.12", @@ -4918,7 +4918,7 @@ }, "physfs": { "baseline": "3.0.2", - "port-version": 5 + "port-version": 6 }, "physx": { "baseline": "4.1.2", diff --git a/versions/c-/c-ares.json b/versions/c-/c-ares.json index 4f9dfb16ec..59b8c1d2d5 100644 --- a/versions/c-/c-ares.json +++ b/versions/c-/c-ares.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d434c999ea00b87bfbee3d79ddc6fc1b6f12d7fe", + "version-semver": "1.17.2", + "port-version": 1 + }, { "git-tree": "4a8a471e681a33c8dde0a209900ac24a2e8e7f72", "version": "1.17.2", diff --git a/versions/l-/libepoxy.json b/versions/l-/libepoxy.json index 4093cd2c2c..71194cc67a 100644 --- a/versions/l-/libepoxy.json +++ b/versions/l-/libepoxy.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "66e28966117a23b6e9ac6cba7e71ecad8a2803ea", + "version-semver": "1.5.5", + "port-version": 1 + }, { "git-tree": "5a4765be1ed914881477e17b993d7e8df3ef67f0", "version-string": "1.5.5", diff --git a/versions/p-/physfs.json b/versions/p-/physfs.json index ba352ec877..7e719741c5 100644 --- a/versions/p-/physfs.json +++ b/versions/p-/physfs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "17d9ad3560e379cc51921a51982f4d31d106f1ed", + "version-semver": "3.0.2", + "port-version": 6 + }, { "git-tree": "5976d673e48ec47164efd0ea8ec86728f0e259be", "version-string": "3.0.2",