Include fix for relocated headers in rtmidi package

4 files changed, 58 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7006ab7b1cdf..a1ffafdf8185 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Wed Mar  9 13:13:06 UTC 2016
+# Tue Mar 29 09:58:43 UTC 2016
 pkgbase = giada
 	pkgdesc = A looper, drum machine, sequencer, live sampler and plugin host
 	pkgver = 0.12.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.giadamusic.com/
 	install = giada.install
 	arch = i686
@@ -16,10 +16,14 @@ pkgbase = giada
 	depends = rtmidi
 	source = giada-0.12.0-src.tar.gz::http://www.giadamusic.com/download/grab/source
 	source = http://www.steinberg.net/sdk_downloads/vstsdk360_22_11_2013_build_100.zip
+	source = giada-rtmidi-header.patch
+	source = giada-vst-no-werror.patch
 	source = giada.desktop
 	source = giada.png
 	md5sums = 0ee5ad4c682dfa63341daa04dcd785e5
 	md5sums = 1ac422ebb4aa2e86061278412c347b55
+	md5sums = 82d7d245c8048f124324be51ab806b36
+	md5sums = 4c2780e78f379348869bf4826017d283
 	md5sums = 06238158680470ab01fbbeb33353e58e
 	md5sums = f9b6e4233890720af50c536c4b2c92c0
 
diff --git a/PKGBUILD b/PKGBUILD
index 97954042766d..b6e9943be96a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=giada
 pkgver=0.12.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A looper, drum machine, sequencer, live sampler and plugin host"
 arch=('i686' 'x86_64')
 url="http://www.giadamusic.com/"
@@ -10,11 +10,15 @@ license=('GPL3')
 depends=('fltk' 'jansson' 'libpulse' 'libxpm' 'rtmidi')
 source=("${pkgname}-${pkgver}-src.tar.gz::http://www.giadamusic.com/download/grab/source"
         'http://www.steinberg.net/sdk_downloads/vstsdk360_22_11_2013_build_100.zip'
+        'giada-rtmidi-header.patch'
+        'giada-vst-no-werror.patch'
         "$pkgname.desktop"
         "$pkgname.png")
 install="$pkgname.install"
 md5sums=('0ee5ad4c682dfa63341daa04dcd785e5'
          '1ac422ebb4aa2e86061278412c347b55'
+         '82d7d245c8048f124324be51ab806b36'
+         '4c2780e78f379348869bf4826017d283'
          '06238158680470ab01fbbeb33353e58e'
          'f9b6e4233890720af50c536c4b2c92c0')
 
@@ -27,11 +31,17 @@ prepare() {
     cp -f "$srcdir/VST3 SDK/pluginterfaces/vst2.x/$header" src/deps/vst
   done
 
-  # link dir structure from VST SDK neede by src/deps/juce
+  # link dir structure from VST SDK needed by src/deps/juce
   ln -sf "$srcdir/VST3 SDK/pluginterfaces" src/deps/vst
 
   # fix compiler flags in Makefile.am
-  sed -i -e 's/^\(giada_CXXFLAGS = .*\) -Werror/\1/' 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() {
diff --git a/giada-rtmidi-header.patch b/giada-rtmidi-header.patch
new file mode 100644
index 000000000000..a591eb5e05dc
--- /dev/null
+++ b/giada-rtmidi-header.patch
@@ -0,0 +1,26 @@
+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
new file mode 100644
index 000000000000..1736f0acb318
--- /dev/null
+++ b/giada-vst-no-werror.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index ab76590..43be805 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -153,7 +153,7 @@ endif
+ # inside configure.ac
+ # Note: CPPFLAGS ---> C preprocessor, while CXXFLAGS ---> C++ compiler.
+ 
+-giada_CXXFLAGS = -std=c++11 -Wall -Werror
++giada_CXXFLAGS = -std=c++11 -Wall
+ 
+ # TODO - these are flags for Linux only!
+ # Also, JUCE makes GCC complain if compiled with optimization set to -O2.