diff --git a/mingw-w64-libaec/0001-enable-visibility.patch b/mingw-w64-libaec/0001-enable-visibility.patch new file mode 100644 index 0000000000..d55327aefb --- /dev/null +++ b/mingw-w64-libaec/0001-enable-visibility.patch @@ -0,0 +1,11 @@ +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -52,7 +52,7 @@ + target_link_libraries(graec aec) + + include(GNUInstallDirs) +-if(UNIX) ++if(UNIX OR MINGW) + # Handle visibility of symbols. Compatible with gnulib's gl_VISIBILITY + include(CheckCCompilerFlag) + check_c_compiler_flag(-fvisibility=hidden COMPILER_HAS_HIDDEN_VISIBILITY) diff --git a/mingw-w64-libaec/PKGBUILD b/mingw-w64-libaec/PKGBUILD index c317e131e4..2de66e42d7 100644 --- a/mingw-w64-libaec/PKGBUILD +++ b/mingw-w64-libaec/PKGBUILD @@ -4,31 +4,32 @@ _realname=libaec pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Adaptive Entropy Coding library (mingw-w64)" arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') +mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64') url="https://gitlab.dkrz.de/k202009/libaec" license=('spdx:BSD-2-Clause') -makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-ninja" - "${MINGW_PACKAGE_PREFIX}-cc") +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja") provides=("${MINGW_PACKAGE_PREFIX}-szip") replaces=("${MINGW_PACKAGE_PREFIX}-szip") -options=('staticlibs' 'strip') _md5=3847727cd2e8c941f0d68f6822a73ed7 source=("${url}/uploads/${_md5}/${_realname}-${pkgver}.tar.gz" + "0001-enable-visibility.patch" "0005-cmake-fix-cmake-install.patch") sha256sums=('a5d03a242468014b92b1b196de397f1e9a7927782db1a0423ea01db78421e373' + '517758b2375a7144d9d4f1ae45d732eac96b66c036002af1e08ba9589ddf3060' '9acc599a0f809b1f196c2ff0db6990901e812e659a594041e7540c4980b3fc91') prepare() { cd "${srcdir}/${_realname}-${pkgver}" + patch -p1 -i ${srcdir}/0001-enable-visibility.patch patch -p1 -i ${srcdir}/0005-cmake-fix-cmake-install.patch } build() { - [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM} mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM} declare -a extra_config @@ -43,6 +44,7 @@ build() { -GNinja \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ "${extra_config[@]}" \ + -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \ -DBUILD_TESTING=OFF \ ../${_realname}-${pkgver} @@ -52,7 +54,7 @@ build() { package() { cd ${srcdir}/build-${MSYSTEM} - DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --build . --target install + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install . install -Dm644 ${srcdir}/${_realname}-${pkgver}/LICENSE.txt ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE }