diff --git a/mingw-w64-taglib/PKGBUILD b/mingw-w64-taglib/PKGBUILD index f5a17f128b..c04098f572 100644 --- a/mingw-w64-taglib/PKGBUILD +++ b/mingw-w64-taglib/PKGBUILD @@ -3,21 +3,23 @@ _realname=taglib pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.12 +pkgver=1.13 pkgrel=1 pkgdesc="A Library for reading and editing the meta-data of several popular audio formats (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') -url="https://taglib.github.com" -license=("GPL") +url="https://taglib.org/" +license=('spdx:LGPL-2.1-or-later' 'spdx:MPL-1.1') makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-cmake" - "${MINGW_PACKAGE_PREFIX}-cppunit") -depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-zlib") + "${MINGW_PACKAGE_PREFIX}-cppunit" + "${MINGW_PACKAGE_PREFIX}-ninja") +depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" + "${MINGW_PACKAGE_PREFIX}-zlib") options=('strip' 'staticlibs') source=(https://taglib.github.io/releases/${_realname}-${pkgver}.tar.gz fix-finding-cppunit.patch) -sha256sums=('7fccd07669a523b07a15bd24c8da1bbb92206cb19e9366c3692af3d79253b703' +sha256sums=('58f08b4db3dc31ed152c04896ee9172d22052bc7ef12888028c01d8b1d60ade0' '460e2dd83e6233145e4980a4c63a400e9e8297980e3cfae910dadefa2475e7d0') prepare() { @@ -27,49 +29,43 @@ prepare() { build() { msg "Build shared version" - mkdir -p "${srcdir}/build-shared-${MINGW_CHOST}" - cd "${srcdir}/build-shared-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-shared-${MSYSTEM}" + cd "${srcdir}/build-shared-${MSYSTEM}" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ - -G"MSYS Makefiles" \ + -G"Ninja" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=ON \ -DBUILD_BINDINGS=ON \ - -DWITH_ASF=ON \ - -DWITH_MP4=ON \ ../${_realname}-${pkgver} - make + ${MINGW_PREFIX}/bin/cmake --build . msg "Build static version" - mkdir -p "${srcdir}/build-static-${MINGW_CHOST}" - cd "${srcdir}/build-static-${MINGW_CHOST}" + mkdir -p "${srcdir}/build-static-${MSYSTEM}" + cd "${srcdir}/build-static-${MSYSTEM}" MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ - -G"MSYS Makefiles" \ - -DBUILD_TESTS=ON \ + -G"Ninja" \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DBUILD_SHARED_LIBS=OFF \ -DBUILD_BINDINGS=ON \ - -DWITH_ASF=ON \ - -DWITH_MP4=ON \ ../${_realname}-${pkgver} - make + ${MINGW_PREFIX}/bin/cmake --build . } check() { - cd "${srcdir}/build-static-${MINGW_CHOST}" - - make check + cd "${srcdir}/build-static-${MSYSTEM}" + ${MINGW_PREFIX}/bin/ctest . || warning "Tests failed" } package() { - cd "${srcdir}/build-static-${MINGW_CHOST}" - make DESTDIR=${pkgdir} install + cd "${srcdir}/build-static-${MSYSTEM}" + DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install . - cd "${srcdir}/build-shared-${MINGW_CHOST}" - make DESTDIR=${pkgdir} install + cd "${srcdir}/build-shared-${MSYSTEM}" + DESTDIR=${pkgdir} ${MINGW_PREFIX}/bin/cmake --install . }