From cad4b451bc4ec9ff74f2db593001d89b13d8c6f7 Mon Sep 17 00:00:00 2001 From: ricardoofnl Date: Wed, 8 Jul 2026 06:45:53 +0700 Subject: [PATCH] [flecs] update to 4.1.6 (#52692) --- ports/flecs/portfile.cmake | 84 +++++++++++++++++++++----------------- ports/flecs/vcpkg.json | 4 +- versions/baseline.json | 2 +- versions/f-/flecs.json | 5 +++ 4 files changed, 54 insertions(+), 41 deletions(-) diff --git a/ports/flecs/portfile.cmake b/ports/flecs/portfile.cmake index 095763a58b..0aba46bed0 100644 --- a/ports/flecs/portfile.cmake +++ b/ports/flecs/portfile.cmake @@ -1,38 +1,46 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO SanderMertens/flecs - REF "v${VERSION}" - SHA512 6bd3ffb4b008b7ed83baedc87b2a55ced6b93072d930c5cd751a324a39154b9edf89331546f2587daf87d3eef471cf9c3ba1c9cf58f94c3d69d6ee2248081598 - HEAD_REF master -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLECS_STATIC_LIBS) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLECS_SHARED_LIBS) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DFLECS_STATIC=${FLECS_STATIC_LIBS} - -DFLECS_SHARED=${FLECS_SHARED_LIBS} -) - -vcpkg_cmake_install() - -vcpkg_copy_pdbs() - -if(FLECS_STATIC_LIBS) - vcpkg_replace_string( - "${CURRENT_PACKAGES_DIR}/include/${PORT}/bake_config.h" - "#ifndef flecs_STATIC" - "#if 0 // #ifndef flecs_STATIC" - ) -endif() - -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) - -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO SanderMertens/flecs + REF "v${VERSION}" + SHA512 a2843d72a4a7f7577e047eac60d492c8a6677dae404d9ec6a23a498f5d37f745897a0892a3a5ef7b66de5c5f862e55cf9ae6b50dc33d0bd7a674707ca93f2b30 + HEAD_REF master +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" FLECS_STATIC_LIBS) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" FLECS_SHARED_LIBS) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DFLECS_STATIC=${FLECS_STATIC_LIBS} + -DFLECS_SHARED=${FLECS_SHARED_LIBS} +) + +vcpkg_cmake_install() + +vcpkg_copy_pdbs() + +if(FLECS_STATIC_LIBS) + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/${PORT}/bake_config.h" + "#ifndef flecs_STATIC" + "#if 0 // #ifndef flecs_STATIC" + ) +endif() + +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) + +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright( + FILE_LIST "${SOURCE_PATH}/LICENSE" + COMMENT [[ +Beyond the main MIT LICENSE, some compiled sources bundle third-party notices: + src/addons/http/http.c EmbeddableWebServer (BSD-2-Clause) + src/datastructures/hash.c wyhash (Unlicense / public domain) + src/datastructures/strbuf.c stm32tpl float formatting (Anton B. Gusev) +]] +) diff --git a/ports/flecs/vcpkg.json b/ports/flecs/vcpkg.json index e2d3fba9f9..cf5b3cac66 100644 --- a/ports/flecs/vcpkg.json +++ b/ports/flecs/vcpkg.json @@ -1,10 +1,10 @@ { "name": "flecs", - "version": "4.1.5", + "version": "4.1.6", "description": "A fast entity component system (ECS) for C & C++", "homepage": "https://github.com/SanderMertens/flecs", "documentation": "https://www.flecs.dev/flecs/", - "license": "MIT", + "license": null, "supports": "!uwp", "dependencies": [ { diff --git a/versions/baseline.json b/versions/baseline.json index eb52497398..38595ad134 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3125,7 +3125,7 @@ "port-version": 0 }, "flecs": { - "baseline": "4.1.5", + "baseline": "4.1.6", "port-version": 0 }, "flint": { diff --git a/versions/f-/flecs.json b/versions/f-/flecs.json index 1dc7ae2f8a..44f995ef1f 100644 --- a/versions/f-/flecs.json +++ b/versions/f-/flecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6e13da0e6d446c34fef059953b4a947f04af748d", + "version": "4.1.6", + "port-version": 0 + }, { "git-tree": "a0af5c49aa74717ffe408171fb637a158183aa37", "version": "4.1.5",