Date: Monday, January 6, 2020 @ 15:42:06 Author: dvzrv Revision: 549768
upgpkg: marsyas 0.5.0-7: Updating maintainer info. Adding all direct library dependencies. Adding qt5-base to optdepends (for several executables). Adding package to pd-externals and vamp-plugins groups. Removing python2 (only) module, built using swig. Simplifying cmake setup. Modified: marsyas/trunk/PKGBUILD ----------+ PKGBUILD | 67 ++++++++++++++++++++++++++++--------------------------------- 1 file changed, 31 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-01-06 15:32:40 UTC (rev 549767) +++ PKGBUILD 2020-01-06 15:42:06 UTC (rev 549768) @@ -1,21 +1,24 @@ -# Maintainer: David Runge <d...@sleepmap.de> +# Maintainer: David Runge <dv...@archlinux.org> # Contributor: Felix Yan <felixonm...@archlinux.org> # Contributor: MeMi69 <metalmili...@gmx.net> pkgname=marsyas pkgver=0.5.0 -pkgrel=6 +pkgrel=7 pkgdesc="Music Analysis, Retrieval and Synthesis for Audio Signals" arch=('x86_64') url="http://marsyas.info" license=('GPL2') -groups=('pro-audio') -depends=('jack' 'lame' 'libmad') -optdepends=('pd: use ibt_pd external' - 'python2: required for marmonitors.py' - 'qt5-declarative: required for marsyas-inspector' - 'vamp-plugin-sdk: use vamp plugin') -makedepends=('cmake' 'doxygen' 'extra-cmake-modules' 'pd' 'python2' 'qt5-declarative' 'swig' 'vamp-plugin-sdk') +groups=('pd-externals' 'pro-audio' 'vamp-plugins') +depends=('alsa-lib' 'gcc-libs' 'glibc' 'lame' 'libjack.so' 'libmad' +'libvorbisfile.so') +makedepends=('cmake' 'doxygen' 'extra-cmake-modules' 'pd' 'qt5-base' +'qt5-declarative' 'libvamp-sdk.so') +optdepends=('pd: for ibt_pd external' + 'qt5-base: for MarGrid2, MarLpc, MarPhasevocoder, MarPlayer and marsyas-inspector' + 'qt5-declarative: for marsyas-inspector' + 'libvamp-sdk.so: for vamp plugin') +provides=('libmarsyas.so') source=("$pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/version-$pkgver.tar.gz") sha512sums=('0ff8943028753c70d409e78a8c5487da2006b7599c8909c0e0050433a6e7051f32b3c5f31fe833085a479d0486e4c96c5f4a4bd63ac00ee68b89dee941aebc9a') @@ -22,13 +25,6 @@ prepare() { mv -v "${pkgname}-version-${pkgver}" "${pkgname}-${pkgver}" cd "${pkgname}-${pkgver}" - mkdir -p build - # fixing python2 scripts shebang - sed -e 's/ python/ python2/' \ - -i src/swig/python/{modules,scripts}/*.py src/${pkgname}_python/*.py - # fixing broken call to env in python scripts - sed -e 's/evn/env/' \ - -i src/swig/python/{modules,scripts}/*.py src/${pkgname}_python/*.py # fixing build of vamp plugins sed -e 's|"MarSystemTemplateBasic.h"|<marsyas/marsystems/MarSystemTemplateBasic.h>|' \ -e 's|"MarSystemTemplateAdvanced.h"|<marsyas/marsystems/MarSystemTemplateAdvanced.h>|' \ @@ -41,34 +37,33 @@ } build() { - cd "${pkgname}-${pkgver}/build" - _python_lib=$( echo /usr/lib/python2* ) - _python_include=$( echo /usr/include/python2* ) + cd "${pkgname}-${pkgver}" + # disabling build of python module, as it's python2 only: + # https://github.com/marsyas/marsyas/issues/71 cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=1 \ - -DWITH_MAD=1 \ - -DWITH_LAME=1 \ - -DWITH_PD=1 \ - -DPYTHON_LIBRARY=${_python_lib} \ - -DPYTHON_INCLUDE_PATH=${_python_include} \ - -DWITH_SWIG=1 \ - -DWITH_VAMP=1 \ - -DWITH_VORBIS=1 \ - .. - make + -DCMAKE_SKIP_RPATH=ON \ + -DWITH_MAD=ON \ + -DWITH_LAME=ON \ + -DWITH_PD=ON \ + -DWITH_SWIG=OFF \ + -DWITH_VAMP=ON \ + -DWITH_VORBIS=ON \ + -B build \ + -S . + make VERBOSE=1 -C build } package() { - cd "${pkgname}-${pkgver}/build" - make DESTDIR="$pkgdir" install + cd "${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install -C build # pd external - install -vDm 755 lib/ibt_pd.pd_linux \ - -vDm 644 ../src/${pkgname}_pd/ibt_pd-help.pd \ + install -vDm 755 build/lib/ibt_pd.pd_linux \ + -vDm 644 src/${pkgname}_pd/ibt_pd-help.pd \ -t "${pkgdir}/usr/lib/pd/extra/" # vamp plugin - install -vDm 755 lib/mvamp.so -t "${pkgdir}/usr/lib/vamp" + install -vDm 755 build/lib/mvamp.so -t "${pkgdir}/usr/lib/vamp" # docs - install -vDm 644 ../{AUTHORS,README,TODO} \ + install -vDm 644 {AUTHORS,README,TODO} \ -t "${pkgdir}/usr/share/doc/${pkgname}" # rename sfinfo https://bugs.archlinux.org/task/60787 mv -v "${pkgdir}/usr/bin/sfinfo" "${pkgdir}/usr/bin/${pkgname}-sfinfo"