From b033f9d7425dcb33b8a2ace643d9766870cc29b2 Mon Sep 17 00:00:00 2001 From: Victor Romero Date: Mon, 26 Jan 2026 18:42:36 -0800 Subject: [PATCH] [ci][baseline] Fix regressions 20260121.1 (#49559) --- ports/log4cxx/portfile.cmake | 5 ++++- ports/log4cxx/vcpkg.json | 1 + ports/subversion/portfile.cmake | 10 ++++++++++ ports/subversion/vcpkg.json | 1 + ports/vsgxchange/portfile.cmake | 2 ++ ports/vsgxchange/vcpkg.json | 12 ++++++++++++ scripts/ci.baseline.txt | 3 --- versions/baseline.json | 6 +++--- versions/l-/log4cxx.json | 5 +++++ versions/s-/subversion.json | 5 +++++ versions/v-/vsgxchange.json | 5 +++++ 11 files changed, 48 insertions(+), 7 deletions(-) diff --git a/ports/log4cxx/portfile.cmake b/ports/log4cxx/portfile.cmake index 75ad8bddf8..916dcb1cf2 100644 --- a/ports/log4cxx/portfile.cmake +++ b/ports/log4cxx/portfile.cmake @@ -1,7 +1,7 @@ vcpkg_download_distfile(ARCHIVE URLS "https://archive.apache.org/dist/logging/log4cxx/${VERSION}/apache-log4cxx-${VERSION}.tar.gz" FILENAME "apache-log4cxx-${VERSION}.tar.gz" - SHA512 6ee406314bd7ab02a46c98cc8a0d5ad5aec8928a23716a81a152775ca315cd3b950d600b2e221d5b4a88416ae9bbda1215fae43626107feea4df2f3e074303ad + SHA512 6ee406314bd7ab02a46c98cc8a0d5ad5aec8928a23716a81a152775ca315cd3b950d600b2e221d5b4a88416ae9bbda1215fae43626107feea4df2f3e074303ad ) vcpkg_extract_source_archive( @@ -12,6 +12,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES qt LOG4CXX_QT_SUPPORT fmt ENABLE_FMT_LAYOUT + fmt ENABLE_FMT_ASYNC + fmt VCPKG_LOCK_FIND_PACKAGE_fmt mprfa LOG4CXX_MULTIPROCESS_ROLLING_FILE_APPENDER ) vcpkg_cmake_configure( @@ -20,6 +22,7 @@ vcpkg_cmake_configure( ${FEATURE_OPTIONS} -DLOG4CXX_INSTALL_PDB=OFF # Installing pdbs failed on debug static. So, disable it and let vcpkg_copy_pdbs() do it -DBUILD_TESTING=OFF + -DVCPKG_LOCK_FIND_PACKAGE_fmt=${VCPKG_LOCK_FIND_PACKAGE_fmt} ) vcpkg_cmake_install() diff --git a/ports/log4cxx/vcpkg.json b/ports/log4cxx/vcpkg.json index d7a56b6f2b..331fec721a 100644 --- a/ports/log4cxx/vcpkg.json +++ b/ports/log4cxx/vcpkg.json @@ -1,6 +1,7 @@ { "name": "log4cxx", "version": "1.6.1", + "port-version": 1, "description": "Apache log4cxx is a logging framework for C++ patterned after Apache log4j, which uses Apache Portable Runtime for most platform-specific code and should be usable on any platform supported by APR", "homepage": "https://logging.apache.org/log4cxx", "license": "Apache-2.0", diff --git a/ports/subversion/portfile.cmake b/ports/subversion/portfile.cmake index dd7000f27c..00d3c55dc0 100644 --- a/ports/subversion/portfile.cmake +++ b/ports/subversion/portfile.cmake @@ -13,8 +13,18 @@ vcpkg_execute_required_process( LOGNAME gen-make-${TARGET_TRIPLET} ) +if (VCPKG_HOST_IS_LINUX) + set(SVN_USE_PKG_CONFIG ON) + vcpkg_find_acquire_program(PKGCONFIG) + set(ENV{PKG_CONFIG} "${PKGCONFIG}") +else() + set(SVN_USE_PKG_CONFIG OFF) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DSVN_USE_PKG_CONFIG="${SVN_USE_PKG_CONFIG}" ) vcpkg_cmake_install() diff --git a/ports/subversion/vcpkg.json b/ports/subversion/vcpkg.json index c13c9eeb79..e9ab85262c 100644 --- a/ports/subversion/vcpkg.json +++ b/ports/subversion/vcpkg.json @@ -1,6 +1,7 @@ { "name": "subversion", "version-date": "2025-12-23", + "port-version": 1, "description": "Apache Subversion (SVN) - Enterprise-class centralized version control system", "homepage": "https://subversion.apache.org/", "license": "Apache-2.0", diff --git a/ports/vsgxchange/portfile.cmake b/ports/vsgxchange/portfile.cmake index dcbf243484..e2485fcd8d 100644 --- a/ports/vsgxchange/portfile.cmake +++ b/ports/vsgxchange/portfile.cmake @@ -18,6 +18,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS gdal VCPKG_LOCK_FIND_PACKAGE_GDAL openexr vsgXchange_openexr openexr VCPKG_LOCK_FIND_PACKAGE_OpenEXR + ktx vsgXchange_ktx + ktx VCPKG_LOCK_FIND_PACKAGE_Ktx ) vcpkg_cmake_configure( diff --git a/ports/vsgxchange/vcpkg.json b/ports/vsgxchange/vcpkg.json index f1639a2cb8..9f3dc2216e 100644 --- a/ports/vsgxchange/vcpkg.json +++ b/ports/vsgxchange/vcpkg.json @@ -1,6 +1,7 @@ { "name": "vsgxchange", "version": "1.1.9", + "port-version": 1, "description": "Utility library for converting 3rd party images, models and fonts formats to/from VulkanSceneGraph.", "homepage": "https://github.com/vsg-dev/vsgXchange", "license": "MIT", @@ -49,6 +50,17 @@ } ] }, + "ktx": { + "description": "Enable support for reading KTX and KTX2 files", + "dependencies": [ + { + "name": "ktx", + "features": [ + "vulkan" + ] + } + ] + }, "openexr": { "description": "Enable support for reading EXR files as vsg::Data", "dependencies": [ diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index 0357924ad3..04018f7910 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -601,9 +601,6 @@ simbody:arm64-windows=fail simd:arm-neon-android=fail simd:arm64-android=fail simd:x64-android=fail -sjpeg:arm-neon-android=fail -sjpeg:arm64-android=fail -sjpeg:x64-android=fail sleef:x86-windows=fail sleepy-discord:arm-neon-android=fail # std::string issue, https://github.com/microsoft/vcpkg/pull/41293#issuecomment-2942853561 sleepy-discord:arm64-android=fail diff --git a/versions/baseline.json b/versions/baseline.json index 8794ccd509..781431a499 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6042,7 +6042,7 @@ }, "log4cxx": { "baseline": "1.6.1", - "port-version": 0 + "port-version": 1 }, "loguru": { "baseline": "2.1.0", @@ -9574,7 +9574,7 @@ }, "subversion": { "baseline": "2025-12-23", - "port-version": 0 + "port-version": 1 }, "suitesparse": { "baseline": "7.8.3", @@ -10474,7 +10474,7 @@ }, "vsgxchange": { "baseline": "1.1.9", - "port-version": 0 + "port-version": 1 }, "vst3sdk": { "baseline": "v3.7.12_build_20", diff --git a/versions/l-/log4cxx.json b/versions/l-/log4cxx.json index 437f10e969..bcd3cfc394 100644 --- a/versions/l-/log4cxx.json +++ b/versions/l-/log4cxx.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5c8b00c1fc97b2cd862922240686dc170692226c", + "version": "1.6.1", + "port-version": 1 + }, { "git-tree": "0fada2ffa95a8b1d0baf79688ad4c6d30b0f630b", "version": "1.6.1", diff --git a/versions/s-/subversion.json b/versions/s-/subversion.json index b623bd50da..7bfbc034db 100644 --- a/versions/s-/subversion.json +++ b/versions/s-/subversion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f04bf37b99660a7eb6ead47e1ba387d807588ba2", + "version-date": "2025-12-23", + "port-version": 1 + }, { "git-tree": "b1ece2b448eac3f1064cf6142927f7359b3398bb", "version-date": "2025-12-23", diff --git a/versions/v-/vsgxchange.json b/versions/v-/vsgxchange.json index 6f8009f7fa..b37eeca498 100644 --- a/versions/v-/vsgxchange.json +++ b/versions/v-/vsgxchange.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7303646e002cd3536c93debfd338c05bb492893a", + "version": "1.1.9", + "port-version": 1 + }, { "git-tree": "581b4e82504eaf317c413264ae97bfe03dd1ef38", "version": "1.1.9",