libaec: update to 1.1.4
Remove patches for issues that have been addressed upstream.
This commit is contained in:
Markus Mützel
parent
abd2c191e2
commit
2bbdbdd4ec
@ -1,128 +0,0 @@
|
||||
Export separate targets for shared and for static libraries.
|
||||
|
||||
diff -urN libaec-v1.1.3/cmake/libaec-config.cmake.in.orig libaec-v1.1.3/cmake/libaec-config.cmake.in
|
||||
--- libaec-v1.1.3/cmake/libaec-config.cmake.in.orig 2025-05-06 16:15:50.757950300 +0200
|
||||
+++ libaec-v1.1.3/cmake/libaec-config.cmake.in 2025-05-06 16:27:44.518380600 +0200
|
||||
@@ -26,17 +26,21 @@
|
||||
|
||||
find_path(libaec_INCLUDE_DIR NAMES libaec.h DOC "AEC include directory")
|
||||
find_path(SZIP_INCLUDE_DIR NAMES szlib.h DOC "SZIP include directory")
|
||||
+find_library(libaec-shared_LIBRARY NAMES aec DOC "AEC library")
|
||||
+find_library(SZIP-shared_LIBRARY NAMES sz szip DOC "SZIP compatible version of the AEC library")
|
||||
+if (MSVC)
|
||||
+ find_library(libaec-static_LIBRARY NAMES aec-static.lib DOC "AEC library")
|
||||
+ find_library(SZIP-static_LIBRARY NAMES szip-static.lib DOC "SZIP compatible version of the AEC library")
|
||||
+else ()
|
||||
+ find_library(libaec-static_LIBRARY NAMES libaec.a DOC "AEC library")
|
||||
+ find_library(SZIP-static_LIBRARY NAMES libsz.a DOC "SZIP compatible version of the AEC library")
|
||||
+endif ()
|
||||
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 ()
|
||||
+ set(libaec_LIBRARY ${libaec-static_LIBRARY})
|
||||
+ set(SZIP_LIBRARY ${SZIP-static_LIBRARY})
|
||||
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")
|
||||
+ set(libaec_LIBRARY ${libaec-shared_LIBRARY})
|
||||
+ set(SZIP_LIBRARY ${SZIP-shared_LIBRARY})
|
||||
endif ()
|
||||
|
||||
# Check version here
|
||||
@@ -55,38 +59,58 @@
|
||||
)
|
||||
|
||||
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 (libaec-static_LIBRARY)
|
||||
+ add_library(libaec::aec-static STATIC IMPORTED)
|
||||
+ set_target_properties(libaec::aec-static PROPERTIES
|
||||
+ IMPORTED_LOCATION "${libaec-static_LIBRARY}"
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES "${libaec_INCLUDE_DIR}"
|
||||
+ )
|
||||
+ endif ()
|
||||
+ if (libaec-static_LIBRARY)
|
||||
+ add_library(libaec::aec-shared STATIC IMPORTED)
|
||||
+ target_compile_definitions(libaec::aec-shared INTERFACE LIBAEC_SHARED)
|
||||
if (WIN32)
|
||||
- set_target_properties(libaec::aec PROPERTIES
|
||||
+ set_target_properties(libaec::aec-shared PROPERTIES
|
||||
IMPORTED_IMPLIB "${libaec_LIBRARY}"
|
||||
)
|
||||
endif ()
|
||||
+ set_target_properties(libaec::aec-shared PROPERTIES
|
||||
+ IMPORTED_LOCATION "${libaec-shared_LIBRARY}"
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES "${libaec_INCLUDE_DIR}"
|
||||
+ )
|
||||
+ endif ()
|
||||
+ if (libaec_USE_STATIC_LIBS)
|
||||
+ add_library(libaec::aec ALIAS libaec::aec-static)
|
||||
+ else ()
|
||||
+ add_library(libaec::aec ALIAS libaec::aec-shared)
|
||||
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 (SZIP-static_LIBRARY)
|
||||
+ add_library(libaec::sz-static STATIC IMPORTED)
|
||||
+ set_target_properties(libaec::sz-static PROPERTIES
|
||||
+ IMPORTED_LOCATION "${SZIP-static_LIBRARY}"
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES "${SZIP_INCLUDE_DIR}"
|
||||
+ )
|
||||
+ endif ()
|
||||
+ if (libaec-static_LIBRARY)
|
||||
+ add_library(libaec::sz-shared SHARED IMPORTED)
|
||||
+ target_compile_definitions(libaec::sz-shared INTERFACE LIBAEC_SHARED)
|
||||
if (WIN32)
|
||||
- set_target_properties(libaec::sz PROPERTIES
|
||||
- IMPORTED_IMPLIB "${SZIP_LIBRARY}"
|
||||
+ set_target_properties(libaec::sz-shared PROPERTIES
|
||||
+ IMPORTED_IMPLIB "${SZIP-shared_LIBRARY}"
|
||||
)
|
||||
endif ()
|
||||
+ set_target_properties(libaec::sz-shared PROPERTIES
|
||||
+ IMPORTED_LOCATION "${SZIP-shared_LIBRARY}"
|
||||
+ INTERFACE_INCLUDE_DIRECTORIES "${SZIP_INCLUDE_DIR}"
|
||||
+ )
|
||||
+ endif ()
|
||||
+ if (libaec_USE_STATIC_LIBS)
|
||||
+ add_library(libaec::sz ALIAS libaec::sz-static)
|
||||
+ else ()
|
||||
+ add_library(libaec::sz ALIAS libaec::sz-shared)
|
||||
endif ()
|
||||
- set_target_properties(libaec::sz PROPERTIES
|
||||
- IMPORTED_LOCATION "${SZIP_LIBRARY}"
|
||||
- INTERFACE_INCLUDE_DIRECTORIES "${SZIP_INCLUDE_DIR}"
|
||||
- )
|
||||
|
||||
# Set SZIP variables.
|
||||
set(SZIP_FOUND TRUE)
|
||||
@@ -95,7 +119,11 @@
|
||||
|
||||
mark_as_advanced(
|
||||
libaec_LIBRARY
|
||||
+ libaec-shared_LIBRARY
|
||||
+ libaec-static_LIBRARY
|
||||
libaec_INCLUDE_DIR
|
||||
SZIP_LIBRARY
|
||||
+ SZIP-shared_LIBRARY
|
||||
+ SZIP-static_LIBRARY
|
||||
SZIP_INCLUDE_DIR
|
||||
)
|
||||
@ -1,14 +0,0 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -67,9 +67,9 @@
|
||||
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)
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libaec)
|
||||
install(FILES ${libaec_CONFIG_VERSION_OUT}
|
||||
- DESTINATION cmake)
|
||||
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libaec)
|
||||
|
||||
# Cpack configuration mainly for Windows installer
|
||||
set(CPACK_PACKAGE_NAME "libaec")
|
||||
@ -3,8 +3,8 @@
|
||||
_realname=libaec
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=1.1.3
|
||||
pkgrel=4
|
||||
pkgver=1.1.4
|
||||
pkgrel=1
|
||||
pkgdesc="Adaptive Entropy Coding library (mingw-w64)"
|
||||
arch=('any')
|
||||
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
|
||||
@ -15,33 +15,8 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
|
||||
"${MINGW_PACKAGE_PREFIX}-ninja")
|
||||
provides=("${MINGW_PACKAGE_PREFIX}-szip")
|
||||
replaces=("${MINGW_PACKAGE_PREFIX}-szip")
|
||||
source=("https://gitlab.dkrz.de/k202009/libaec/-/archive/v${pkgver}/libaec-v${pkgver}.tar.bz2"
|
||||
https://patch-diff.githubusercontent.com/raw/MathisRosenhauer/libaec/pull/34.patch
|
||||
"0001-export-targets-for-shared-and-static.patch"
|
||||
"0005-cmake-fix-cmake-install.patch")
|
||||
sha256sums=('46216f9d2f2d3ffea4c61c9198fe0236f7f316d702f49065c811447186d18222'
|
||||
'6f21d732c139592c18d867bbed43a27150ae513b425fa70f6c9eb7f054561dd3'
|
||||
'0e28a08f0b8394fed422c984fb6e107b9c3ffed743883907d1d64921633c4d88'
|
||||
'3076466b341dc7d84df965c68accbce45833c4bc4671b0e6c98645a44ae13f06')
|
||||
|
||||
# Helper macros to help make tasks easier #
|
||||
apply_patch_with_msg() {
|
||||
for _patch in "$@"
|
||||
do
|
||||
msg2 "Applying ${_patch}"
|
||||
patch -Nbp1 -i "${srcdir}/${_patch}"
|
||||
done
|
||||
}
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${_realname}-v${pkgver}"
|
||||
|
||||
# https://github.com/MathisRosenhauer/libaec/pull/34
|
||||
apply_patch_with_msg \
|
||||
34.patch \
|
||||
0001-export-targets-for-shared-and-static.patch \
|
||||
0005-cmake-fix-cmake-install.patch
|
||||
}
|
||||
source=("https://gitlab.dkrz.de/k202009/libaec/-/archive/v${pkgver}/libaec-v${pkgver}.tar.bz2")
|
||||
sha256sums=('cf869c166656a83857adf62a092311a0069855c6ced3446e3f090a6d52279f65')
|
||||
|
||||
build() {
|
||||
mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user