[arch-commits] Commit in sonic-visualiser/trunk (PKGBUILD capnproto-version.patch)

[David Runge]

    Date: Wednesday, December 6, 2017 @ 00:15:09
  Author: dvzrv
Revision: 272350

upgpkg: sonic-visualiser 3.0.3-1

Updating maintainer. Upgrading to 3.0.3. Switching to correct license (GPL2). Adding qt-svg instead of qt-base to depends. Adding capnproto to depends. Switching to https for source. Switching to sh512sums. Adding patch for capnproto > 0.6 to prepare(). Executing autoreconf in prepare() instead of calling shell script. Adding more files in install(), because build scripts are broken. Adding various docs. Minor fixes.

Added:
  sonic-visualiser/trunk/capnproto-version.patch
Modified:
  sonic-visualiser/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   64 +++++++++++++++++++++++++++++-----------------
 capnproto-version.patch |   11 +++++++
 2 files changed, 52 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-06 00:07:00 UTC (rev 272349)
+++ PKGBUILD	2017-12-06 00:15:09 UTC (rev 272350)
@@ -1,50 +1,68 @@
 # $Id$
-# Maintainer : speps <speps at aur dot archlinux dot org>
+# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: speps <speps at aur dot archlinux dot org>
 # Contributor: Orivej Desh <masecretaire at gmx.fr>
 
 pkgname=sonic-visualiser
-pkgver=2.5
-pkgrel=3
+pkgver=3.0.3
+pkgrel=1
 pkgdesc="A viewer and analyser of music audio files."
 arch=('x86_64')
 url="http://www.sonicvisualiser.org/"
-license=('GPL')
-depends=('desktop-file-utils' 'libfishsound' 'libid3tag' 'liblo' 'liblrdf' 'libmad'
-         'liboggz' 'libpulse' 'portaudio' 'qt5-base' 'rubberband' 'sord' 'hicolor-icon-theme')
-options=('!makeflags')
-source=("http://code.soundsoftware.ac.uk/attachments/download/1675/$pkgname-$pkgver.tar.gz")
-md5sums=('bb79007d4c57391b361cbc51304e1ce2')
+license=('GPL2')
+depends=('capnproto' 'libfishsound' 'libid3tag' 'liblo'
+'liblrdf' 'libmad' 'liboggz' 'libpulse' 'portaudio' 'qt5-svg'
+'rubberband' 'sord' 'hicolor-icon-theme')
+source=("https://code.soundsoftware.ac.uk/attachments/download/2246/${pkgname}-${pkgver}.tar.gz"
+        "capnproto-version.patch")
+sha512sums=('845cc92231f6c8eec24e4f583d1a736042ecfa73b7a7c401efb3d6e26050657851b1672043482ebc78dd19ded0e6aee6f930165e6410330eafaa08e0d4a50aa1'
+            '04ef2ddca1c503cb251e76aff035eb2f7b8b50b350671fe69bdf63e4dd36c53dcd9c7572d83597e9fbcc2a95523e1c804127714f8f2acd5db7a4f8afdaf7aa89')
 
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  # Fix capnproto use: https://sourceforge.net/p/sv1/bugs/239/
+  patch -Np0 -i "${srcdir}/capnproto-version.patch"
+  autoreconf -vi
+}
+
 build() {
-  cd $pkgname-$pkgver
-  sh bootstrap.sh
+  cd "${pkgname}-${pkgver}"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd "${pkgname}-${pkgver}"
 
-  # bin
-  install -Dm755 $pkgname "$pkgdir/usr/bin/$pkgname"
+  # install everything separately, because build system is broken:
+  # https://sourceforge.net/p/sv1/bugs/247/
 
-  # desktop file
-  install -d "$pkgdir/usr/share/applications"
-  install -Dm644 *.desktop "$pkgdir/usr/share/applications"
+  # binaries
+  install -Dm755 "${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  install -Dm755 piper-vamp-simple-server \
+    "${pkgdir}/usr/bin/piper-vamp-simple-server"
+  install -Dm755 vamp-plugin-load-checker \
+    "${pkgdir}/usr/bin/vamp-plugin-load-checker"
 
+  # desktop files
+  install -t "${pkgdir}/usr/share/applications" -Dm644 *.desktop
+
   # icons
   for _s in 16 22 24 32 48 64 128; do
     install -Dm644 icons/sv-${_s}x${_s}.png \
-            "$pkgdir/usr/share/icons/hicolor/${_s}x${_s}/apps/sv-icon.png"
+      "${pkgdir}/usr/share/icons/hicolor/${_s}x${_s}/apps/sv-icon.png"
   done
   install -Dm644 icons/sv-icon.svg \
-          "$pkgdir/usr/share/icons/hicolor/scalable/apps/sv-icon.svg"
+    "${pkgdir}/usr/share/icons/hicolor/scalable/apps/sv-icon.svg"
 
   # samples
-  install -d "$pkgdir/usr/share/$pkgname/samples"
-  install -Dm644 samples/* "$pkgdir/usr/share/$pkgname/samples"
+  install -t "${pkgdir}/usr/share/${pkgname}/samples" -Dm644 samples/*
 
   # templates
-  install -d "$pkgdir/usr/share/$pkgname/templates"
-  install -Dm644 templates/* "$pkgdir/usr/share/$pkgname/templates"
+  install -t "${pkgdir}/usr/share/${pkgname}/templates" -Dm644 templates/*
+
+  # docs
+  install -Dm644 CHANGELOG "${pkgdir}/usr/share/doc/${pkgname}/CHANGELOG"
+  install -Dm644 CITATION "${pkgdir}/usr/share/doc/${pkgname}/CITATION"
+  install -Dm644 README "${pkgdir}/usr/share/doc/${pkgname}/README"
 }

Added: capnproto-version.patch
===================================================================
--- capnproto-version.patch	                        (rev 0)
+++ capnproto-version.patch	2017-12-06 00:15:09 UTC (rev 272350)
@@ -0,0 +1,11 @@
+--- piper-cpp/vamp-capnp/piper.capnp.h	2017-05-25 10:26:10.000000000 +0200
++++ piper-cpp/vamp-capnp/piper.capnp.h.new	2017-12-05 13:46:42.929667773 +0100
+@@ -6,7 +6,7 @@
+ 
+ #include <capnp/generated-header-support.h>
+ 
+-#if CAPNP_VERSION != 6000
++#if CAPNP_VERSION < 6000
+ #error "Version mismatch between generated code and library headers.  You must use the same version of the Cap'n Proto compiler and library."
+ #endif
+