From 28ba8217c026177c81ccfbd7f9f713f6d2f7bc3e Mon Sep 17 00:00:00 2001 From: ayeteadoe Date: Fri, 27 Jun 2025 16:31:10 -0700 Subject: [PATCH] Meta: Update vcpkg for patched libjxl port and remove our overlay port --- .../libjxl/fix-dependencies.patch | 39 ---------- .../libjxl/msvc-remove-libm.patch | 24 ------- .../vcpkg/overlay-ports/libjxl/portfile.cmake | 71 ------------------- .../vcpkg/overlay-ports/libjxl/vcpkg.json | 27 ------- vcpkg.json | 2 +- 5 files changed, 1 insertion(+), 162 deletions(-) delete mode 100644 Meta/CMake/vcpkg/overlay-ports/libjxl/fix-dependencies.patch delete mode 100644 Meta/CMake/vcpkg/overlay-ports/libjxl/msvc-remove-libm.patch delete mode 100644 Meta/CMake/vcpkg/overlay-ports/libjxl/portfile.cmake delete mode 100644 Meta/CMake/vcpkg/overlay-ports/libjxl/vcpkg.json diff --git a/Meta/CMake/vcpkg/overlay-ports/libjxl/fix-dependencies.patch b/Meta/CMake/vcpkg/overlay-ports/libjxl/fix-dependencies.patch deleted file mode 100644 index d0c6ad2abf96c..0000000000000 --- a/Meta/CMake/vcpkg/overlay-ports/libjxl/fix-dependencies.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt -index ea22103e..c6dbbe9f 100644 ---- a/third_party/CMakeLists.txt -+++ b/third_party/CMakeLists.txt -@@ -31,8 +31,9 @@ if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/highway/CMakeLists.txt" AND - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/highway/LICENSE" - ${PROJECT_BINARY_DIR}/LICENSE.highway COPYONLY) - else() -- find_package(HWY 1.0.7) -- if (NOT HWY_FOUND) -+ find_package(HWY NAMES hwy REQUIRED) -+ add_library(hwy ALIAS hwy::hwy) -+ if (NOT TARGET hwy::hwy) - message(FATAL_ERROR - "Highway library (hwy) not found. Install libhwy-dev or download it " - "to third_party/highway from https://github.com/google/highway . " -@@ -48,7 +49,11 @@ endif() - # brotli - if (NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/brotli/c/include/brotli/decode.h" OR - JPEGXL_FORCE_SYSTEM_BROTLI) -- find_package(Brotli) -+ find_package(Brotli NAMES unofficial-brotli REQUIRED) -+ foreach(brlib IN ITEMS brotlienc brotlidec brotlicommon) -+ add_library(${brlib} ALIAS unofficial::brotli::${brlib}) -+ add_library(${brlib}-static ALIAS unofficial::brotli::${brlib}) -+ endforeach() - if (NOT Brotli_FOUND) - message(FATAL_ERROR - "Brotli not found, install brotli-dev or download brotli source code to" -@@ -106,7 +111,8 @@ if (JPEGXL_ENABLE_SKCMS) - endif () - if (JPEGXL_ENABLE_VIEWERS OR NOT JPEGXL_ENABLE_SKCMS OR JPEGXL_ENABLE_PLUGINS) - if( NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lcms/.git" OR JPEGXL_FORCE_SYSTEM_LCMS2 ) -- find_package(LCMS2 2.12) -+ find_package(LCMS2 NAMES lcms2 REQUIRED) -+ add_library(lcms2 ALIAS lcms2::lcms2) - if ( NOT LCMS2_FOUND ) - message(FATAL_ERROR "Please install lcms2 or run git submodule update --init") - endif () diff --git a/Meta/CMake/vcpkg/overlay-ports/libjxl/msvc-remove-libm.patch b/Meta/CMake/vcpkg/overlay-ports/libjxl/msvc-remove-libm.patch deleted file mode 100644 index 49b8ddd7f0bfa..0000000000000 --- a/Meta/CMake/vcpkg/overlay-ports/libjxl/msvc-remove-libm.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/lib/jxl.cmake 2024-11-26 05:02:35.000000000 -0800 -+++ b/lib/jxl.cmake 2025-06-26 08:37:25.999263200 -0700 -@@ -269,12 +269,15 @@ - set(JPEGXL_LIBRARY_REQUIRES - "libhwy libbrotlienc libbrotlidec libjxl_cms") - --if (BUILD_SHARED_LIBS) -- set(JPEGXL_REQUIRES_TYPE "Requires.private") -- set(JPEGXL_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}") --else() -- set(JPEGXL_REQUIRES_TYPE "Requires") -- set(JPEGXL_PUBLIC_LIBS "-lm ${PKGCONFIG_CXX_LIB}") -+# MSVCRT bundles math functions -+if(NOT MSVC) -+ if (BUILD_SHARED_LIBS) -+ set(JPEGXL_REQUIRES_TYPE "Requires.private") -+ set(JPEGXL_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}") -+ else() -+ set(JPEGXL_REQUIRES_TYPE "Requires") -+ set(JPEGXL_PUBLIC_LIBS "-lm ${PKGCONFIG_CXX_LIB}") -+ endif() - endif() - - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/jxl/libjxl.pc.in" diff --git a/Meta/CMake/vcpkg/overlay-ports/libjxl/portfile.cmake b/Meta/CMake/vcpkg/overlay-ports/libjxl/portfile.cmake deleted file mode 100644 index 507b9423c9b74..0000000000000 --- a/Meta/CMake/vcpkg/overlay-ports/libjxl/portfile.cmake +++ /dev/null @@ -1,71 +0,0 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO libjxl/libjxl - REF "v${VERSION}" - SHA512 0cfd81d9d3b783f96bd04f244d73ffbc12186c89993d46064a2751bef0a446a5e86be05add5c10f60d4482d39333d9bf3f9a866d6eb84f8fa0d4e8b5828fd74c - HEAD_REF main - PATCHES - fix-dependencies.patch - msvc-remove-libm.patch # https://github.com/microsoft/vcpkg/pull/46177 -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - tools JPEGXL_ENABLE_TOOLS - INVERTED_FEATURES - tools CMAKE_DISABLE_FIND_PACKAGE_GIF - tools CMAKE_DISABLE_FIND_PACKAGE_JPEG - tools CMAKE_DISABLE_FIND_PACKAGE_PNG - tools CMAKE_DISABLE_FIND_PACKAGE_ZLIB -) - -if(VCPKG_TARGET_IS_UWP) - string(APPEND VCPKG_C_FLAGS " /wd4146") - string(APPEND VCPKG_CXX_FLAGS " /wd4146") -endif() - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - "-DJPEGXL_VERSION=${JPEGXL_VERSION}" - -DJPEGXL_FORCE_SYSTEM_HWY=ON - -DJPEGXL_FORCE_SYSTEM_BROTLI=ON - -DJPEGXL_FORCE_SYSTEM_HWY=ON - -DJPEGXL_FORCE_SYSTEM_LCMS2=ON - ${FEATURE_OPTIONS} - -DJPEGXL_ENABLE_BENCHMARK=OFF - -DJPEGXL_ENABLE_DOXYGEN=OFF - -DJPEGXL_ENABLE_EXAMPLES=OFF - -DJPEGXL_ENABLE_FUZZERS=OFF - -DJPEGXL_ENABLE_JNI=OFF - -DJPEGXL_ENABLE_MANPAGES=OFF - -DJPEGXL_ENABLE_OPENEXR=OFF - -DJPEGXL_ENABLE_PLUGINS=OFF - -DJPEGXL_ENABLE_SJPEG=OFF - -DJPEGXL_ENABLE_SKCMS=OFF - -DJPEGXL_ENABLE_TCMALLOC=OFF - -DBUILD_TESTING=OFF - -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON - -DJPEGXL_BUNDLE_LIBPNG=OFF - MAYBE_UNUSED_VARIABLES - CMAKE_DISABLE_FIND_PACKAGE_GIF - CMAKE_DISABLE_FIND_PACKAGE_JPEG - CMAKE_DISABLE_FIND_PACKAGE_PNG - CMAKE_DISABLE_FIND_PACKAGE_ZLIB -) - -vcpkg_cmake_install() -vcpkg_copy_pdbs() -vcpkg_fixup_pkgconfig() - -if(JPEGXL_ENABLE_TOOLS) - vcpkg_copy_tools(TOOL_NAMES cjxl djxl jxlinfo AUTO_CLEAN) -endif() - -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/jxl/jxl_export.h" "ifdef JXL_STATIC_DEFINE" "if 1") -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/Meta/CMake/vcpkg/overlay-ports/libjxl/vcpkg.json b/Meta/CMake/vcpkg/overlay-ports/libjxl/vcpkg.json deleted file mode 100644 index e984d0b0f5b39..0000000000000 --- a/Meta/CMake/vcpkg/overlay-ports/libjxl/vcpkg.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "libjxl", - "version-semver": "0.11.1", - "description": "JPEG XL image format reference implementation", - "homepage": "https://github.com/libjxl/libjxl", - "license": "BSD-3-Clause", - "dependencies": [ - "brotli", - "highway", - "lcms", - { - "name": "vcpkg-cmake", - "host": true - } - ], - "features": { - "tools": { - "description": "Build user tools: cjxl and djxl", - "dependencies": [ - "giflib", - "libjpeg-turbo", - "libpng", - "zlib" - ] - } - } -} diff --git a/vcpkg.json b/vcpkg.json index e47384033ed5d..eb1bde1301cf7 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -182,7 +182,7 @@ }, { "name": "libjxl", - "version": "0.11.1#1" + "version": "0.11.1#3" }, { "name": "libpng",