Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libaec for openSUSE:Factory checked
in at 2025-06-23 14:56:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libaec (Old)
and /work/SRC/openSUSE:Factory/.libaec.new.7067 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libaec"
Mon Jun 23 14:56:44 2025 rev:9 rq:1287042 version:1.1.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/libaec/libaec.changes 2024-05-03
10:31:47.281443697 +0200
+++ /work/SRC/openSUSE:Factory/.libaec.new.7067/libaec.changes 2025-06-23
14:57:17.101861643 +0200
@@ -1,0 +2,8 @@
+Thu Jun 12 14:07:50 UTC 2025 - Manfred Schwarb <manfre...@gmx.ch>
+
+- adjust spec file: remove now unneeded tweaks to adjust cmake files
+ and to delete static libraries
+- Update to version 1.1.4:
+ * cmake build fixes and enhancements
+
+-------------------------------------------------------------------
Old:
----
libaec-v1.1.3.tar.gz
New:
----
libaec-v1.1.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libaec.spec ++++++
--- /var/tmp/diff_new_pack.VENV4G/_old 2025-06-23 14:57:17.873893929 +0200
+++ /var/tmp/diff_new_pack.VENV4G/_new 2025-06-23 14:57:17.877894097 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libaec
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: libaec
-Version: 1.1.3
+Version: 1.1.4
Release: 0
Summary: Adaptive Entropy Coding library
License: BSD-2-Clause
@@ -84,19 +84,15 @@
%autosetup -n "%{name}-v%{version}"
%build
-%cmake
+%cmake \
+ -DBUILD_STATIC_LIBS=OFF
%cmake_build
%check
-export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
%ctest
%install
%cmake_install
-find %{buildroot}%{_libdir} -type f -name "*.a" -delete -print
-mkdir -p %{buildroot}%{_libdir}/cmake/%{name}
-mv %{buildroot}/usr/cmake/*.cmake %{buildroot}%{_libdir}/cmake/%{name}/
-rmdir %{buildroot}/usr/cmake
%post -n libaec0 -p /sbin/ldconfig
%post -n libsz2 -p /sbin/ldconfig
++++++ libaec-v1.1.3.tar.gz -> libaec-v1.1.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/CHANGELOG.md
new/libaec-v1.1.4/CHANGELOG.md
--- old/libaec-v1.1.3/CHANGELOG.md 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/CHANGELOG.md 2025-06-12 13:06:42.000000000 +0200
@@ -1,6 +1,19 @@
# libaec Changelog
All notable changes to libaec will be documented in this file.
+## [1.1.4] - 2025-06-12
+
+### Changed
+- Build either or both shared and static libraries. The behavior is
+ selected by the BUILD_SHARED_LIBS and BUILD_STATIC_LIBS options
+ which are both ON by default. For example, add
+ -DBUILD_STATIC_LIBS=OFF to cmake to build only the shared libraries
+ (Markus Mützel).
+
+### Fixed
+- Various improvements for CMake by Markus Mützel, Vincent LE GARREC
+ and Miloš Komarčević.
+
## [1.1.3] - 2024-03-21
### Fixed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/CMakeLists.txt
new/libaec-v1.1.4/CMakeLists.txt
--- old/libaec-v1.1.3/CMakeLists.txt 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/CMakeLists.txt 2025-06-12 13:06:42.000000000 +0200
@@ -1,11 +1,13 @@
-cmake_minimum_required(VERSION 3.13...3.19)
-project(libaec LANGUAGES C VERSION 1.1.3)
+cmake_minimum_required(VERSION 3.26...3.31)
+project(libaec LANGUAGES C VERSION 1.1.4)
+
+option(BUILD_SHARED_LIBS "OFF: do not build shared libraries. ON (default):
build shared libraries" ON)
+option(BUILD_STATIC_LIBS "OFF: do not build static libraries. ON (default):
build static libraries" ON)
set(CMAKE_C_STANDARD 99)
set(CMAKE_C_VISIBILITY_PRESET hidden)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
include(CTest)
-
include(TestBigEndian)
test_big_endian(WORDS_BIGENDIAN)
@@ -32,7 +34,7 @@
# Communicate findings to code. Has to be compatible with autoconf's config.h.
configure_file(
- "cmake/config.h.in"
+ "include/config.h.in"
"${CMAKE_CURRENT_BINARY_DIR}/include/config.h")
# Create libaec.h with current version information
@@ -63,37 +65,13 @@
target_link_options(aec PUBLIC ${FUZZ_TARGET_SAN_FLAGS})
endif()
-# Install the cmake files.
-set(libaec_CONFIG_IN ${CMAKE_CURRENT_SOURCE_DIR}/cmake/libaec-config.cmake.in)
-set(libaec_CONFIG_OUT ${CMAKE_CURRENT_BINARY_DIR}/cmake/libaec-config.cmake)
-configure_file(${libaec_CONFIG_IN} ${libaec_CONFIG_OUT} @ONLY)
-set(libaec_CONFIG_VERSION_IN
${CMAKE_CURRENT_SOURCE_DIR}/cmake/libaec-config-version.cmake.in)
-set(libaec_CONFIG_VERSION_OUT
${CMAKE_CURRENT_BINARY_DIR}/cmake/libaec-config-version.cmake)
-configure_file(${libaec_CONFIG_VERSION_IN} ${libaec_CONFIG_VERSION_OUT} @ONLY)
-install(FILES ${libaec_CONFIG_OUT}
- DESTINATION cmake)
-install(FILES ${libaec_CONFIG_VERSION_OUT}
- DESTINATION cmake)
-
-# Cpack configuration mainly for Windows installer
-set(CPACK_PACKAGE_NAME "libaec")
-set(CPACK_PACKAGE_VENDOR "Deutsches Klimarechenzentrum GmbH")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
- "libaec - Adaptive Entropy Coding library")
-set(CPACK_PACKAGE_INSTALL_DIRECTORY "libaec")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
-
-if(WIN32)
- set(CPACK_GENERATOR "WIX")
- set(CPACK_WIX_UPGRADE_GUID "E58A21F6-BB99-46B5-8AD8-6114E4CCA0A6")
-endif()
+# Include the install rules if the user wanted them (included by
+# default when top-level)
-set(CPACK_SOURCE_IGNORE_FILES
- /.git
- /.*build.*
- /*.cache
- .*~
- .*\#.*\#
- \..*\#.*)
-
-include(CPack)
+string(COMPARE
+ EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}" is_top_level)
+option(libaec_INCLUDE_PACKAGING
+ "Include packaging rules for libaec" "${is_top_level}")
+if(libaec_INCLUDE_PACKAGING)
+ add_subdirectory(packaging)
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/LICENSE.txt
new/libaec-v1.1.4/LICENSE.txt
--- old/libaec-v1.1.3/LICENSE.txt 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/LICENSE.txt 2025-06-12 13:06:42.000000000 +0200
@@ -1,4 +1,4 @@
-Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis Kornblueh
+Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis Kornblueh
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/Makefile.am
new/libaec-v1.1.4/Makefile.am
--- old/libaec-v1.1.3/Makefile.am 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/Makefile.am 2025-06-12 13:06:42.000000000 +0200
@@ -1,7 +1,8 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src tests
-EXTRA_DIST = doc/patent.txt CMakeLists.txt cmake/config.h.in \
-cmake/libaec-config.cmake.in cmake/libaec-config-version.cmake.in \
+EXTRA_DIST = doc/patent.txt CMakeLists.txt include/config.h.in \
+packaging/libaec-config.cmake packaging/CMakeLists.txt \
+fuzzing/CMakeLists.txt fuzzing/fuzz_target.cc \
INSTALL.md README.md README.SZIP CHANGELOG.md LICENSE.txt data
sampledata = 121B2TestData
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/cmake/config.h.in
new/libaec-v1.1.4/cmake/config.h.in
--- old/libaec-v1.1.3/cmake/config.h.in 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/cmake/config.h.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-#cmakedefine WORDS_BIGENDIAN
-#cmakedefine01 HAVE_DECL___BUILTIN_CLZLL
-#cmakedefine HAVE_BSR64
-#cmakedefine HAVE_SNPRINTF
-#cmakedefine HAVE__SNPRINTF
-#cmakedefine HAVE__SNPRINTF_S
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/cmake/libaec-config-version.cmake.in
new/libaec-v1.1.4/cmake/libaec-config-version.cmake.in
--- old/libaec-v1.1.3/cmake/libaec-config-version.cmake.in 2024-03-21
09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/cmake/libaec-config-version.cmake.in 1970-01-01
01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-set(PACKAGE_VERSION_MAJOR @PROJECT_VERSION_MAJOR@)
-set(PACKAGE_VERSION_MINOR @PROJECT_VERSION_MINOR@)
-set(PACKAGE_VERSION_PATCH @PROJECT_VERSION_PATCH@)
-set(PACKAGE_VERSION @PROJECT_VERSION@)
-
-# Check whether the requested PACKAGE_FIND_VERSION is compatible
-if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION OR
- PACKAGE_VERSION_MAJOR GREATER PACKAGE_FIND_VERSION_MAJOR)
- set(PACKAGE_VERSION_COMPATIBLE FALSE)
-else()
- set(PACKAGE_VERSION_COMPATIBLE TRUE)
- if(PACKAGE_VERSION VERSION_EQUAL PACKAGE_FIND_VERSION)
- set(PACKAGE_VERSION_EXACT TRUE)
- endif()
-endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/cmake/libaec-config.cmake.in
new/libaec-v1.1.4/cmake/libaec-config.cmake.in
--- old/libaec-v1.1.3/cmake/libaec-config.cmake.in 2024-03-21
09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/cmake/libaec-config.cmake.in 1970-01-01
01:00:00.000000000 +0100
@@ -1,101 +0,0 @@
-# libaec-config.cmake
-# ----------------
-#
-# Finds the AEC library, specify the starting search path in libaec_ROOT.
-#
-# Static vs. shared
-# -----------------
-# To make use of the static library instead of the shared one, one needs
-# to set the variable libaec_USE_STATIC_LIBS to ON before calling find_package.
-# Example:
-# set(libaec_USE_STATIC_LIBS ON)
-# find_package(libaec CONFIG)
-#
-# This will define the following variables:
-#
-# libaec_FOUND - True if the system has the AEC library.
-# libaec_VERSION - The version of the AEC library which was found.
-# SZIP_FOUND - True if the system has the SZIP library.
-# SZIP_VERSION - The version of the SZIP library which was found.
-# SZIP_LIBRARIES - All the required libraries to make use of SZIP.
-#
-# and the following imported targets:
-#
-# libaec::aec - The AEC library.
-# libaec::sz - The SZIP compatible version of the AEC library.
-
-find_path(libaec_INCLUDE_DIR NAMES libaec.h DOC "AEC include directory")
-find_path(SZIP_INCLUDE_DIR NAMES szlib.h DOC "SZIP include directory")
-if (libaec_USE_STATIC_LIBS)
- if (MSVC)
- find_library(libaec_LIBRARY NAMES aec-static.lib DOC "AEC library")
- find_library(SZIP_LIBRARY NAMES szip-static.lib DOC "SZIP compatible
version of the AEC library")
- else ()
- find_library(libaec_LIBRARY NAMES libaec.a DOC "AEC library")
- find_library(SZIP_LIBRARY NAMES libsz.a DOC "SZIP compatible version of
the AEC library")
- endif ()
-else ()
- find_library(libaec_LIBRARY NAMES aec DOC "AEC library")
- find_library(SZIP_LIBRARY NAMES sz szip DOC "SZIP compatible version of the
AEC library")
-endif ()
-
-# Check version here
-if (libaec_INCLUDE_DIR AND libaec_LIBRARY)
- set(libaec_VERSION "@PROJECT_VERSION@")
- set(SZIP_VERSION "2.0.1")
-endif ()
-
-include(FindPackageHandleStandardArgs)
-set(${CMAKE_FIND_PACKAGE_NAME}_CONFIG "${CMAKE_CURRENT_LIST_FILE}")
-find_package_handle_standard_args(libaec
- FOUND_VAR libaec_FOUND
- REQUIRED_VARS libaec_LIBRARY libaec_INCLUDE_DIR SZIP_LIBRARY SZIP_INCLUDE_DIR
- VERSION_VAR libaec_VERSION
- CONFIG_MODE
-)
-
-if (libaec_FOUND)
- if (libaec_USE_STATIC_LIBS)
- add_library(libaec::aec STATIC IMPORTED)
- else ()
- add_library(libaec::aec SHARED IMPORTED)
- target_compile_definitions(libaec::aec INTERFACE LIBAEC_SHARED)
- if (MSVC)
- set_target_properties(libaec::aec PROPERTIES
- IMPORTED_IMPLIB "${libaec_LIBRARY}"
- )
- endif ()
- endif ()
- set_target_properties(libaec::aec PROPERTIES
- IMPORTED_LOCATION "${libaec_LIBRARY}"
- INTERFACE_INCLUDE_DIRECTORIES "${libaec_INCLUDE_DIR}"
- )
-
- # SZIP
- if (libaec_USE_STATIC_LIBS)
- add_library(libaec::sz STATIC IMPORTED)
- else ()
- add_library(libaec::sz SHARED IMPORTED)
- target_compile_definitions(libaec::sz INTERFACE LIBAEC_SHARED)
- if (MSVC)
- set_target_properties(libaec::sz PROPERTIES
- IMPORTED_IMPLIB "${SZIP_LIBRARY}"
- )
- endif ()
- endif ()
- set_target_properties(libaec::sz PROPERTIES
- IMPORTED_LOCATION "${SZIP_LIBRARY}"
- INTERFACE_INCLUDE_DIRECTORIES "${SZIP_INCLUDE_DIR}"
- )
-
- # Set SZIP variables.
- set(SZIP_FOUND TRUE)
- set(SZIP_LIBRARIES "${SZIP_LIBRARY}")
-endif ()
-
-mark_as_advanced(
- libaec_LIBRARY
- libaec_INCLUDE_DIR
- SZIP_LIBRARY
- SZIP_INCLUDE_DIR
-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/configure.ac
new/libaec-v1.1.4/configure.ac
--- old/libaec-v1.1.3/configure.ac 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/configure.ac 2025-06-12 13:06:42.000000000 +0200
@@ -2,7 +2,7 @@
m4_define([VERSION_MAJOR], [1])
m4_define([VERSION_MINOR], [1])
-m4_define([VERSION_PATCH], [3])
+m4_define([VERSION_PATCH], [4])
AC_INIT([libaec],[VERSION_MAJOR.VERSION_MINOR.VERSION_PATCH],[rosenha...@dkrz.de])
@@ -10,6 +10,13 @@
AC_SUBST(PROJECT_VERSION_MINOR, [VERSION_MINOR])
AC_SUBST(PROJECT_VERSION_PATCH, [VERSION_PATCH])
+if test "$enable_shared" = no; then
+ LIBAEC_SHARED=
+else
+ LIBAEC_SHARED=-DLIBAEC_SHARED
+fi
+AC_SUBST([LIBAEC_SHARED])
+
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_SRCDIR([src/decode.c])
@@ -30,7 +37,6 @@
AC_TYPE_UINT64_T
AC_TYPE_UINT8_T
AC_C_INLINE
-AC_C_RESTRICT
AC_CHECK_FUNCS([memset strstr snprintf])
AC_CHECK_DECLS(__builtin_clzll)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/include/config.h.in
new/libaec-v1.1.4/include/config.h.in
--- old/libaec-v1.1.3/include/config.h.in 1970-01-01 01:00:00.000000000
+0100
+++ new/libaec-v1.1.4/include/config.h.in 2025-06-12 13:06:42.000000000
+0200
@@ -0,0 +1,6 @@
+#cmakedefine WORDS_BIGENDIAN
+#cmakedefine01 HAVE_DECL___BUILTIN_CLZLL
+#cmakedefine HAVE_BSR64
+#cmakedefine HAVE_SNPRINTF
+#cmakedefine HAVE__SNPRINTF
+#cmakedefine HAVE__SNPRINTF_S
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/include/libaec.h.in
new/libaec-v1.1.4/include/libaec.h.in
--- old/libaec-v1.1.3/include/libaec.h.in 2024-03-21 09:51:01.000000000
+0100
+++ new/libaec-v1.1.4/include/libaec.h.in 2025-06-12 13:06:42.000000000
+0200
@@ -2,7 +2,7 @@
* @file libaec.h
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -49,13 +49,24 @@
extern "C"{
#endif
-#if defined LIBAEC_BUILD && HAVE_VISIBILITY
-# define LIBAEC_DLL_EXPORTED __attribute__((__visibility__("default")))
-#elif (defined _WIN32 && !defined __CYGWIN__) && defined LIBAEC_SHARED
-# if defined LIBAEC_BUILD
-# define LIBAEC_DLL_EXPORTED __declspec(dllexport)
+#if defined _WIN32 || defined __CYGWIN__
+# define LIBAEC_HELPER_DLL_IMPORT __declspec(dllimport)
+# define LIBAEC_HELPER_DLL_EXPORT __declspec(dllexport)
+#else
+# if __GNUC__ >= 4
+# define LIBAEC_HELPER_DLL_IMPORT
+# define LIBAEC_HELPER_DLL_EXPORT __attribute__ ((visibility ("default")))
+# else
+# define LIBAEC_HELPER_DLL_IMPORT
+# define LIBAEC_HELPER_DLL_EXPORT
+# endif
+#endif
+
+#ifdef LIBAEC_SHARED
+# ifdef LIBAEC_BUILD
+# define LIBAEC_DLL_EXPORTED LIBAEC_HELPER_DLL_EXPORT
# else
-# define LIBAEC_DLL_EXPORTED __declspec(dllimport)
+# define LIBAEC_DLL_EXPORTED LIBAEC_HELPER_DLL_IMPORT
# endif
#else
# define LIBAEC_DLL_EXPORTED
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/include/szlib.h
new/libaec-v1.1.4/include/szlib.h
--- old/libaec-v1.1.3/include/szlib.h 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/include/szlib.h 2025-06-12 13:06:42.000000000 +0200
@@ -2,7 +2,7 @@
* @file szlib.h
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/packaging/CMakeLists.txt
new/libaec-v1.1.4/packaging/CMakeLists.txt
--- old/libaec-v1.1.3/packaging/CMakeLists.txt 1970-01-01 01:00:00.000000000
+0100
+++ new/libaec-v1.1.4/packaging/CMakeLists.txt 2025-06-12 13:06:42.000000000
+0200
@@ -0,0 +1,52 @@
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+
+if(NOT DEFINED libaec_INSTALL_CMAKEDIR)
+ set(libaec_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/libaec"
+ CACHE STRING "Path to libaec CMake files")
+endif()
+
+write_basic_package_version_file(
+ libaec-config-version.cmake
+ COMPATIBILITY SameMajorVersion)
+
+install(FILES
+ "${CMAKE_CURRENT_SOURCE_DIR}/libaec-config.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/libaec-config-version.cmake"
+ DESTINATION "${libaec_INSTALL_CMAKEDIR}")
+
+set(TARGETS_EXPORT)
+if(BUILD_SHARED_LIBS)
+ set(TARGETS_EXPORT aec-shared-objects sz-shared-objects aec-shared sz-shared)
+endif()
+if(BUILD_STATIC_LIBS)
+ set(TARGETS_EXPORT
+ ${TARGETS_EXPORT}
+ aec-static-objects sz-static-objects aec-static sz-static)
+endif()
+
+install(TARGETS ${TARGETS_EXPORT}
+ EXPORT libaec_targets
+ PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+
+install(EXPORT libaec_targets
+ DESTINATION "${libaec_INSTALL_CMAKEDIR}"
+ NAMESPACE libaec::
+ FILE libaec-targets.cmake)
+
+# Cpack configuration mainly for Windows installer
+set(CPACK_PACKAGE_NAME "libaec")
+set(CPACK_PACKAGE_VENDOR "Deutsches Klimarechenzentrum GmbH")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY
+ "libaec - Adaptive Entropy Coding library")
+set(CPACK_PACKAGE_INSTALL_DIRECTORY "libaec")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.txt")
+
+if(WIN32)
+ set(CPACK_GENERATOR "WIX")
+ set(CPACK_WIX_UPGRADE_GUID "E58A21F6-BB99-46B5-8AD8-6114E4CCA0A6")
+endif()
+
+set(CPACK_SOURCE_IGNORE_FILES /.git;.*~)
+
+include(CPack)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/packaging/libaec-config.cmake
new/libaec-v1.1.4/packaging/libaec-config.cmake
--- old/libaec-v1.1.3/packaging/libaec-config.cmake 1970-01-01
01:00:00.000000000 +0100
+++ new/libaec-v1.1.4/packaging/libaec-config.cmake 2025-06-12
13:06:42.000000000 +0200
@@ -0,0 +1,106 @@
+# libaec-config.cmake
+# -------------------
+#
+# Finds the AEC library.
+#
+# Static vs. shared
+# -----------------
+# To make use of the static library instead of the shared one, one
+# needs to set the variable libaec_USE_STATIC_LIBS to ON before
+# calling find_package.
+# Example:
+# set(libaec_USE_STATIC_LIBS ON)
+# find_package(libaec CONFIG)
+#
+# This will define the following variables:
+#
+# libaec_FOUND - True if the system has the AEC library.
+# libaec_VERSION - The version of the AEC library which was found.
+# SZIP_FOUND - True if the system has the SZIP library.
+# SZIP_VERSION - The version of the SZIP library which was found.
+# SZIP_LIBRARIES - All the required libraries to make use of SZIP.
+# SZIP_INCLUDE_DIR - SZIP include directory.
+#
+# and the following imported targets:
+#
+# libaec::aec-shared - The shared AEC library target (if it was built).
+# libaec::sz-shared - The shared SZIP compatible version of the AEC library
+# (if it was built).
+# libaec::aec-static - The static AEC library target (if it was built).
+# libaec::sz-static - The static SZIP compatible version of the AEC library
+# (if it was built).
+# libaec::aec - The (shared or static) AEC library target (according
+# to the value of libaec_USE_STATIC_LIBS).
+# libaec::sz - The (shared or static) SZIP compatible version of the
+# AEC library (according to the value of
+# libaec_USE_STATIC_LIBS).
+
+include(${CMAKE_CURRENT_LIST_DIR}/libaec-targets.cmake)
+
+# Alias static or shared targets depending on libaec_USE_STATIC_LIBS
+if(libaec_USE_STATIC_LIBS)
+ if(TARGET libaec::aec-static AND TARGET libaec::sz-static)
+ add_library(libaec::aec ALIAS libaec::aec-static)
+ add_library(libaec::sz ALIAS libaec::sz-static)
+ else()
+ set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
+ "STATIC versions of libaec::aec and libaec::sz not found.")
+ set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
+ endif()
+else()
+ if(TARGET libaec::aec-shared AND TARGET libaec::sz-shared)
+ add_library(libaec::aec ALIAS libaec::aec-shared)
+ add_library(libaec::sz ALIAS libaec::sz-shared)
+ else()
+ set(${CMAKE_FIND_PACKAGE_NAME}_NOT_FOUND_MESSAGE
+ "SHARED versions of libaec::aec and libaec::sz not found.")
+ set(${CMAKE_FIND_PACKAGE_NAME}_FOUND FALSE)
+ endif()
+endif()
+
+if(TARGET libaec::sz)
+ get_target_property(SZIP_INCLUDE_DIR
+ libaec::sz INTERFACE_INCLUDE_DIRECTORIES)
+ if(SZIP_INCLUDE_DIR)
+ # This might be a list. The first item is the directory with the
+ # "main" header.
+ list(GET SZIP_INCLUDE_DIR 0 SZIP_INCLUDE_DIR)
+ endif()
+
+ # Loop over configurations for libaec::sz and set SZIP_LIBRARIES to
+ # the first configuration with an existing file for
+ # IMPORTED_IMPLIB_<CONFIG> or, if that does not exist, a file for
+ # IMPORTED_LOCATION_<CONFIG>.
+ get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
+ if(_isMultiConfig)
+ # For multi-configuration generators (e.g., Visual Studio), prefer
+ # those configurations.
+ string(TOUPPER "${CMAKE_CONFIGURATION_TYPES}" _build_types)
+ else()
+ # For single-configuration generators, prefer the current
+ # configuration.
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" _build_types)
+ endif()
+ get_target_property(_imported_configs libaec::sz IMPORTED_CONFIGURATIONS)
+ list(APPEND _build_types ${_imported_configs})
+ list(REMOVE_DUPLICATES _build_types)
+
+ foreach(_config ${_build_types})
+ get_target_property(_library_chk
+ libaec::sz "IMPORTED_IMPLIB_${_config}")
+ if(EXISTS "${_library_chk}")
+ set(SZIP_LIBRARIES "${_library_chk}")
+ break()
+ else()
+ get_target_property(_lib_check
+ libaec::sz "IMPORTED_LOCATION_${_config}")
+ if(EXISTS "${_lib_check}")
+ set(SZIP_LIBRARIES "${_lib_check}")
+ break()
+ endif()
+ endif()
+ endforeach()
+
+ set(SZIP_VERSION "2.0.1")
+ set(SZIP_FOUND "TRUE")
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/CMakeLists.txt
new/libaec-v1.1.4/src/CMakeLists.txt
--- old/libaec-v1.1.3/src/CMakeLists.txt 2024-03-21 09:51:01.000000000
+0100
+++ new/libaec-v1.1.4/src/CMakeLists.txt 2025-06-12 13:06:42.000000000
+0200
@@ -1,65 +1,114 @@
-# Main library aec
-add_library(aec OBJECT
+# Shared and static versions of aec and sz. Also build graec tool for
+# internal use.
+
+if(NOT BUILD_SHARED_LIBS AND NOT BUILD_STATIC_LIBS)
+ message(FATAL_ERROR
+ "At least one out of BUILD_SHARED_LIBS and BUILD_STATIC_LIBS must be
selected")
+endif()
+
+# Sources for libaec
+set(libaec_sources
encode.c
encode_accessors.c
decode.c
vector.c)
-target_include_directories(aec
- PUBLIC
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>"
- "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>"
- "$<INSTALL_INTERFACE:include>")
-
-# Create both static and shared aec library.
-add_library(aec_static STATIC "$<TARGET_OBJECTS:aec>")
-target_link_libraries(aec_static PUBLIC aec)
-set_target_properties(aec_static
- PROPERTIES
- OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,aec-static,aec>)
-
-add_library(aec_shared SHARED "$<TARGET_OBJECTS:aec>")
-target_link_libraries(aec_shared PUBLIC aec)
-set_target_properties(aec_shared
- PROPERTIES
- VERSION 0.1.3
- SOVERSION 0
- OUTPUT_NAME aec
- PUBLIC_HEADER ${CMAKE_CURRENT_BINARY_DIR}/../include/libaec.h)
-
-# Wrapper for compatibility with szip
-add_library(sz OBJECT sz_compat.c)
-target_link_libraries(sz PUBLIC aec)
-
-set(libaec_COMPILE_DEFINITIONS "LIBAEC_BUILD;LIBAEC_SHARED")
-
-# Create both static and shared szip library.
-add_library(sz_static STATIC "$<TARGET_OBJECTS:sz>" "$<TARGET_OBJECTS:aec>")
-set_target_properties(sz_static
- PROPERTIES
- OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,szip-static,sz>)
-target_link_libraries(sz_static PUBLIC sz)
-
-add_library(sz_shared SHARED "$<TARGET_OBJECTS:sz>" "$<TARGET_OBJECTS:aec>")
-target_link_libraries(sz_shared PUBLIC sz)
-set_target_properties(sz_shared
- PROPERTIES
- VERSION 2.0.1
- SOVERSION 2
- OUTPUT_NAME $<IF:$<BOOL:${MSVC}>,szip,sz>
- PUBLIC_HEADER ../include/szlib.h)
+# Properties for all shared and static libraries
+macro(aec_common_include aec_target aec_header)
+ target_include_directories(${aec_target}
+ PUBLIC
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>"
+ "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>"
+ "$<INSTALL_INTERFACE:include>")
+ set_target_properties(${aec_target}
+ PROPERTIES
+ PUBLIC_HEADER "${aec_header}")
+endmacro()
+
+# Public header files
+set(libaec_header "${CMAKE_CURRENT_BINARY_DIR}/../include/libaec.h")
+set(szlib_header "${CMAKE_CURRENT_SOURCE_DIR}/../include/szlib.h")
+
+# Optionally, create both static and shared aec library.
+if(BUILD_SHARED_LIBS)
+ # Shared libaec
+ add_library(aec-shared-objects OBJECT ${libaec_sources})
+ aec_common_include(aec-shared-objects "${libaec_header}")
+ target_compile_definitions(aec-shared-objects
+ PUBLIC "LIBAEC_SHARED"
+ PRIVATE "LIBAEC_BUILD")
+ add_library(aec-shared SHARED "$<TARGET_OBJECTS:aec-shared-objects>")
+ target_link_libraries(aec-shared PUBLIC aec-shared-objects)
+ set_target_properties(aec-shared
+ PROPERTIES
+ VERSION 0.1.4
+ SOVERSION 0
+ OUTPUT_NAME aec)
+
+ # Shared libsz
+ add_library(sz-shared-objects OBJECT sz_compat.c)
+ aec_common_include(sz-shared-objects "${szlib_header}")
+ target_compile_definitions(sz-shared-objects
+ PUBLIC "LIBAEC_SHARED"
+ PRIVATE "LIBAEC_BUILD")
+ add_library(sz-shared SHARED
+ "$<TARGET_OBJECTS:sz-shared-objects>"
+ "$<TARGET_OBJECTS:aec-shared-objects>")
+ target_link_libraries(sz-shared PUBLIC sz-shared-objects)
+ set_target_properties(sz-shared
+ PROPERTIES
+ VERSION 2.0.1
+ SOVERSION 2
+ OUTPUT_NAME sz)
+ if(MSVC OR ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC"))
+ set_target_properties(sz-shared PROPERTIES OUTPUT_NAME szip)
+ endif()
+ # Add include directory directly to sz-shared so config can get it.
+ target_include_directories(sz-shared
+ PUBLIC "$<INSTALL_INTERFACE:include>")
+
+ # Aliases for other tools. Prefer shared.
+ add_library(libaec::aec ALIAS aec-shared)
+ add_library(libaec::sz ALIAS sz-shared)
+endif()
+
+if(BUILD_STATIC_LIBS)
+ # Static libaec
+ add_library(aec-static-objects OBJECT ${libaec_sources})
+ aec_common_include(aec-static-objects "${libaec_header}")
+ add_library(aec-static STATIC "$<TARGET_OBJECTS:aec-static-objects>")
+ target_link_libraries(aec-static PUBLIC aec-static-objects)
+ set_target_properties(aec-static PROPERTIES OUTPUT_NAME aec)
+ if(MSVC OR ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC"))
+ set_target_properties(aec-static PROPERTIES OUTPUT_NAME aec-static)
+ endif()
+
+ # Static libsz
+ add_library(sz-static-objects OBJECT sz_compat.c)
+ aec_common_include(sz-static-objects "${szlib_header}")
+ add_library(sz-static STATIC
+ "$<TARGET_OBJECTS:sz-static-objects>"
+ "$<TARGET_OBJECTS:aec-static-objects>")
+ target_link_libraries(sz-static PUBLIC sz-static-objects)
+ set_target_properties(sz-static PROPERTIES OUTPUT_NAME sz)
+ if(MSVC OR ("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC"))
+ set_target_properties(sz-static PROPERTIES OUTPUT_NAME szip-static)
+ endif()
+ # Add include directory directly to sz-static so config can get it.
+ target_include_directories(sz-static
+ PUBLIC "$<INSTALL_INTERFACE:include>")
+
+ if(NOT BUILD_SHARED_LIBS)
+ # Aliases if shared not built.
+ add_library(libaec::aec ALIAS aec-static)
+ add_library(libaec::sz ALIAS sz-static)
+ endif()
+endif()
# Simple executable for testing and benchmarking.
add_executable(graec graec.c)
-target_link_libraries(graec aec)
-
-# Handle visibility of symbols. Compatible with gnulib's gl_VISIBILITY
-include(CheckCCompilerFlag)
-check_c_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY)
-set(libaec_COMPILE_DEFINITIONS
-
"${libaec_COMPILE_DEFINITIONS};HAVE_VISIBILITY=$<BOOL:${COMPILER_HAS_HIDDEN_VISIBILITY}>")
+target_link_libraries(graec libaec::aec)
-include(GNUInstallDirs)
if(UNIX)
# The shell scripts for benchmarking are supported on unix only
add_executable(utime EXCLUDE_FROM_ALL utime.c)
@@ -70,9 +119,3 @@
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/bdec.sh
DEPENDS graec utime)
endif()
-
-set_target_properties(aec sz
- PROPERTIES
- COMPILE_DEFINITIONS "${libaec_COMPILE_DEFINITIONS}")
-
-install(TARGETS aec_static aec_shared sz_static sz_shared)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/Makefile.am
new/libaec-v1.1.4/src/Makefile.am
--- old/libaec-v1.1.3/src/Makefile.am 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/src/Makefile.am 2025-06-12 13:06:42.000000000 +0200
@@ -4,12 +4,11 @@
lib_LTLIBRARIES = libaec.la libsz.la
libaec_la_SOURCES = encode.c encode_accessors.c decode.c vector.c\
encode.h encode_accessors.h decode.h vector.h
-libaec_la_CPPFLAGS = $(AM_CPPFLAGS) -DLIBAEC_BUILD
-libaec_la_LDFLAGS = -version-info 1:3:1 -no-undefined
-
+libaec_la_CPPFLAGS = $(AM_CPPFLAGS) -DLIBAEC_BUILD $(LIBAEC_SHARED)
+libaec_la_LDFLAGS = -version-info 1:4:1 -no-undefined
libsz_la_SOURCES = sz_compat.c
libsz_la_LIBADD = libaec.la
-libsz_la_CPPFLAGS = $(AM_CPPFLAGS) -DLIBAEC_BUILD
+libsz_la_CPPFLAGS = $(AM_CPPFLAGS) -DLIBAEC_BUILD $(LIBAEC_SHARED)
libsz_la_LDFLAGS = -version-info 2:1:0 -no-undefined
include_HEADERS = $(top_builddir)/include/libaec.h
$(top_srcdir)/include/szlib.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/decode.c
new/libaec-v1.1.4/src/decode.c
--- old/libaec-v1.1.3/src/decode.c 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/src/decode.c 2025-06-12 13:06:42.000000000 +0200
@@ -2,7 +2,7 @@
* @file decode.c
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/decode.h
new/libaec-v1.1.4/src/decode.h
--- old/libaec-v1.1.3/src/decode.h 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/src/decode.h 2025-06-12 13:06:42.000000000 +0200
@@ -2,7 +2,7 @@
* @file decode.h
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/encode.c
new/libaec-v1.1.4/src/encode.c
--- old/libaec-v1.1.3/src/encode.c 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/src/encode.c 2025-06-12 13:06:42.000000000 +0200
@@ -2,7 +2,7 @@
* @file encode.c
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -226,8 +226,8 @@
uint32_t D;
struct internal_state *state = strm->state;
- const uint32_t *restrict x = state->data_raw;
- uint32_t *restrict d = state->data_pp;
+ const uint32_t *x = state->data_raw;
+ uint32_t *d = state->data_pp;
uint32_t xmax = state->xmax;
uint32_t rsi = strm->rsi * strm->block_size - 1;
@@ -260,8 +260,8 @@
uint32_t D;
struct internal_state *state = strm->state;
- uint32_t *restrict x = state->data_raw;
- uint32_t *restrict d = state->data_pp;
+ uint32_t *x = state->data_raw;
+ uint32_t *d = state->data_pp;
uint32_t xmax = state->xmax;
uint32_t xmin = state->xmin;
uint32_t rsi = strm->rsi * strm->block_size - 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/encode.h
new/libaec-v1.1.4/src/encode.h
--- old/libaec-v1.1.3/src/encode.h 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/src/encode.h 2025-06-12 13:06:42.000000000 +0200
@@ -2,7 +2,7 @@
* @file encode.h
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/encode_accessors.c
new/libaec-v1.1.4/src/encode_accessors.c
--- old/libaec-v1.1.3/src/encode_accessors.c 2024-03-21 09:51:01.000000000
+0100
+++ new/libaec-v1.1.4/src/encode_accessors.c 2025-06-12 13:06:42.000000000
+0200
@@ -2,7 +2,7 @@
* @file encode_accessors.c
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -116,9 +116,9 @@
void aec_get_rsi_8(struct aec_stream *strm)
{
- uint32_t *restrict out = strm->state->data_raw;
- unsigned const char *restrict in = strm->next_in;
- int rsi = strm->rsi * strm->block_size;
+ uint32_t *out = strm->state->data_raw;
+ unsigned const char *in = strm->next_in;
+ int rsi = strm->rsi *strm->block_size;
for (int i = 0; i < rsi; i++)
out[i] = (uint32_t)in[i];
@@ -129,9 +129,9 @@
void aec_get_rsi_lsb_16(struct aec_stream *strm)
{
- uint32_t *restrict out = strm->state->data_raw;
- const unsigned char *restrict in = strm->next_in;
- int rsi = strm->rsi * strm->block_size;
+ uint32_t *out = strm->state->data_raw;
+ const unsigned char *in = strm->next_in;
+ int rsi = strm->rsi *strm->block_size;
for (int i = 0; i < rsi; i++)
out[i] = (uint32_t)in[2 * i] | ((uint32_t)in[2 * i + 1] << 8);
@@ -142,9 +142,9 @@
void aec_get_rsi_msb_16(struct aec_stream *strm)
{
- uint32_t *restrict out = strm->state->data_raw;
- const unsigned char *restrict in = strm->next_in;
- int rsi = strm->rsi * strm->block_size;
+ uint32_t *out = strm->state->data_raw;
+ const unsigned char *in = strm->next_in;
+ int rsi = strm->rsi *strm->block_size;
for (int i = 0; i < rsi; i++)
out[i] = ((uint32_t)in[2 * i] << 8) | (uint32_t)in[2 * i + 1];
@@ -155,9 +155,9 @@
void aec_get_rsi_lsb_24(struct aec_stream *strm)
{
- uint32_t *restrict out = strm->state->data_raw;
- const unsigned char *restrict in = strm->next_in;
- int rsi = strm->rsi * strm->block_size;
+ uint32_t *out = strm->state->data_raw;
+ const unsigned char *in = strm->next_in;
+ int rsi = strm->rsi *strm->block_size;
for (int i = 0; i < rsi; i++)
out[i] = (uint32_t)in[3 * i]
@@ -170,9 +170,9 @@
void aec_get_rsi_msb_24(struct aec_stream *strm)
{
- uint32_t *restrict out = strm->state->data_raw;
- const unsigned char *restrict in = strm->next_in;
- int rsi = strm->rsi * strm->block_size;
+ uint32_t *out = strm->state->data_raw;
+ const unsigned char *in = strm->next_in;
+ int rsi = strm->rsi *strm->block_size;
for (int i = 0; i < rsi; i++)
out[i] = ((uint32_t)in[3 * i] << 16)
@@ -186,7 +186,7 @@
#define AEC_GET_RSI_NATIVE_32(BO) \
void aec_get_rsi_##BO##_32(struct aec_stream *strm) \
{ \
- int rsi = strm->rsi * strm->block_size; \
+ int rsi = strm->rsi *strm->block_size; \
memcpy(strm->state->data_raw, \
strm->next_in, 4 * rsi); \
strm->next_in += 4 * rsi; \
@@ -196,9 +196,9 @@
#ifdef WORDS_BIGENDIAN
void aec_get_rsi_lsb_32(struct aec_stream *strm)
{
- uint32_t *restrict out = strm->state->data_raw;
- const unsigned char *restrict in = strm->next_in;
- int rsi = strm->rsi * strm->block_size;
+ uint32_t *out = strm->state->data_raw;
+ const unsigned char *in = strm->next_in;
+ int rsi = strm->rsi *strm->block_size;
for (int i = 0; i < rsi; i++)
out[i] = (uint32_t)in[4 * i]
@@ -215,9 +215,9 @@
#else /* !WORDS_BIGENDIAN */
void aec_get_rsi_msb_32(struct aec_stream *strm)
{
- uint32_t *restrict out = strm->state->data_raw;
- const unsigned char *restrict in = strm->next_in;
- int rsi = strm->rsi * strm->block_size;
+ uint32_t *out = strm->state->data_raw;
+ const unsigned char *in = strm->next_in;
+ int rsi = strm->rsi *strm->block_size;
strm->next_in += 4 * rsi;
strm->avail_in -= 4 * rsi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/encode_accessors.h
new/libaec-v1.1.4/src/encode_accessors.h
--- old/libaec-v1.1.3/src/encode_accessors.h 2024-03-21 09:51:01.000000000
+0100
+++ new/libaec-v1.1.4/src/encode_accessors.h 2025-06-12 13:06:42.000000000
+0200
@@ -2,7 +2,7 @@
* @file encode_accessors.h
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/graec.c
new/libaec-v1.1.4/src/graec.c
--- old/libaec-v1.1.3/src/graec.c 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/src/graec.c 2025-06-12 13:06:42.000000000 +0200
@@ -2,7 +2,7 @@
* @file aec.c
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/sz_compat.c
new/libaec-v1.1.4/src/sz_compat.c
--- old/libaec-v1.1.3/src/sz_compat.c 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/src/sz_compat.c 2025-06-12 13:06:42.000000000 +0200
@@ -2,7 +2,7 @@
* @file sz_compat.c
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/src/utime.c
new/libaec-v1.1.4/src/utime.c
--- old/libaec-v1.1.3/src/utime.c 2024-03-21 09:51:01.000000000 +0100
+++ new/libaec-v1.1.4/src/utime.c 2025-06-12 13:06:42.000000000 +0200
@@ -4,7 +4,7 @@
* @author Thomas Jahns, Deutsches Klimarechenzentrum
*
* @section LICENSE
- * Copyright 2024 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
+ * Copyright 2025 Mathis Rosenhauer, Moritz Hanke, Joerg Behrens, Luis
Kornblueh
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libaec-v1.1.3/tests/CMakeLists.txt
new/libaec-v1.1.4/tests/CMakeLists.txt
--- old/libaec-v1.1.3/tests/CMakeLists.txt 2024-03-21 09:51:01.000000000
+0100
+++ new/libaec-v1.1.4/tests/CMakeLists.txt 2025-06-12 13:06:42.000000000
+0200
@@ -1,27 +1,31 @@
add_library(check_aec STATIC check_aec.c)
-target_link_libraries(check_aec PUBLIC aec)
+target_link_libraries(check_aec PUBLIC libaec::aec)
add_executable(check_code_options check_code_options.c)
-target_link_libraries(check_code_options PUBLIC check_aec aec)
+target_link_libraries(check_code_options PUBLIC check_aec libaec::aec)
add_test(NAME check_code_options COMMAND check_code_options)
-
add_executable(check_buffer_sizes check_buffer_sizes.c)
-target_link_libraries(check_buffer_sizes PUBLIC check_aec aec)
+target_link_libraries(check_buffer_sizes PUBLIC check_aec libaec::aec)
add_test(NAME check_buffer_sizes COMMAND check_buffer_sizes)
add_executable(check_seeking check_seeking.c)
-target_link_libraries(check_seeking PUBLIC check_aec aec)
+target_link_libraries(check_seeking PUBLIC check_aec libaec::aec)
add_test(NAME check_seeking COMMAND check_seeking)
add_executable(check_long_fs check_long_fs.c)
-target_link_libraries(check_long_fs PUBLIC check_aec aec)
+target_link_libraries(check_long_fs PUBLIC check_aec libaec::aec)
add_test(NAME check_long_fs COMMAND check_long_fs)
add_executable(check_szcomp check_szcomp.c)
-target_link_libraries(check_szcomp PUBLIC check_aec sz)
+target_link_libraries(check_szcomp PUBLIC check_aec libaec::sz)
add_test(NAME check_szcomp
COMMAND check_szcomp
${PROJECT_SOURCE_DIR}/data/121B2TestData/ExtendedParameters/sar32bit.dat)
+# On Windows, copy aec.dll and szip.dll to tests directory
+add_custom_command(TARGET check_szcomp POST_BUILD
+ COMMAND ${CMAKE_COMMAND} -E copy -t $<TARGET_FILE_DIR:check_szcomp>
$<TARGET_RUNTIME_DLLS:check_szcomp>
+ COMMAND_EXPAND_LISTS
+)
add_executable(check_rsi_block_access check_rsi_block_access.c)
-target_link_libraries(check_rsi_block_access PUBLIC check_aec aec)
+target_link_libraries(check_rsi_block_access PUBLIC check_aec libaec::aec)
add_test(NAME check_rsi_block_access COMMAND check_rsi_block_access)
if(UNIX)
