[arch-commits] Commit in vamp-aubio-plugins/trunk (PKGBUILD vamp-aubio-i686.patch)

[David Runge]

    Date: Tuesday, February 20, 2018 @ 16:49:44
  Author: dvzrv
Revision: 296476

upgpkg: vamp-aubio-plugins 0.5.1-2

Rebuild against aubio 0.4.6. Switching to aubio upstream.
Switching to https for source and url. Removing unneeded i686 patch.
Adding --prefix in build(). Adding --destdir in package().
Adding README.md

Modified:
  vamp-aubio-plugins/trunk/PKGBUILD
Deleted:
  vamp-aubio-plugins/trunk/vamp-aubio-i686.patch

-----------------------+
 PKGBUILD              |   30 +++++++++++++-----------------
 vamp-aubio-i686.patch |   11 -----------
 2 files changed, 13 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-20 16:32:07 UTC (rev 296475)
+++ PKGBUILD	2018-02-20 16:49:44 UTC (rev 296476)
@@ -1,32 +1,28 @@
 # $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=vamp-aubio-plugins
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Onset detection, pitch tracking, note tracking and tempo tracking plugins using Paul Brossier's aubio library"
 arch=('x86_64')
-url="https://code.soundsoftware.ac.uk/projects/vamp-aubio-plugins"
-license=('GPL2')
+url="https://aubio.org/vamp-aubio-plugins/"
+license=('GPL3')
 depends=('vamp-plugin-sdk' 'aubio')
 makedepends=('python2')
-source=("http://aubio.org/pub/vamp-aubio-plugins/vamp-aubio-plugins-$pkgver.tar.bz2" vamp-aubio-i686.patch)
-sha256sums=('3af69df7e1b1ae412abcea692523fed9f5a1d5a3fe2785b4af581018e179ecbe'
-            '1b09949d2d2c4ab71e363ecd0f216ad9a780a8d0a10d8049026c606da15f70f1')
+source=("https://aubio.org/pub/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+sha512sums=('ebbd8466ec3907d55e24824d7a725586df38212994f1398b75974dfac8e282dd8b2cb2a9381ad7e3da1a130b77936f109b36909b23591cc58ff176d6eb22625e')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../vamp-aubio-i686.patch # Fix i686 build
-}
-
 build() {
-  cd $pkgname-$pkgver
-  python2 waf configure
+  cd "${pkgname}-${pkgver}"
+  python2 waf configure --prefix=/usr
   python2 waf build -v
 }
 
 package() {
-  cd $pkgname-$pkgver
-  install -Dm755 build/vamp-aubio.so "$pkgdir"/usr/lib/vamp/vamp-aubio.so
-  install -m644 vamp-aubio.cat vamp-aubio.n3 -t "$pkgdir"/usr/lib/vamp/
+  cd "${pkgname}-${pkgver}"
+  python2 waf install --destdir="${pkgdir}"
+  # docs
+  install -vDm644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
 }

Deleted: vamp-aubio-i686.patch
===================================================================
--- vamp-aubio-i686.patch	2018-02-20 16:32:07 UTC (rev 296475)
+++ vamp-aubio-i686.patch	2018-02-20 16:49:44 UTC (rev 296476)
@@ -1,11 +0,0 @@
---- vamp-aubio-plugins-0.5.1/wscript.0	2017-08-29 18:28:53.262861416 +0000
-+++ vamp-aubio-plugins-0.5.1/wscript	2017-08-29 18:29:05.932890054 +0000
-@@ -45,7 +45,7 @@
-             local_vamp_lib = local_vamp_lib_mingw
-         elif platform.machine() == 'x86_64':
-             local_vamp_lib = local_vamp_lib_amd64
--        elif platform.machine() == 'x86_64':
-+        elif platform.machine() == 'i686':
-             local_vamp_lib = local_vamp_lib_i686
-     elif sys.platform == 'darwin':
-         local_vamp_lib = local_vamp_lib_osx