Update the vendored libdeflate to 1.25 (AcademySoftwareFoundation#2274)

Author: cary-ilm

external/current_deflate_version

@@ -1 +1 @@
-v1.24
+v1.25

external/deflate/NEWS.md

@@ -1,5 +1,11 @@
 # libdeflate release notes
 
+## Version 1.25
+
+* Fixed a build error with gcc 16.
+
+* The libdeflate CMake package is now relocatable.
+
 ## Version 1.24
 
 * The CMake-based build system now supports Apple Framework builds.

external/deflate/README.md

@@ -154,6 +154,7 @@ following bindings:
 * Python: [deflate](https://github.com/dcwatson/deflate)
 * Ruby: [libdeflate-ruby](https://github.com/kaorimatz/libdeflate-ruby)
 * Rust: [libdeflater](https://github.com/adamkewley/libdeflater)
+* Swift: [SwiftDeflate](https://github.com/dcwatson/SwiftDeflate)
 
 Note: these are third-party projects which haven't necessarily been vetted by
 the authors of libdeflate.  Please direct all questions, bugs, and improvements

external/deflate/lib/x86/adler32_impl.h

@@ -82,7 +82,7 @@
  */
 #  define adler32_x86_avx512_vl256_vnni	adler32_x86_avx512_vl256_vnni
 #  define SUFFIX				   _avx512_vl256_vnni
-#  define ATTRIBUTES		_target_attribute("avx512bw,avx512vl,avx512vnni" NO_EVEX512)
+#  define ATTRIBUTES		_target_attribute("avx512bw,avx512vl,avx512vnni")
 #  define VL			32
 #  define USE_VNNI		1
 #  define USE_AVX512		1
@@ -94,7 +94,7 @@
  */
 #  define adler32_x86_avx512_vl512_vnni	adler32_x86_avx512_vl512_vnni
 #  define SUFFIX				   _avx512_vl512_vnni
-#  define ATTRIBUTES		_target_attribute("avx512bw,avx512vnni" EVEX512)
+#  define ATTRIBUTES		_target_attribute("avx512bw,avx512vnni")
 #  define VL			64
 #  define USE_VNNI		1
 #  define USE_AVX512		1

external/deflate/lib/x86/cpu_features.h

@@ -165,15 +165,6 @@ static inline u32 get_x86_cpu_features(void) { return 0; }
 #  define HAVE_AVXVNNI(features)	((features) & X86_CPU_FEATURE_AVXVNNI)
 #endif
 
-#if (GCC_PREREQ(14, 0) || CLANG_PREREQ(18, 0, 18000000)) \
-	&& !defined(__EVEX512__) /* avoid subtracting the evex512 feature */
-#  define EVEX512	",evex512"	/* needed to override potential -mno-evex512 */
-#  define NO_EVEX512	",no-evex512"
-#else
-#  define EVEX512	""
-#  define NO_EVEX512	""
-#endif
-
 #endif /* ARCH_X86_32 || ARCH_X86_64 */
 
 #endif /* LIB_X86_CPU_FEATURES_H */

external/deflate/lib/x86/crc32_impl.h

@@ -104,7 +104,7 @@ static const u8 MAYBE_UNUSED shift_tab[48] = {
  */
 #  define crc32_x86_vpclmulqdq_avx512_vl256  crc32_x86_vpclmulqdq_avx512_vl256
 #  define SUFFIX				      _vpclmulqdq_avx512_vl256
-#  define ATTRIBUTES		_target_attribute("vpclmulqdq,pclmul,avx512bw,avx512vl" NO_EVEX512)
+#  define ATTRIBUTES		_target_attribute("vpclmulqdq,pclmul,avx512bw,avx512vl")
 #  define VL			32
 #  define USE_AVX512		1
 #  include "crc32_pclmul_template.h"
@@ -117,7 +117,7 @@ static const u8 MAYBE_UNUSED shift_tab[48] = {
  */
 #  define crc32_x86_vpclmulqdq_avx512_vl512  crc32_x86_vpclmulqdq_avx512_vl512
 #  define SUFFIX				      _vpclmulqdq_avx512_vl512
-#  define ATTRIBUTES		_target_attribute("vpclmulqdq,pclmul,avx512bw,avx512vl" EVEX512)
+#  define ATTRIBUTES		_target_attribute("vpclmulqdq,pclmul,avx512bw,avx512vl")
 #  define VL			64
 #  define USE_AVX512		1
 #  include "crc32_pclmul_template.h"

external/deflate/libdeflate.h

@@ -13,8 +13,8 @@ extern "C" {
 #endif
 
 #define LIBDEFLATE_VERSION_MAJOR	1
-#define LIBDEFLATE_VERSION_MINOR	24
-#define LIBDEFLATE_VERSION_STRING	"1.24"
+#define LIBDEFLATE_VERSION_MINOR	25
+#define LIBDEFLATE_VERSION_STRING	"1.25"
 
 /*
  * Users of libdeflate.dll on Windows can define LIBDEFLATE_DLL to cause

share/util/check_deflate.sh

@@ -3,6 +3,15 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright Contributors to the OpenEXR Project.
 
+# Portable sed -i: macOS requires '' argument, GNU sed doesn't
+sedi() {
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        sed -i '' "$@"
+    else
+        sed -i "$@"
+    fi
+}
+
 if [[ -e current_deflate_version ]]; then
     curl https://api.github.com/repos/ebiggers/libdeflate/releases/latest > /tmp/exr_latest_deflate
     latest=`cat /tmp/exr_latest_deflate | jq -r .name`
@@ -26,9 +35,9 @@ if [[ -e current_deflate_version ]]; then
         rm -f libdeflate.pc.in
         rm -f libdeflate-config.cmake.in
         rm -rf scripts
-        sed -i -f ../patchup_deflate_lib.sed lib/lib_common.h
-        sed -i -f ../patchup_deflate_lib.sed common_defs.h
-        sed -i -f ../patchup_deflate_lib.sed lib/utils.c
+        sedi -f ../patchup_deflate_lib.sed lib/lib_common.h
+        sedi -f ../patchup_deflate_lib.sed common_defs.h
+        sedi -f ../patchup_deflate_lib.sed lib/utils.c
         cd ..
 
         rm "${filename}"