diff --git a/ports/scnlib/portfile.cmake b/ports/scnlib/portfile.cmake index 4b6495080225d0..b8d0fd37546af9 100644 --- a/ports/scnlib/portfile.cmake +++ b/ports/scnlib/portfile.cmake @@ -1,48 +1,58 @@ -vcpkg_check_linkage(ONLY_STATIC_LIBRARY) - -vcpkg_download_distfile(PATCH_20240406_1_97baaf2 - URLS https://github.com/eliaskosunen/scnlib/commit/97baaf2a0bbf235ba91e29fe7ac16abe528da2d2.patch?full_index=1 - SHA512 39c31d4bcac95a9ca614c0e39159f740a9819a2186d05cc5112178ab3e186cb5ca342438479b7e2267cea620d3042dc306d50c6c032572dbc2ad496bf85b7776 - FILENAME 97baaf2a0bbf235ba91e29fe7ac16abe528da2d2.patch -) -vcpkg_download_distfile(PATCH_20240406_2_5c4b91e - URLS https://github.com/eliaskosunen/scnlib/commit/5c4b91ef1e2bbc29420e37b655bd8194afa19efc.patch?full_index=1 - SHA512 8af9695729ab906066aa7db16733796e45f824c7711ca72a13273438c510bed38d7fb2884861e70d1178f67c8b0e8ff4d0bff9a16ba434becb60a87dcb6269b5 - FILENAME 5c4b91ef1e2bbc29420e37b655bd8194afa19efc.patch -) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO eliaskosunen/scnlib +vcpkg_check_linkage(ONLY_STATIC_LIBRARY) + +vcpkg_download_distfile(PATCH_20240406_1_97baaf2 + URLS https://github.com/eliaskosunen/scnlib/commit/97baaf2a0bbf235ba91e29fe7ac16abe528da2d2.patch?full_index=1 + SHA512 39c31d4bcac95a9ca614c0e39159f740a9819a2186d05cc5112178ab3e186cb5ca342438479b7e2267cea620d3042dc306d50c6c032572dbc2ad496bf85b7776 + FILENAME 97baaf2a0bbf235ba91e29fe7ac16abe528da2d2.patch +) +vcpkg_download_distfile(PATCH_20240406_2_5c4b91e + URLS https://github.com/eliaskosunen/scnlib/commit/5c4b91ef1e2bbc29420e37b655bd8194afa19efc.patch?full_index=1 + SHA512 8af9695729ab906066aa7db16733796e45f824c7711ca72a13273438c510bed38d7fb2884861e70d1178f67c8b0e8ff4d0bff9a16ba434becb60a87dcb6269b5 + FILENAME 5c4b91ef1e2bbc29420e37b655bd8194afa19efc.patch +) +vcpkg_download_distfile(PATCH_20240515_3_15c3547 + URLS https://github.com/eliaskosunen/scnlib/commit/15c3547b408391d7314e29bd23f35af36683a907.patch?full_index=1 + SHA512 006378ad92c68b2786e14a7da76a7397a600cccb18163bf73e68ab0c3019067b9bec99ed2f86499d8cb2e2758d0ea1bf2c3ca98b6ab72e41f82037caeaff8298 + FILENAME 15c3547b408391d7314e29bd23f35af36683a907.patch +) +vcpkg_download_distfile(PATCH_20240515_6_e149892 + URLS https://github.com/eliaskosunen/scnlib/commit/e1498927e8f0367796d1643b65482861c1b4c9b1.patch?full_index=1 + SHA512 d584b883a8dced18fdbec3846f93dfbf68633127354168199f986404c1404e80049798b7f4df5352315c9c2c5691ae5d5746fa5234c47631c38752aec73ad861 + FILENAME e1498927e8f0367796d1643b65482861c1b4c9b1.patch +) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO eliaskosunen/scnlib REF "v${VERSION}" SHA512 12b9ae26a5ccc600aacad1e2b2287bfc0b6986a260e182c91541876bc5804fe661093ad10d1befda56803afc7a9aa9f0348820dbb5af4fa6fdf048f85b3bcef1 - HEAD_REF master - PATCHES - fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch - "${PATCH_20240406_1_97baaf2}" - "${PATCH_20240406_2_5c4b91e}" -) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DSCN_TESTS=OFF - -DSCN_EXAMPLES=OFF - -DSCN_BENCHMARKS=OFF - -DSCN_DOCS=OFF + HEAD_REF master + PATCHES + fix-SCN_HAS_STD_REGEX_MULTILINE-marco.patch + "${PATCH_20240406_1_97baaf2}" + "${PATCH_20240406_2_5c4b91e}" + "${PATCH_20240515_3_15c3547}" + "${PATCH_20240515_6_e149892}" +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSCN_TESTS=OFF + -DSCN_EXAMPLES=OFF + -DSCN_BENCHMARKS=OFF + -DSCN_DOCS=OFF -DSCN_USE_EXTERNAL_SIMDUTF=ON -DSCN_USE_EXTERNAL_FAST_FLOAT=ON -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/scn) - -file(REMOVE_RECURSE - "${CURRENT_PACKAGES_DIR}/debug/include" - "${CURRENT_PACKAGES_DIR}/debug/share" - "${CURRENT_PACKAGES_DIR}/share/scn" -) - -file(INSTALL "${SOURCE_PATH}/LICENSE" - DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" - RENAME copyright) +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/scn) + +file(REMOVE_RECURSE + "${CURRENT_PACKAGES_DIR}/debug/include" + "${CURRENT_PACKAGES_DIR}/debug/share" + "${CURRENT_PACKAGES_DIR}/share/scn" +) + +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/scnlib/vcpkg.json b/ports/scnlib/vcpkg.json index 287203c2891a0e..f90241e4a737b0 100644 --- a/ports/scnlib/vcpkg.json +++ b/ports/scnlib/vcpkg.json @@ -1,7 +1,7 @@ { "name": "scnlib", "version": "2.0.2", - "port-version": 2, + "port-version": 3, "description": "scnlib is a modern C++ library for replacing scanf and std::istream", "homepage": "https://scnlib.dev/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index eb9aa7a9510c8d..28c5089c8ab2c7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7910,7 +7910,7 @@ }, "scnlib": { "baseline": "2.0.2", - "port-version": 2 + "port-version": 3 }, "scope-guard": { "baseline": "1.1.0", diff --git a/versions/s-/scnlib.json b/versions/s-/scnlib.json index 5fd95c46f050f6..eaf538b2124ed3 100644 --- a/versions/s-/scnlib.json +++ b/versions/s-/scnlib.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "14d61103894e6ff0c14d3b2db7727c18d725982a", + "version": "2.0.2", + "port-version": 3 + }, { "git-tree": "17567901d2d2e06776b74ce27ab8c612901cb9af", "version": "2.0.2",