From a076cb6d20be6651ffc3f27916afb1cdc88934a0 Mon Sep 17 00:00:00 2001 From: Sandy Carter Date: Sat, 18 May 2024 19:20:03 -0400 Subject: [PATCH] [bgfx]: Update to 1.127.8725.469 --- ports/bgfx/portfile.cmake | 7 +++++-- ports/bgfx/vcpkg.json | 2 +- versions/b-/bgfx.json | 5 +++++ versions/baseline.json | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ports/bgfx/portfile.cmake b/ports/bgfx/portfile.cmake index 0e0c17db0de414..15a5a1108cbbdf 100644 --- a/ports/bgfx/portfile.cmake +++ b/ports/bgfx/portfile.cmake @@ -2,7 +2,7 @@ vcpkg_download_distfile( ARCHIVE_FILE URLS https://github.com/bkaradzic/bgfx.cmake/releases/download/v${VERSION}/bgfx.cmake.v${VERSION}.tar.gz FILENAME bgfx.cmake.v${VERSION}.tar.gz - SHA512 369943ce0f8f2b5332d7334247d3a9ef0e28a6b1ff5ee250a01f83d1a0bd865687397da791e4c861d1c1b18ec4285f50153139f3c0e398611c7f3b672d1c751c + SHA512 8aea4f3e548f8a79e8899c9d47ec3ca78dae48f77ae039d6f5df325ba73a8ddb70c9b7c1f0cb4129ac488b445e8a8523f36a964e509133bb4a449e073ebf6112 ) vcpkg_extract_source_archive( @@ -34,6 +34,9 @@ vcpkg_cmake_configure( -DBGFX_BUILD_EXAMPLES=OFF -DBGFX_OPENGLES_VERSION=30 -DBGFX_CMAKE_USER_SCRIPT=vcpkg-inject-packages.cmake + # #25529: Need to inject an extra path because VCPKG_HOST_TARGET is not determined automatically + # It's important to have `${CMAKE_CURRENT_LIST_DIR}` verbatim escaped in bgfxConfig.cmake + -DBGFX_ADDITIONAL_TOOL_PATHS="\"\\\$\$\{CMAKE_CURRENT_LIST_DIR}/../../../${HOST_TRIPLET}/tools/bgfx \\\$\$\{CMAKE_CURRENT_LIST_DIR}/../../../bgfx_${HOST_TRIPLET}/tools/bgfx\"" ${FEATURE_OPTIONS} ) @@ -41,7 +44,7 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") vcpkg_copy_pdbs() -if (BGFX_BUILD_TOOLS) +if ("tools" IN_LIST FEATURES) vcpkg_copy_tools( TOOL_NAMES bin2c shaderc geometryc geometryv texturec texturev AUTO_CLEAN ) diff --git a/ports/bgfx/vcpkg.json b/ports/bgfx/vcpkg.json index 0699bade64cbf8..efd6465802dca4 100644 --- a/ports/bgfx/vcpkg.json +++ b/ports/bgfx/vcpkg.json @@ -1,6 +1,6 @@ { "name": "bgfx", - "version": "1.122.8595-458", + "version": "1.127.8725-469", "maintainers": "Sandy Carter ", "description": "Cross-platform, graphics API agnostic, Bring Your Own Engine/Framework style rendering library.", "homepage": "https://bkaradzic.github.io/bgfx/overview.html", diff --git a/versions/b-/bgfx.json b/versions/b-/bgfx.json index 08f0a6ca255fa4..499dea063a563f 100644 --- a/versions/b-/bgfx.json +++ b/versions/b-/bgfx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "066347d90e7afda6d96e409fe696d77d14e1c01f", + "version": "1.127.8725-469", + "port-version": 0 + }, { "git-tree": "c5af63ea2a285a9577943683a6e1347d17487402", "version": "1.122.8595-458", diff --git a/versions/baseline.json b/versions/baseline.json index a61cf8c4c5554e..241d8bd1299b6c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -617,7 +617,7 @@ "port-version": 0 }, "bgfx": { - "baseline": "1.122.8595-458", + "baseline": "1.127.8725-469", "port-version": 0 }, "bigint": {