From 00c5775211f45cd08b37fce0484b4cb940e422ab Mon Sep 17 00:00:00 2001 From: SunBlack Date: Tue, 25 Aug 2026 03:20:49 +0200 Subject: [PATCH] [libdeflate] Update to 1.26 (#53542) --- ports/libdeflate/portfile.cmake | 95 +++++++++---------- .../remove_wrong_c_flags_modification.diff | 12 --- ports/libdeflate/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/l-/libdeflate.json | 5 + 5 files changed, 54 insertions(+), 62 deletions(-) delete mode 100644 ports/libdeflate/remove_wrong_c_flags_modification.diff diff --git a/ports/libdeflate/portfile.cmake b/ports/libdeflate/portfile.cmake index 1511774063..a2148b8ae6 100644 --- a/ports/libdeflate/portfile.cmake +++ b/ports/libdeflate/portfile.cmake @@ -1,48 +1,47 @@ -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO ebiggers/libdeflate - REF "v${VERSION}" - SHA512 fa02fa0a6d241d3f71cf4238a3ac58968cbea0b66613c1647d6eea575379d60e93f4647f8b3921e8c31322e20521aa9953213d5465f7d10a27c57bdd7186d318 - HEAD_REF master - PATCHES - remove_wrong_c_flags_modification.diff -) - -vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - FEATURES - compression LIBDEFLATE_COMPRESSION_SUPPORT - decompression LIBDEFLATE_DECOMPRESSION_SUPPORT - gzip LIBDEFLATE_GZIP_SUPPORT - zlib LIBDEFLATE_ZLIB_SUPPORT -) - -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBDEFLATE_BUILD_STATIC) -string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBDEFLATE_BUILD_SHARED) - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DLIBDEFLATE_BUILD_SHARED_LIB=${LIBDEFLATE_BUILD_SHARED} - -DLIBDEFLATE_BUILD_STATIC_LIB=${LIBDEFLATE_BUILD_STATIC} - -DLIBDEFLATE_BUILD_GZIP=OFF - ${FEATURE_OPTIONS} -) - -vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libdeflate") -vcpkg_fixup_pkgconfig() - -if(VCPKG_TARGET_IS_WINDOWS) - if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libdeflate.h" "defined(LIBDEFLATE_DLL)" "1") - elseif(NOT VCPKG_TARGET_IS_MINGW) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libdeflate.pc" " -ldeflate" " -ldeflatestatic") - if(NOT VCPKG_BUILD_TYPE) - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libdeflate.pc" " -ldeflate" " -ldeflatestatic") - endif() - endif() -endif() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") -file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO ebiggers/libdeflate + REF "v${VERSION}" + SHA512 06605eabce8635b82e03863c87b515696d08b8a1fc36b746b44b660989613d2ebd6ca1bb13dd0f88244846894dbf5a15169dd443c34dcda64e960fdbd08a8d3b + HEAD_REF master +) + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + compression LIBDEFLATE_COMPRESSION_SUPPORT + decompression LIBDEFLATE_DECOMPRESSION_SUPPORT + gzip LIBDEFLATE_GZIP_SUPPORT + zlib LIBDEFLATE_ZLIB_SUPPORT +) + +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBDEFLATE_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBDEFLATE_BUILD_SHARED) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DLIBDEFLATE_BUILD_SHARED_LIB=${LIBDEFLATE_BUILD_SHARED} + -DLIBDEFLATE_BUILD_STATIC_LIB=${LIBDEFLATE_BUILD_STATIC} + -DLIBDEFLATE_BUILD_GZIP=OFF + -DLIBDEFLATE_USER_SET_RELEASE_FLAGS=ON # Prevent wrong C flags modification + ${FEATURE_OPTIONS} +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/libdeflate") +vcpkg_fixup_pkgconfig() + +if(VCPKG_TARGET_IS_WINDOWS) + if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libdeflate.h" "defined(LIBDEFLATE_DLL)" "1") + elseif(NOT VCPKG_TARGET_IS_MINGW) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/libdeflate.pc" " -ldeflate" " -ldeflatestatic") + if(NOT VCPKG_BUILD_TYPE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/libdeflate.pc" " -ldeflate" " -ldeflatestatic") + endif() + endif() +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING") +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libdeflate/remove_wrong_c_flags_modification.diff b/ports/libdeflate/remove_wrong_c_flags_modification.diff deleted file mode 100644 index 94a125c9d9..0000000000 --- a/ports/libdeflate/remove_wrong_c_flags_modification.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0acd26f..218c48b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -61,7 +61,6 @@ if(NOT LIBDEFLATE_BUILD_STATIC_LIB) - endif() - - # Set common C compiler flags for all targets (the library and the programs). --set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG") - set(CMAKE_C_STANDARD 99) - if(NOT MSVC) - check_c_compiler_flag(-Wdeclaration-after-statement HAVE_WDECLARATION_AFTER_STATEMENT) diff --git a/ports/libdeflate/vcpkg.json b/ports/libdeflate/vcpkg.json index 7e987d57dc..234bc291a0 100644 --- a/ports/libdeflate/vcpkg.json +++ b/ports/libdeflate/vcpkg.json @@ -1,6 +1,6 @@ { "name": "libdeflate", - "version": "1.25", + "version": "1.26", "description": "libdeflate is a library for fast, whole-buffer DEFLATE-based compression and decompression.", "homepage": "https://github.com/ebiggers/libdeflate", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 60a7d5416f..dfd17d6988 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4941,7 +4941,7 @@ "port-version": 0 }, "libdeflate": { - "baseline": "1.25", + "baseline": "1.26", "port-version": 0 }, "libdicom": { diff --git a/versions/l-/libdeflate.json b/versions/l-/libdeflate.json index 2a6e790122..9f9eccc285 100644 --- a/versions/l-/libdeflate.json +++ b/versions/l-/libdeflate.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "91ad43c9c345f2ba1b05c624faa7988ba8aa9b2d", + "version": "1.26", + "port-version": 0 + }, { "git-tree": "ceffc2e1864a1a1da49e655da03c323723a9816d", "version": "1.25",