[arch-commits] Commit in marsyas/trunk (PKGBUILD)

2020-01-06 Thread David Runge via arch-commits 
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
===
--- PKGBUILD2020-01-06 15:32:40 UTC (rev 549767)
+++ PKGBUILD2020-01-06 15:42:06 UTC (rev 549768)
@@ -1,21 +1,24 @@
-# Maintainer: David Runge 
+# Maintainer: David Runge 
 # Contributor: Felix Yan 
 # Contributor: MeMi69 
 
 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"||' \
   -e 
's|"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"

[arch-commits] Commit in marsyas/trunk (PKGBUILD)

2018-11-18 Thread David Runge via arch-commits 
Date: Sunday, November 18, 2018 @ 19:03:28
  Author: dvzrv
Revision: 408731

upgpkg: marsyas 0.5.0-6

Renaming sfinfo binary because of conflict (FS#60787).

Modified:
  marsyas/trunk/PKGBUILD

--+
 PKGBUILD |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-18 18:59:39 UTC (rev 408730)
+++ PKGBUILD2018-11-18 19:03:28 UTC (rev 408731)
@@ -4,7 +4,7 @@
 
 pkgname=marsyas
 pkgver=0.5.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Music Analysis, Retrieval and Synthesis for Audio Signals"
 arch=('x86_64')
 url="http://marsyas.info;
@@ -70,4 +70,6 @@
   # docs
   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"
 }

[arch-commits] Commit in marsyas/trunk (PKGBUILD)

2018-11-11 Thread David Runge via arch-commits 
Date: Sunday, November 11, 2018 @ 08:40:47
  Author: dvzrv
Revision: 406342

upgpkg: marsyas 0.5.0-5

Adding new maintainer. Switching to correct license (GPL2). Moving to pro-audio 
group. Shrinking depends to absolute necessities.
Adding optdepends for pd (for provided external), python2 (python2 interface), 
vamp-plugin-sdk (for provided vamp plugin).
Fixing python2 shebangs, Fixing broken include in vamp plugin source and adding 
needed const_cast for pd_external source.
Building with pd external, swig (for Python interface), vamp plugin. Installing 
pd exteranl and vamp plugin manually as theres no make target.

Modified:
  marsyas/trunk/PKGBUILD

--+
 PKGBUILD |   62 +
 1 file changed, 50 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-11-11 08:08:20 UTC (rev 406341)
+++ PKGBUILD2018-11-11 08:40:47 UTC (rev 406342)
@@ -1,35 +1,73 @@
-# Maintainer: Felix Yan 
+# Maintainer: David Runge 
+# Contributor: Felix Yan 
 # Contributor: MeMi69 
 
 pkgname=marsyas
 pkgver=0.5.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Music Analysis, Retrieval and Synthesis for Audio Signals"
 arch=('x86_64')
-license=('GPL')
 url="http://marsyas.info;
-depends=('jack2' 'alsa-lib' 'gcc-libs' 'libvorbis' 'libmad' 'lame')
-optdepends=('qt5-declarative: for marsyas-inspector')
-makedepends=('cmake' 'qt5-declarative' 'doxygen')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/marsyas/marsyas/archive/version-$pkgver.tar.gz;)
-md5sums=('2ef63105ddd9e6095a1e2d697acb49aa')
+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')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/${pkgname}/${pkgname}/archive/version-$pkgver.tar.gz;)
+sha512sums=('0ff8943028753c70d409e78a8c5487da2006b7599c8909c0e0050433a6e7051f32b3c5f31fe833085a479d0486e4c96c5f4a4bd63ac00ee68b89dee941aebc9a')
 
 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"||' \
+  -e 
's|"MarSystemTemplateAdvanced.h"||'
 \
+  -i src/mvamp/MarsyasIBT.h
+  # fixing build of pd external
+  sed -e 's|= atom_getsymbol(argv+1)->s_name|= 
const_cast(atom_getsymbol(argv+1)->s_name)|' \
+  -i src/marsyas_pd/ibt_pd.cpp
+  sed -e 's/--export-dynamic/-export-dynamic/g' \
+  -i src/marsyas_pd/CMakeLists.txt
 }
 
 build() {
-  cd build
+  cd "${pkgname}-${pkgver}/build"
+  _python_lib=$( echo /usr/lib/python2* )
+  _python_include=$( echo /usr/include/python2* )
   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 \
-../$pkgname-version-$pkgver
+..
   make
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install 
+  cd "${pkgname}-${pkgver}/build"
+  make DESTDIR="$pkgdir" install
+  # pd external
+  install -vDm 755 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"
+  # docs
+  install -vDm 644 ../{AUTHORS,README,TODO} \
+-t "${pkgdir}/usr/share/doc/${pkgname}"
 }

[arch-commits] Commit in marsyas/trunk (PKGBUILD)

2017-07-15 Thread Antonio Rojas 
Date: Saturday, July 15, 2017 @ 08:51:34
  Author: arojas
Revision: 245188

PIE rebuild

Modified:
  marsyas/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-15 08:46:33 UTC (rev 245187)
+++ PKGBUILD2017-07-15 08:51:34 UTC (rev 245188)
@@ -4,7 +4,7 @@
 
 pkgname=marsyas
 pkgver=0.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Music Analysis, Retrieval and Synthesis for Audio Signals"
 arch=('i686' 'x86_64')
 license=('GPL')

[arch-commits] Commit in marsyas/trunk (PKGBUILD)

2017-07-11 Thread Bartłomiej Piotrowski 
Date: Tuesday, July 11, 2017 @ 06:41:12
  Author: bpiotrowski
Revision: 243944

0.5.0-3: PIE static libraries rebuild

Modified:
  marsyas/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-07-11 06:41:09 UTC (rev 243943)
+++ PKGBUILD2017-07-11 06:41:12 UTC (rev 243944)
@@ -4,7 +4,7 @@
 
 pkgname=marsyas
 pkgver=0.5.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Music Analysis, Retrieval and Synthesis for Audio Signals"
 arch=('i686' 'x86_64')
 license=('GPL')

[arch-commits] Commit in marsyas/trunk (PKGBUILD)

2015-12-06 Thread Evangelos Foutras 
Date: Sunday, December 6, 2015 @ 17:28:03
  Author: foutrelis
Revision: 148876

C++11 ABI rebuild

Modified:
  marsyas/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 16:25:57 UTC (rev 148875)
+++ PKGBUILD2015-12-06 16:28:03 UTC (rev 148876)
@@ -4,7 +4,7 @@
 
 pkgname=marsyas
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Music Analysis, Retrieval and Synthesis for Audio Signals"
 arch=('i686' 'x86_64')
 license=('GPL')