From 764ad0a297a101a279e700b0a74213cbf7e7efcc Mon Sep 17 00:00:00 2001 From: ptahmose Date: Fri, 14 Aug 2026 22:14:44 +0200 Subject: [PATCH] [libczi] update to 0.69.1 (#52834) Co-authored-by: Billy Robert O'Neal III Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- ports/libczi/portfile.cmake | 118 +++++++++++++++++++----------------- ports/libczi/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libczi.json | 5 ++ 4 files changed, 69 insertions(+), 58 deletions(-) diff --git a/ports/libczi/portfile.cmake b/ports/libczi/portfile.cmake index d708f5ef38..79a44ed98f 100644 --- a/ports/libczi/portfile.cmake +++ b/ports/libczi/portfile.cmake @@ -1,56 +1,62 @@ -set(LIBCZI_REPO_NAME ZEISS/libczi) -set(LIBCZI_REPO_REF b85521a4aecc016f944cfb6dac8dfe9c668c343a) - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ${LIBCZI_REPO_NAME} - REF ${LIBCZI_REPO_REF} - SHA512 97b4d4da856e495c90270be9e43f38154007120f331152f83f9de4029c5284778c1c0ba372c06e235598536a573ad35af153b30b1cc41d920717b6ca20312f19 -) - -# Translate enabled vcpkg features into CMake -D flags: -vcpkg_check_features( - OUT_FEATURE_OPTIONS FEATURE_OPTS - FEATURES - azureblobstore LIBCZI_BUILD_AZURESDK_BASED_STREAM - curl LIBCZI_BUILD_CURL_BASED_STREAM - curl LIBCZI_BUILD_PREFER_EXTERNALPACKAGE_LIBCURL -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBCZI) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - ${FEATURE_OPTS} - -DLIBCZI_DO_NOT_SET_MSVC_RUNTIME_LIBRARY=ON # set by vcpkg - -DLIBCZI_BUILD_CZICMD=OFF # could be feature - -DLIBCZI_BUILD_DYNLIB=${BUILD_SHARED_LIBCZI} - -DLIBCZI_BUILD_PREFER_EXTERNALPACKAGE_EIGEN3=ON - -DLIBCZI_BUILD_PREFER_EXTERNALPACKAGE_ZSTD=ON - -DLIBCZI_BUILD_UNITTESTS=OFF - -DLIBCZI_ENABLE_INSTALL=ON - # for cross-compilation scenarios, prevent execution of test-programs inside the libCZI-build-scripts - -DCRASH_ON_UNALIGNED_ACCESS=FALSE - -DIS_BIG_ENDIAN=FALSE - -DNEON_INTRINSICS_CAN_BE_USED=TRUE - # Intentionally empty: Must be defined to avoid try-run. - # Override in triplet if needed. - -DADDITIONAL_LIBS_REQUIRED_FOR_ATOMIC:STRING= - # VCS metadata injection - -DLIBCZI_REPOSITORY_HASH=${LIBCZI_REPO_REF} - -DLIBCZI_REPOSITORY_BRANCH=unknown - -DLIBCZI_REPOSITORY_REMOTE=https://github.com/${LIBCZI_REPO_NAME}.git - MAYBE_UNUSED_VARIABLES - CRASH_ON_UNALIGNED_ACCESS - IS_BIG_ENDIAN - NEON_INTRINSICS_CAN_BE_USED -) - -vcpkg_cmake_install() - -vcpkg_cmake_config_fixup(CONFIG_PATH share/libczi) - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") - -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +set(LIBCZI_REPO_NAME ZEISS/libczi) +set(LIBCZI_REPO_REF 61f74ff097d6d0fbe6e36f204ff59d92e299d7cd) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ${LIBCZI_REPO_NAME} + REF ${LIBCZI_REPO_REF} + SHA512 5f1f487df249b4939e2c2fff3ec9a87771ec07f5da1bc8b0a9c487e67d75fd0384f0c7dbb753dba23c66296e5caf048fa334515d9fd63ca13e7bb7c936601f5b +) + +# Translate enabled vcpkg features into CMake -D flags: +vcpkg_check_features( + OUT_FEATURE_OPTIONS FEATURE_OPTS + FEATURES + azureblobstore LIBCZI_BUILD_AZURESDK_BASED_STREAM + curl LIBCZI_BUILD_CURL_BASED_STREAM + curl LIBCZI_BUILD_PREFER_EXTERNALPACKAGE_LIBCURL +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" BUILD_SHARED_LIBCZI) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + ${FEATURE_OPTS} + -DLIBCZI_DO_NOT_SET_MSVC_RUNTIME_LIBRARY=ON # set by vcpkg + -DLIBCZI_BUILD_CZICMD=OFF # could be feature + -DLIBCZI_BUILD_DYNLIB=${BUILD_SHARED_LIBCZI} + -DLIBCZI_BUILD_ENABLE_EXPERIMENTAL_FUNCTIONALITY=OFF + -DLIBCZI_BUILD_EXPERIMENTAL_CHUNKED_COMPRESSION=OFF + -DLIBCZI_BUILD_PREFER_EXTERNALPACKAGE_LZ4=ON + -DLIBCZI_BUILD_PREFER_EXTERNALPACKAGE_EIGEN3=ON + -DLIBCZI_BUILD_PREFER_EXTERNALPACKAGE_ZSTD=ON + -DLIBCZI_BUILD_UNITTESTS=OFF + -DLIBCZI_ENABLE_INSTALL=ON + # for cross-compilation scenarios, prevent execution of test-programs inside the libCZI-build-scripts + -DCRASH_ON_UNALIGNED_ACCESS=FALSE + -DNEON_INTRINSICS_CAN_BE_USED=TRUE + # Intentionally empty: Must be defined to avoid try-run. + # Override in triplet if needed. + -DADDITIONAL_LIBS_REQUIRED_FOR_ATOMIC:STRING= + # VCS metadata injection + -DLIBCZI_REPOSITORY_HASH=${LIBCZI_REPO_REF} + -DLIBCZI_REPOSITORY_BRANCH=unknown + -DLIBCZI_REPOSITORY_REMOTE=https://github.com/${LIBCZI_REPO_NAME}.git + MAYBE_UNUSED_VARIABLES + # Only checked when AVX is unavailable, arm_neon.h exists, and the compiler is not MSVC: + # https://github.com/ZEISS/libczi/blob/61f74ff097d6d0fbe6e36f204ff59d92e299d7cd/Src/libCZI/CMakeLists.txt#L242-L261 + NEON_INTRINSICS_CAN_BE_USED +) + +vcpkg_cmake_install() + +vcpkg_cmake_config_fixup(CONFIG_PATH share/libczi) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +vcpkg_install_copyright( + FILE_LIST + "${SOURCE_PATH}/COPYING" + "${SOURCE_PATH}/THIRD_PARTY_LICENSES.txt" +) diff --git a/ports/libczi/vcpkg.json b/ports/libczi/vcpkg.json index 5fa0f629a9..7019da0e2c 100644 --- a/ports/libczi/vcpkg.json +++ b/ports/libczi/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libczi", - "version": "0.67.6", + "version": "0.69.1", "description": "library to read and write CZI files.", "homepage": "https://github.com/ZEISS/libczi", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index afc130b7a1..29051ef3a5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4917,7 +4917,7 @@ "port-version": 0 }, "libczi": { - "baseline": "0.67.6", + "baseline": "0.69.1", "port-version": 0 }, "libdatachannel": { diff --git a/versions/l-/libczi.json b/versions/l-/libczi.json index ccf8df7f69..668348adb1 100644 --- a/versions/l-/libczi.json +++ b/versions/l-/libczi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a8d68e965b4d5fe024e5dfe6fa66ebecb2def7c7", + "version": "0.69.1", + "port-version": 0 + }, { "git-tree": "73ce5bfc23bf3b33e2f771949f43454edcf0ecff", "version": "0.67.6",