[libaec] Update to 1.1.5 (#49913)

This commit is contained in:
SunBlack 2026-02-11 19:36:27 +01:00 committed by GitHub
parent b716eeeed9
commit e2d3d2367b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 31 additions and 6 deletions

View File

@ -0,0 +1,13 @@
diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt
index 16cace7..c2e7571 100644
--- a/packaging/CMakeLists.txt
+++ b/packaging/CMakeLists.txt
@@ -35,7 +35,7 @@ if(BUILD_STATIC_LIBS)
EXPORT libaec_static_targets
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
- install(EXPORT libaec_shared_targets
+ install(EXPORT libaec_static_targets
DESTINATION "${libaec_INSTALL_CMAKEDIR}"
NAMESPACE libaec::
FILE libaec_static-targets.cmake)

View File

@ -3,7 +3,9 @@ vcpkg_from_gitlab(
GITLAB_URL https://gitlab.dkrz.de
REPO k202009/libaec
REF "v${VERSION}"
SHA512 320060f59f29d0f2124c79e60ab6205fed31d96101b654393e4ba3154c55903247ef844e1d4f658094b76e19fe950437e9ecbbcd04dfe53a8b570fe9a17b5f87
SHA512 09f6fde3e767fe67865a86d8802eaf63b313ef6f2aaf6bf5e7edef5f405e58d40f2a01132bb290ee176741f3924a6ee2e9a2641cf5e80c3d036d4f5c69142c4f
PATCHES
fix_export_target.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
@ -19,13 +21,18 @@ vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/libaec/libaec-config.cmake"
"if(libaec_USE_STATIC_LIBS)"
"if(TARGET libaec::aec OR TARGET libaec::sz)\nelseif(\"${BUILD_STATIC}\") # forced by vcpkg"
"if(\"${BUILD_STATIC}\") # forced by vcpkg"
)
# Compatibility with user's CMake < 3.18 (vcpkg claims support for >= 3.16):
# Make imported targets global so that libaec-config.cmake can create ALIAS targets.
file(READ "${CURRENT_PACKAGES_DIR}/share/libaec/libaec-targets.cmake" libaec_targets)
set(_target_file "libaec_shared-targets")
if(BUILD_STATIC)
set(_target_file "libaec_static-targets")
endif()
file(READ "${CURRENT_PACKAGES_DIR}/share/libaec/${_target_file}.cmake" libaec_targets)
string(REGEX REPLACE " (SHARED|STATIC) IMPORTED" " \\1 IMPORTED \${libaec_maybe_global}" libaec_targets "${libaec_targets}")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/libaec/libaec-targets.cmake" "set(libaec_maybe_global \"\")
file(WRITE "${CURRENT_PACKAGES_DIR}/share/libaec/${_target_file}.cmake" "set(libaec_maybe_global \"\")
if(CMAKE_VERSION VERSION_LESS 3.18)
set(libaec_maybe_global \"GLOBAL\")
endif()

View File

@ -1,6 +1,6 @@
{
"name": "libaec",
"version": "1.1.4",
"version": "1.1.5",
"description": "Adaptive Entropy Coding library",
"homepage": "https://gitlab.dkrz.de/k202009/libaec",
"license": "BSD-2-Clause",

View File

@ -4581,7 +4581,7 @@
"port-version": 3
},
"libaec": {
"baseline": "1.1.4",
"baseline": "1.1.5",
"port-version": 0
},
"libaes-siv": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6281781decab1fe8a7f85a958a0e316df368e4e1",
"version": "1.1.5",
"port-version": 0
},
{
"git-tree": "f1e6ec945caf3975d531619c91b3ccedfd48200b",
"version": "1.1.4",