From a9ebf22ffabacb8fbb6f918a77d285b5a120e55c Mon Sep 17 00:00:00 2001 From: toge Date: Wed, 18 Mar 2026 17:46:11 +0900 Subject: [PATCH] [tmxlite] update to 1.4.5 (#50523) --- ports/tmxlite/dependencies.patch | 42 ++++++++++++++++---------------- ports/tmxlite/portfile.cmake | 2 +- ports/tmxlite/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/t-/tmxlite.json | 5 ++++ 5 files changed, 29 insertions(+), 24 deletions(-) diff --git a/ports/tmxlite/dependencies.patch b/ports/tmxlite/dependencies.patch index e06180650a..ff85db9248 100644 --- a/ports/tmxlite/dependencies.patch +++ b/ports/tmxlite/dependencies.patch @@ -1,29 +1,29 @@ diff --git a/tmxlite/CMakeLists.txt b/tmxlite/CMakeLists.txt -index a1b1882..8c0aad6 100644 +index 1a1e05b..cae012b 100644 --- a/tmxlite/CMakeLists.txt +++ b/tmxlite/CMakeLists.txt -@@ -68,10 +68,9 @@ if(USE_EXTLIBS) - SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") - - find_package(ZLIB REQUIRED) -- find_package(PUGIXML REQUIRED) -- find_package(Zstd REQUIRED) -+ find_package(pugixml CONFIG REQUIRED) -+ find_package(zstd CONFIG REQUIRED) - -- include_directories(${ZLIB_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ${ZSTD_INCLUDE_DIR}) - +@@ -70,10 +70,9 @@ if(USE_EXTLIBS) + SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") + + find_package(ZLIB REQUIRED) +- find_package(PUGIXML REQUIRED) +- find_package(Zstd REQUIRED) ++ find_package(pugixml CONFIG REQUIRED) ++ find_package(zstd CONFIG REQUIRED) + +- include_directories(${ZLIB_INCLUDE_DIRS} ${PUGIXML_INCLUDE_DIR} ${ZSTD_INCLUDE_DIR}) + else() - #add miniz and pugixml from source -@@ -102,7 +101,10 @@ else() + # add miniz and pugixml from source +@@ -104,7 +103,10 @@ else() endif() if(USE_EXTLIBS) -- target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES} ${PUGIXML_LIBRARY} ${ZSTD_LIBRARY}) -+ target_link_libraries(${PROJECT_NAME} PRIVATE -+ $,zstd::libzstd_shared,zstd::libzstd_static> -+ pugixml::pugixml -+ ZLIB::ZLIB) +- target_link_libraries(${PROJECT_NAME} ${ZLIB_LIBRARIES} ${PUGIXML_LIBRARY} ${ZSTD_LIBRARY}) ++ target_link_libraries(${PROJECT_NAME} PRIVATE ++ $,zstd::libzstd_shared,zstd::libzstd_static> ++ pugixml::pugixml ++ ZLIB::ZLIB) else() - if(USE_ZSTD) - target_link_libraries(${PROJECT_NAME} ${ZSTD_LIBRARY}) + if(USE_ZSTD) + target_link_libraries(${PROJECT_NAME} ${ZSTD_LIBRARY}) diff --git a/ports/tmxlite/portfile.cmake b/ports/tmxlite/portfile.cmake index 592746d265..1f782e69f9 100644 --- a/ports/tmxlite/portfile.cmake +++ b/ports/tmxlite/portfile.cmake @@ -3,7 +3,7 @@ vcpkg_from_github( REPO fallahn/tmxlite REF "v${VERSION}" HEAD_REF master - SHA512 0ffe0505329f00ef9872998673a7c220a9a5352f830688ef17952c0c4f001e0c2994a3a28f0e7de60cc82fff2701561cccbc2143fd51984bf4870e7d1fd0a2ba + SHA512 323b8ce20c4d2c7dd98c96ddb4d4d3ba6a3862dbda1e7880086cb493b22e79f1891dda6a4d3145de44b78dfa6258ded366e32f31781f08b1657a1da080013415 PATCHES dependencies.patch ) diff --git a/ports/tmxlite/vcpkg.json b/ports/tmxlite/vcpkg.json index 80a34c80ba..f417897348 100644 --- a/ports/tmxlite/vcpkg.json +++ b/ports/tmxlite/vcpkg.json @@ -1,6 +1,6 @@ { "name": "tmxlite", - "version": "1.4.4", + "version": "1.4.5", "description": "A lightweight C++14 parsing library for tmx map files created with the Tiled map editor.", "homepage": "https://github.com/fallahn/tmxlite", "license": "Zlib", diff --git a/versions/baseline.json b/versions/baseline.json index bf9b81ec6c..63df23ff4f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -10037,7 +10037,7 @@ "port-version": 0 }, "tmxlite": { - "baseline": "1.4.4", + "baseline": "1.4.5", "port-version": 0 }, "tobias-loew-flags": { diff --git a/versions/t-/tmxlite.json b/versions/t-/tmxlite.json index 45f9bcb295..8f39a70891 100644 --- a/versions/t-/tmxlite.json +++ b/versions/t-/tmxlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "77055b8151085a3af022c959b30e2222a443fe7a", + "version": "1.4.5", + "port-version": 0 + }, { "git-tree": "b18995c78b7b6057c2a1d69eba2118bfcb17fa36", "version": "1.4.4",