diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 31 |
2 files changed, 14 insertions, 23 deletions
@@ -1,6 +1,6 @@ pkgbase = mingw-w64-dlib pkgdesc = A general purpose cross-platform C++ library designed using contract programming and modern C++ techniques (mingw-w64) - pkgver = 19.24.2 + pkgver = 19.24.3 pkgrel = 1 url = http://dlib.net arch = any @@ -18,7 +18,7 @@ pkgbase = mingw-w64-dlib options = !strip options = staticlibs options = !buildflags - source = https://codeload.github.com/davisking/dlib/tar.gz/refs/tags/v19.24.2 - sha256sums = 0f5c7e3de6316a513635052c5f0a16a84e1cef26a7d233bf00c21348462b6d6f + source = https://codeload.github.com/davisking/dlib/tar.gz/refs/tags/v19.24.3 + sha256sums = 4b1f28e76020775334e67cc348ceb26a4f5161df6659848be0d3b300406400a3 pkgname = mingw-w64-dlib @@ -4,7 +4,7 @@ _pkgname=dlib _architectures="i686-w64-mingw32 x86_64-w64-mingw32" pkgname=mingw-w64-dlib -pkgver=19.24.2 +pkgver=19.24.3 pkgrel=1 pkgdesc="A general purpose cross-platform C++ library designed using contract programming and modern C++ techniques (mingw-w64)" arch=('any') @@ -22,42 +22,33 @@ optdepends=('mingw-w64-ffmpeg: for FFmpeg support' makedepends=('mingw-w64-cmake') options=('!strip' 'staticlibs' '!buildflags') source=("https://codeload.github.com/davisking/dlib/tar.gz/refs/tags/v${pkgver}") -sha256sums=('0f5c7e3de6316a513635052c5f0a16a84e1cef26a7d233bf00c21348462b6d6f') +sha256sums=('4b1f28e76020775334e67cc348ceb26a4f5161df6659848be0d3b300406400a3') build() { - cd ${srcdir} + cd "${srcdir}/${_pkgname}-${pkgver}" for _arch in ${_architectures}; do # shared - mkdir -p "${_pkgname}-build-${_arch}-shared" && pushd "${_pkgname}-build-${_arch}-shared" ${_arch}-cmake \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DUSE_AVX_INSTRUCTIONS=OFF \ -DDLIB_USE_CUDA=OFF \ - "../${_pkgname}-${pkgver}" - make - popd + -B build-${_arch}-shared -S . + make -C build-${_arch}-shared # static - mkdir -p "${_pkgname}-build-${_arch}-static" && pushd "${_pkgname}-build-${_arch}-static" ${_arch}-cmake \ -DBUILD_SHARED_LIBS:BOOL=OFF \ -DUSE_AVX_INSTRUCTIONS=OFF \ -DDLIB_USE_CUDA=OFF \ - "../${_pkgname}-${pkgver}" - make - popd + -B build-${_arch}-static -S . + make -C build-${_arch}-static done } package() { - cd ${srcdir} + cd "${srcdir}/${_pkgname}-${pkgver}" for _arch in ${_architectures}; do - pushd "${_pkgname}-build-${_arch}-shared" - make DESTDIR=${pkgdir} install - popd - mv "${pkgdir}/usr/${_arch}/lib/cmake/dlib/"{dlib,dlib-shared}.cmake - pushd "${_pkgname}-build-${_arch}-static" - make DESTDIR=${pkgdir} install - popd + make DESTDIR=${pkgdir} install -C build-${_arch}-static + make DESTDIR=${pkgdir} install -C build-${_arch}-shared mv "${pkgdir}/usr/${_arch}/lib/cmake/dlib/"{dlib,dlib-static}.cmake pushd "${pkgdir}/usr/${_arch}/lib/cmake/dlib/" ln -s dlib-static.cmake dlib.cmake @@ -65,7 +56,7 @@ package() { ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a done - install -Dm644 "${_pkgname}-${pkgver}/dlib/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 dlib/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } # vim:set ts=2 sw=2 et: |