disable portaudio, add a patch

3 files changed, 30 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b0e51ed273ef..3d6e12a12767 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,7 @@
 pkgbase = denemo
 	pkgdesc = A music score editor
 	pkgver = 2.2.0
-	pkgrel = 1
-	epoch = 1
+	pkgrel = 2
 	url = http://www.denemo.org
 	arch = x86_64
 	license = GPL
@@ -13,7 +12,6 @@ pkgbase = denemo
 	depends = lilypond
 	depends = gtk3
 	depends = libxml2
-	depends = guile
 	depends = fftw
 	depends = librsvg
 	depends = fluidsynth
@@ -22,12 +20,15 @@ pkgbase = denemo
 	depends = gtksourceview3
 	depends = portmidi
 	depends = rubberband
+	depends = guile2.0
 	noextract = denemo-2.2.0.tar.gz
 	source = https://ftp.gnu.org/gnu/denemo/denemo-2.2.0.tar.gz
 	source = https://ftp.gnu.org/gnu/denemo/denemo-2.2.0.tar.gz.sig
+	source = no_portaudio.patch
 	validpgpkeys = C66734FA5D60E4DDD882EF81AE6F83BB6C574235
 	sha256sums = d07d7c5bce5569e25fceb02727f5c8f4ff2f579947b612e2bf9b48573bd1eca3
 	sha256sums = SKIP
+	sha256sums = 0266e1c88f7829fbc0990dc3f3f7d55abdbea1f73d3b9a41728cc41682427eb5
 
 pkgname = denemo
 
diff --git a/PKGBUILD b/PKGBUILD
index 86119e1b1440..eed7795a5c13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,34 +6,34 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgname=denemo
-epoch=1
 pkgver=2.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A music score editor"
 arch=('x86_64')
 url="http://www.denemo.org"
 license=('GPL')
-depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'guile' 'fftw'
-	 'librsvg' 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi'
-	 'rubberband')
+depends=('aubio' 'portaudio' 'lilypond' 'gtk3' 'libxml2' 'fftw' 'librsvg'
+	 'fluidsynth' 'libsmf' 'evince' 'gtksourceview3' 'portmidi'
+	 'rubberband' 'guile2.0')
 makedepends=('intltool' 'git')
 noextract=(${pkgname}-${pkgver}.tar.gz)
 validpgpkeys=('C66734FA5D60E4DDD882EF81AE6F83BB6C574235')
-source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig})
+source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} no_portaudio.patch)
 sha256sums=('d07d7c5bce5569e25fceb02727f5c8f4ff2f579947b612e2bf9b48573bd1eca3'
-            'SKIP')
+            'SKIP'
+            '0266e1c88f7829fbc0990dc3f3f7d55abdbea1f73d3b9a41728cc41682427eb5')
 
 prepare() {
   cd "$srcdir"
   LC_ALL=en_US.UTF-8 tar xzf ${pkgname}-${pkgver}.tar.gz
   cd $pkgname-$pkgver
-  sed -i 's|<audio.h>|<portaudio.h>|' src/audio/pitchrecog.c
+  patch -Np1 < "$srcdir"/no_portaudio.patch
 }
 
 build() {
   cd $pkgname-$pkgver
   [ -x configure ] || ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc
+  ./configure --prefix=/usr --sysconfdir=/etc --disable-portaudio
   make
 }
 
diff --git a/no_portaudio.patch b/no_portaudio.patch
new file mode 100644
index 000000000000..1ce466d276cb
--- /dev/null
+++ b/no_portaudio.patch
@@ -0,0 +1,17 @@
+diff -Naur denemo-2.2.0.orig/src/audio/midi.c denemo-2.2.0.new/src/audio/midi.c
+--- denemo-2.2.0.orig/src/audio/midi.c	2017-07-24 20:10:38.333315139 +0200
++++ denemo-2.2.0.new/src/audio/midi.c	2018-01-16 21:14:49.017410549 +0100
+@@ -29,6 +29,13 @@
+ 
+ #define SHAVING (0.01)          //seconds to shave off a note start time to ensure stopping before noteon is sent, and starting with noteon first note may depend of speed of machine??? FIXME
+ 
++#ifndef HAVE_PORTAUDIO 
++gdouble get_playback_speed (void) 
++{ 
++ return 1.0; 
++} 
++void set_playback_speed (double speed) {} 
++#endif
+ 
+ static volatile gboolean playing = FALSE;
+