From 4854937a323a74df5b6a0a471827a50db48a7f67 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 8 Nov 2023 19:14:07 +0100 Subject: [PATCH] faad2: Update to 2.11.0 * Port to cmake * remove yasm dep, seems unused * manually copy the man page, since that seems to be missing --- mingw-w64-faad2/PKGBUILD | 72 ++++++++++++++++++++++++---------------- 1 file changed, 43 insertions(+), 29 deletions(-) diff --git a/mingw-w64-faad2/PKGBUILD b/mingw-w64-faad2/PKGBUILD index 6f06b68396..bb1d1643c3 100644 --- a/mingw-w64-faad2/PKGBUILD +++ b/mingw-w64-faad2/PKGBUILD @@ -3,48 +3,62 @@ _realname=faad2 pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=2.10.1 +pkgver=2.11.0 pkgrel=1 pkgdesc="ISO AAC audio decoder (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') url="https://github.com/knik0/faad2" -license=('GPL') -options=('staticlibs' 'strip') +license=('spdx:GPL-2.0-or-later') depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs") -makedepends=($( [[ "${CARCH}" == "aarch64" ]] || echo "${MINGW_PACKAGE_PREFIX}-yasm" ) - "${MINGW_PACKAGE_PREFIX}-cc" - "${MINGW_PACKAGE_PREFIX}-autotools") +makedepends=("${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja") source=(${_realname}-${pkgver}.tar.gz::"https://github.com/knik0/${_realname}/archive/${pkgver}.tar.gz") -sha256sums=('4c16c71295ca0cbf7c3dfe98eb11d8fa8d0ac3042e41604cfd6cc11a408cf264') - -prepare() { - cd "${srcdir}/${_realname}-${pkgver}" - - WANT_AUTOMAKE=latest autoreconf --force --install -} +sha256sums=('720c1dc404439e0a9117aa144dc7ead56f1658adf4badbb39f959d6ad8eed489') build() { - [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM} - cp -r ${_realname}-${pkgver} "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM} + cd "${srcdir}/${_realname}-${pkgver}" - ./configure \ - --prefix=${MINGW_PREFIX} \ - --build=${MINGW_CHOST} \ - --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} \ - --enable-static \ - --enable-shared + declare -a extra_config + if check_option "debug" "n"; then + extra_config+=("-DCMAKE_BUILD_TYPE=Release") + else + extra_config+=("-DCMAKE_BUILD_TYPE=Debug") + fi - make -} + mkdir -p "${srcdir}/build-${MSYSTEM}-static" && cd "${srcdir}/build-${MSYSTEM}-static" -check() { - cd "${srcdir}/build-${MSYSTEM}" - make check + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + "${_extra_config[@]}" \ + -DBUILD_SHARED_LIBS=OFF \ + ../${_realname}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build . + + mkdir -p "${srcdir}/build-${MSYSTEM}-shared" && cd "${srcdir}/build-${MSYSTEM}-shared" + + MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ + ${MINGW_PREFIX}/bin/cmake.exe \ + -GNinja \ + -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ + "${_extra_config[@]}" \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \ + ../${_realname}-${pkgver} + + ${MINGW_PREFIX}/bin/cmake.exe --build . } package() { - cd "${srcdir}/build-${MSYSTEM}" - make DESTDIR="${pkgdir}" install + cd "${srcdir}/build-${MSYSTEM}-static" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install . + + cd "${srcdir}/build-${MSYSTEM}-shared" + DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake.exe --install . + + install -Dm644 "${srcdir}/${_realname}-${pkgver}/frontend/faad.man" "${pkgdir}${MINGW_PREFIX}/share/man/man1/faad.1" }