Fix polygnome build

Format
Fix source
Add RtError patch

3 files changed, 75 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 384f9954ab1c..7039050d477f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,19 @@
 pkgbase = polygnome
 	pkgdesc = A polyrhythmic metronome
 	pkgver = 0.1.3
-	pkgrel = 1
+	pkgrel = 2
 	url = http://sourceforge.net/projects/polygnome/
 	arch = i686
 	arch = x86_64
 	license = GPL3
 	depends = stk
 	depends = jack
-	source = http://sourceforge.net/projects/polygnome/files/polygnome-0.1.3.tar.gz
+	source = http://downloads.sourceforge.net/project/polygnome/polygnome-0.1.3.tar.gz
 	source = mtaudio.patch
+	source = MTAudio-RtError-was-replaced-with-RtAudioError.patch
 	md5sums = 2367b483d1b8f351482e03eebf8b4c3d
 	md5sums = b2d1be46214d51f2e56e909338247a71
+	md5sums = ba1a05457c96c79ff1fee358f9ecb4ea
 
 pkgname = polygnome
 
diff --git a/MTAudio-RtError-was-replaced-with-RtAudioError.patch b/MTAudio-RtError-was-replaced-with-RtAudioError.patch
new file mode 100644
index 000000000000..a4bf6dad1d75
--- /dev/null
+++ b/MTAudio-RtError-was-replaced-with-RtAudioError.patch
@@ -0,0 +1,52 @@
+From 73a831afb76b1aab1b26769c2f06ae51074bc90f Mon Sep 17 00:00:00 2001
+From: Sandy Carter <bwrsandman@gmail.com>
+Date: Tue, 4 Aug 2015 15:55:28 -0400
+Subject: [PATCH] MTAudio: RtError was replaced with RtAudioError
+
+---
+ src/MTAudio.cpp | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/MTAudio.cpp b/src/MTAudio.cpp
+index f0ad864..8fde9fc 100644
+--- a/src/MTAudio.cpp
++++ b/src/MTAudio.cpp
+@@ -54,7 +54,7 @@ MTAudio::MTAudio() :
+ 
+ namespace
+ {
+-    bool handleJackSampleRateError(RtError &error)
++    bool handleJackSampleRateError(RtAudioError &error)
+     {
+         // here we see if the problem was simply a sample rate mismatch,
+         // in which case, we adjust our sample rate to match
+@@ -104,7 +104,7 @@ void MTAudio::start()
+                     this,
+                     &options);
+         }
+-        catch (RtError &error)
++        catch (RtAudioError &error)
+         {
+             std::cerr << error.getMessage() << std::endl;
+             // here we see if the problem was simply a sample rate mismatch,
+@@ -132,7 +132,7 @@ void MTAudio::start()
+     {
+         dac_.startStream();
+     }
+-    catch (RtError &error)
++    catch (RtAudioError &error)
+     {
+         error.printMessage();
+     }
+@@ -147,7 +147,7 @@ MTAudio::~MTAudio()
+         if (dac_.isStreamOpen())
+             dac_.closeStream();
+     }
+-    catch (RtError &error)
++    catch (RtAudioError &error)
+     {
+         error.printMessage();
+     }
+-- 
+2.5.0
+
diff --git a/PKGBUILD b/PKGBUILD
index ecf030cbdf57..206b64ef449b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,32 @@
-# Maintainer: rtfreedman  (rob<d0t>til<d0t>freedman<aT>googlemail<d0t>com
+# Maintainer: Sandy Carter <bwrsandman@gmail.com>
+# Contributor: rtfreedman  (rob<d0t>til<d0t>freedman<aT>googlemail<d0t>com
 
 pkgname=polygnome
 pkgver=0.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="A polyrhythmic metronome"
 arch=(i686 x86_64)
 url="http://sourceforge.net/projects/polygnome/"
 license=('GPL3')
 depends=('stk' 'jack')
-source=("http://sourceforge.net/projects/polygnome/files/polygnome-0.1.3.tar.gz"
-		"mtaudio.patch")
+source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+        "mtaudio.patch"
+        "MTAudio-RtError-was-replaced-with-RtAudioError.patch")
 md5sums=('2367b483d1b8f351482e03eebf8b4c3d'
-         'b2d1be46214d51f2e56e909338247a71')
+         'b2d1be46214d51f2e56e909338247a71'
+         'ba1a05457c96c79ff1fee358f9ecb4ea')
+
+prepare() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+  msg "Fix RtError"
+  patch -Np1 -i ${srcdir}/MTAudio-RtError-was-replaced-with-RtAudioError.patch
+  msg "Add Missing Header"
+	patch -Np1 -i  ${srcdir}/mtaudio.patch
+}
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-# add missing header
-	patch -Np1 -i ../mtaudio.patch
-# configure doesn't add '-ljack' properly
+  # Configure doesn't add '-ljack' properly
 	JACK_LIBS="$(pkg-config jack --libs)" ./configure  --prefix=/usr
 	make 
 }
@@ -26,3 +35,5 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 }
+
+# vim:set ts=2 sw=2 et: