New upstream version 0.13.1; remove patches no longer needed

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

4 files changed, 8 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ea8c3035f9f..c34c72f75162 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Sep 24 21:15:21 UTC 2016
+# Fri Nov 18 11:48:01 UTC 2016
 pkgbase = giada
 	pkgdesc = A looper, drum machine, sequencer, live sampler and plugin host
-	pkgver = 0.13.0
+	pkgver = 0.13.1
 	pkgrel = 1
 	url = http://www.giadamusic.com/
 	install = giada.install
@@ -15,14 +15,10 @@ pkgbase = giada
 	depends = libpulse
 	depends = libxpm
 	depends = rtmidi
-	source = giada-0.13.0-src.tar.gz::http://www.giadamusic.com/download/grab/source
-	source = giada-rtmidi-header.patch
-	source = giada-vst-no-werror.patch
+	source = giada-0.13.1-src.tar.gz::http://www.giadamusic.com/download/grab/source
 	source = giada.desktop
 	source = giada.png
-	md5sums = 52d83bc0972e5696d6b8dbdf6c7bce0c
-	md5sums = 82d7d245c8048f124324be51ab806b36
-	md5sums = a7fbba39f6fba5ff04c6048faa074571
+	md5sums = f0f1497429149ff66721118c97e572c2
 	md5sums = 06238158680470ab01fbbeb33353e58e
 	md5sums = f9b6e4233890720af50c536c4b2c92c0
 
diff --git a/PKGBUILD b/PKGBUILD
index 3d380f98aee6..fe0effd60c93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Christopher Arndt <aur -at- chrisarndt -dot- de>
 
 pkgname=giada
-pkgver=0.13.0
+pkgver=0.13.1
 pkgrel=1
 pkgdesc="A looper, drum machine, sequencer, live sampler and plugin host"
 arch=('i686' 'x86_64')
@@ -10,14 +10,10 @@ license=('GPL3')
 depends=('fltk' 'jansson' 'libpulse' 'libxpm' 'rtmidi')
 makedepends=('steinberg-vst36')
 source=("${pkgname}-${pkgver}-src.tar.gz::http://www.giadamusic.com/download/grab/source"
-        'giada-rtmidi-header.patch'
-        'giada-vst-no-werror.patch'
         "$pkgname.desktop"
         "$pkgname.png")
 install="$pkgname.install"
-md5sums=('52d83bc0972e5696d6b8dbdf6c7bce0c'
-         '82d7d245c8048f124324be51ab806b36'
-         'a7fbba39f6fba5ff04c6048faa074571'
+md5sums=('f0f1497429149ff66721118c97e572c2'
          '06238158680470ab01fbbeb33353e58e'
          'f9b6e4233890720af50c536c4b2c92c0')
 
@@ -31,20 +27,13 @@ prepare() {
   do
     sed -i -e 's|pluginterfaces/vst2.x/|vst36/pluginterfaces/vst2.x/|g' "$file"
   done
-
-  # fix compiler flags in Makefile.am
-  patch -p1 -r - -i "$srcdir/giada-vst-no-werror.patch"
-
-  # fix rtmidi header include path in configure.ac and sources
-  if [ -e /usr/include/rtmidi/RtMidi.h ]; then
-    patch -p1 -r - -i "$srcdir/giada-rtmidi-header.patch"
-    autoconf
-  fi
 }
 
 build() {
   cd "$srcdir/$pkgname-$pkgver-src"
 
+  # the rtmidi AUR package puts the RtMidi headers in /usr/include/rtmidi
+  export CXXFLAGS="$CXXFLAGS -I/usr/include/rtmidi"
   ./configure --prefix=/usr --target=linux --enable-vst
   make
 }
diff --git a/giada-rtmidi-header.patch b/giada-rtmidi-header.patch
deleted file mode 100644
index a591eb5e05dc..000000000000
--- a/giada-rtmidi-header.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8257cf4..069c3fa 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -108,7 +108,7 @@ AC_LANG_POP
- 
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADER(
--	[RtMidi.h],
-+	[rtmidi/RtMidi.h],
- 	[],
- 	[AC_MSG_ERROR([library 'rtMidi' not found!])]
- )
-diff --git a/src/core/kernelMidi.h b/src/core/kernelMidi.h
-index 161a953..c48a4ff 100644
---- a/src/core/kernelMidi.h
-+++ b/src/core/kernelMidi.h
-@@ -32,7 +32,7 @@
- 
- 
- #include <stdint.h>
--#include <RtMidi.h>
-+#include <rtmidi/RtMidi.h>
- #include "channel.h"
- 
- 
diff --git a/giada-vst-no-werror.patch b/giada-vst-no-werror.patch
deleted file mode 100644
index 380834c67ef3..000000000000
--- a/giada-vst-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr giada-0.12.2-src.orig/Makefile.am giada-0.12.2-src/Makefile.am
---- giada-0.12.2-src.orig/Makefile.am	2016-06-02 11:07:13.000000000 +0200
-+++ giada-0.12.2-src/Makefile.am	2016-06-12 21:58:53.392156054 +0200
-@@ -153,7 +153,7 @@
- # via AM_CONDITIONAL inside configure.ac.
- # Note: CPPFLAGS = C preprocessor flags, CXXFLAGS = C++ compiler flags.
- 
--giada_CXXFLAGS = -std=c++11 -Wall -Werror
-+giada_CXXFLAGS = -std=c++11 -Wall
- giada_CPPFLAGS =
- 
- # TODO - these are flags for Linux only!