From 19a90df2e13f93ff62ce4fbf8ca3100a9f6b8643 Mon Sep 17 00:00:00 2001 From: Kyle Benesch <4b796c65+github@gmail.com> Date: Thu, 10 Nov 2022 08:51:12 -0800 Subject: [PATCH] Update to 1.23.1 (#27743) No longer depends on GLAD. --- ports/libtcod/portfile.cmake | 6 ++---- ports/libtcod/vcpkg.json | 5 ++--- versions/baseline.json | 2 +- versions/l-/libtcod.json | 5 +++++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ports/libtcod/portfile.cmake b/ports/libtcod/portfile.cmake index f373ccc3f3b..8322bef1f45 100644 --- a/ports/libtcod/portfile.cmake +++ b/ports/libtcod/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO libtcod/libtcod - REF 1.23.0 - SHA512 efb9d1bca56268bb467ea11f640ed3807f269cd6c6cd7ea3296b3e1fb26bbe688cd8a21d3c5bb070d747a5321088e5fe4fe2a9cc52c145958a9db120d9abf878 + REF 1.23.1 + SHA512 d01e168b02c0540e193f65ad630180b26ac1690b9386aac039149493f436938fed4a0499ac70235f53d2675df595b7223401804b3bd2d8660917020e911f12c9 HEAD_REF main ) @@ -10,7 +10,6 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS INVERTED_FEATURES "png" CMAKE_DISABLE_FIND_PACKAGE_lodepng-c "sdl" CMAKE_DISABLE_FIND_PACKAGE_SDL2 - "sdl" CMAKE_DISABLE_FIND_PACKAGE_GLAD "threads" CMAKE_DISABLE_FIND_PACKAGE_Threads "unicode" CMAKE_DISABLE_FIND_PACKAGE_utf8proc "unicode" CMAKE_DISABLE_FIND_PACKAGE_unofficial-utf8proc @@ -24,7 +23,6 @@ vcpkg_cmake_configure( -DCMAKE_INSTALL_INCLUDEDIR=${CURRENT_PACKAGES_DIR}/include -DLIBTCOD_SDL2=find_package -DLIBTCOD_ZLIB=find_package - -DLIBTCOD_GLAD=find_package -DLIBTCOD_LODEPNG=find_package -DLIBTCOD_UTF8PROC=vcpkg -DLIBTCOD_STB=find_package diff --git a/ports/libtcod/vcpkg.json b/ports/libtcod/vcpkg.json index 6c9a9bb92c3..b3b15e936f8 100644 --- a/ports/libtcod/vcpkg.json +++ b/ports/libtcod/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libtcod", - "version": "1.23.0", + "version": "1.23.1", "maintainers": "Kyle Benesch <4b796c65+github@gmail.com>", "description": "Common algorithms and tools for roguelikes.", "homepage": "https://github.com/libtcod/libtcod", @@ -31,9 +31,8 @@ ] }, "sdl": { - "description": "Support for SDL2 windows and events including OpenGL support and the libtcod context.", + "description": "Support for SDL2 windows and events with the libtcod context.", "dependencies": [ - "glad", "sdl2" ] }, diff --git a/versions/baseline.json b/versions/baseline.json index d8e9d3a438d..04563be4f78 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4261,7 +4261,7 @@ "port-version": 0 }, "libtcod": { - "baseline": "1.23.0", + "baseline": "1.23.1", "port-version": 0 }, "libtess2": { diff --git a/versions/l-/libtcod.json b/versions/l-/libtcod.json index cf256dbb1a2..954b9ccd127 100644 --- a/versions/l-/libtcod.json +++ b/versions/l-/libtcod.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "09fe9037f9dc927b39eac5ed74cbce37dbb62f12", + "version": "1.23.1", + "port-version": 0 + }, { "git-tree": "43c6a88dc753dd9d7e106f8ee9c7bc26d4ed39b6", "version": "1.23.0",