Update to 0.5.2

6 files changed, 30 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3d65736b962e..0670839b8597 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,30 @@
 # Generated by mksrcinfo v8
-# Thu Dec 29 15:42:16 UTC 2016
+# Sat Jan  6 12:45:14 UTC 2018
 pkgbase = shuriken
 	pkgdesc = An open source beat slicer
-	pkgver = 0.5.1
-	pkgrel = 4
+	pkgver = 0.5.2
+	pkgrel = 1
 	url = https://rock-hopper.github.io/shuriken
-	install = shuriken.install
 	arch = x86_64
 	arch = i686
 	license = GPL
+	makedepends = automake
+	makedepends = libtool
+	makedepends = pkg-config
 	makedepends = jack
-	depends = qt4
+	depends = qt5-base
+	depends = liblo
 	depends = aubio
 	depends = rubberband
-	depends = liblo
 	optdepends = jack: A low-latency audio server
 	provides = shuriken
 	conflicts = shuriken
-	source = https://github.com/rock-hopper/shuriken/archive/v0.5.1.tar.gz
-	source = shuriken.desktop
-	source = shuriken.png
-	source = shuriken.patch
-	sha256sums = 93175d0e992afebd05b476a78a6809894376a3e8ba4ea95ee3f5d9a67947db7d
-	sha256sums = f2144b34c35ecb855009a5d888d13bac2cf5b379274d7b60e4d9181d742fda99
+	source = https://github.com/rock-hopper/shuriken/archive/v0.5.2.tar.gz
+	source = https://github.com/rock-hopper/shuriken/raw/master/packaging/shuriken.desktop
+	source = https://github.com/rock-hopper/shuriken/raw/master/packaging/shuriken.png
+	sha256sums = 4b9ce6cf73748aba4110d92593034054b324b6933456667eb641d956a630e1c6
+	sha256sums = 7345f4d5387df2fb1e2147cbe124a31247227d7a7bc07b3a6c1221f9a93dbfa2
 	sha256sums = b637b82c35bb4f27eebe779c7790a85758e1b9c64fff8553ede207dda0d9cb37
-	sha256sums = 0c2a3a64465deb3f49bb4aa8fc4f0d210d2fcaa11e439c0893151e9ee727b6dc
 
 pkgname = shuriken
 
diff --git a/PKGBUILD b/PKGBUILD
index cd03d9d81cda..d3af4b77dd20 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,33 @@
-# $Id$
 # Contributor: Andrew M Taylor <a.m.taylor303 at gmail dot com>
 # Maintainer: Joermungand <joermungand at gmail dot com>
 
 pkgname=shuriken
-pkgver=0.5.1
-pkgrel=4
+pkgver=0.5.2
+pkgrel=1
 pkgdesc="An open source beat slicer"
 url="https://rock-hopper.github.io/shuriken"
 arch=('x86_64' 'i686')
 license=('GPL')
-depends=('qt4' 'aubio' 'rubberband' 'liblo')
-makedepends=('jack')
+depends=('qt5-base' 'liblo' 'aubio' 'rubberband')
+makedepends=('automake' 'libtool' 'pkg-config' 'jack')
 optdepends=('jack: A low-latency audio server')
-provides=("${pkgname}")
-conflicts=("${pkgname}")
-install="$pkgname.install"
+provides=("$pkgname")
+conflicts=("$pkgname")
 source=("https://github.com/rock-hopper/$pkgname/archive/v$pkgver.tar.gz"
-        "$pkgname.desktop"
-        "$pkgname.png"
-		"$pkgname.patch")
-sha256sums=('93175d0e992afebd05b476a78a6809894376a3e8ba4ea95ee3f5d9a67947db7d'
-            'f2144b34c35ecb855009a5d888d13bac2cf5b379274d7b60e4d9181d742fda99'
-            'b637b82c35bb4f27eebe779c7790a85758e1b9c64fff8553ede207dda0d9cb37'
-            '0c2a3a64465deb3f49bb4aa8fc4f0d210d2fcaa11e439c0893151e9ee727b6dc')
-
-prepare() {
-  cd "$pkgname-$pkgver"
-  patch -p1 -i "$srcdir/$pkgname.patch"
-}
+        "https://github.com/rock-hopper/$pkgname/raw/master/packaging/$pkgname.desktop"
+        "https://github.com/rock-hopper/$pkgname/raw/master/packaging/$pkgname.png")
+sha256sums=('4b9ce6cf73748aba4110d92593034054b324b6933456667eb641d956a630e1c6'
+            '7345f4d5387df2fb1e2147cbe124a31247227d7a7bc07b3a6c1221f9a93dbfa2'
+            'b637b82c35bb4f27eebe779c7790a85758e1b9c64fff8553ede207dda0d9cb37')
 
 build() {
-  cd "$pkgname-$pkgver"
-
-  # make sndlib
-
-  mkdir -p lib
-  cd src/SndLibShuriken
-  ./configure --without-audio --without-s7
-  make
-  mv -v libsndlib_shuriken.a ../../lib/
-  cd ../..
-
-  # make shuriken
-
-  declare _arch=""
-
-  if [[ $( lscpu | grep 'Architecture' ) =~ (x86_64) ]]; then
-    _arch="-64"
-  fi
-
-  qmake-qt4 PREFIX=/usr ./Shuriken.pro -r -spec linux-g++$_arch
-  make CXXFLAGS=-fpermissive
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./build
 }
 
 package() {
-  cd "$pkgname-$pkgver"
-
-  make INSTALL_ROOT="$pkgdir" install
-
-  install -Dm644 ../$pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-
-  install -Dm644 ../$pkgname.png "$pkgdir/usr/share/icons/$pkgname.png"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make INSTALL_ROOT="$pkgdir/usr" install
+  install -Dm644 ../${pkgname}.desktop "$pkgdir/usr/share/applications/${pkgname}.desktop"
+  install -Dm644 ../${pkgname}.png "$pkgdir/usr/share/icons/${pkgname}.png"
 }
diff --git a/shuriken.desktop b/shuriken.desktop
deleted file mode 100644
index 623147ea60a3..000000000000
--- a/shuriken.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Shuriken
-GenericName=Beat Slicer
-Comment=Shuriken Beat Slicer
-Exec=shuriken %F
-Icon=shuriken
-Terminal=false
-Type=Application
-Categories=AudioVideo;Audio;AudioEditing;
diff --git a/shuriken.install b/shuriken.install
deleted file mode 100644
index e111ef946053..000000000000
--- a/shuriken.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/shuriken.patch b/shuriken.patch
deleted file mode 100644
index 9a0edc7bfeb9..000000000000
--- a/shuriken.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur shuriken-0.5.1a/src/audioanalyser.h shuriken-0.5.1b/src/audioanalyser.h
---- shuriken-0.5.1a/src/audioanalyser.h  2015-09-27 15:58:36.000000000 +0100
-+++ shuriken-0.5.1b/src/audioanalyser.h  2016-12-08 00:23:53.977421455 +0000
-@@ -30,7 +30,7 @@
- class AudioAnalyser
- {
- public:
--    static const qreal MIN_INTER_ONSET_SECS = 0.05;
-+    static constexpr qreal MIN_INTER_ONSET_SECS = 0.05;
-
-     struct DetectionSettings
-     {
-diff -Naur shuriken-0.5.1a/src/waveformitem.h shuriken-0.5.1b/src/waveformitem.h
---- shuriken-0.5.1a/src/waveformitem.h   2015-09-27 15:58:36.000000000 +0100
-+++ shuriken-0.5.1b/src/waveformitem.h   2016-12-08 00:22:52.538422424 +0000
-@@ -109,9 +109,9 @@
-
- private:
-     static const int NOT_SET = -1;
--    static const qreal DETAIL_LEVEL_MAX_CUTOFF = 0.05;
--    static const qreal DETAIL_LEVEL_VERY_HIGH_CUTOFF = 1.0;
--    static const qreal DETAIL_LEVEL_HIGH_CUTOFF = 10.0;
-+    static constexpr qreal DETAIL_LEVEL_MAX_CUTOFF = 0.05;
-+    static constexpr qreal DETAIL_LEVEL_VERY_HIGH_CUTOFF = 1.0;
-+    static constexpr qreal DETAIL_LEVEL_HIGH_CUTOFF = 10.0;
-
diff --git a/shuriken.png b/shuriken.png
deleted file mode 100644
index d6449092d159..000000000000
--- a/shuriken.png
+++ /dev/null