From fc6905462fea745bace230ff3e039919bf6cdc34 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 25 Jan 2015 10:33:33 +0000
Subject: [PATCH] community/lmms to 1.1.1-1

---
 ...x-calcSlope1-was-not-declared-errors.patch | 43 +++++++++++++++++++
 community/lmms/PKGBUILD                       | 11 +++--
 community/lmms/zynaddsubfx_unlink.patch       | 10 -----
 3 files changed, 48 insertions(+), 16 deletions(-)
 create mode 100644 community/lmms/0001-Fix-calcSlope1-was-not-declared-errors.patch
 delete mode 100644 community/lmms/zynaddsubfx_unlink.patch

diff --git a/community/lmms/0001-Fix-calcSlope1-was-not-declared-errors.patch b/community/lmms/0001-Fix-calcSlope1-was-not-declared-errors.patch
new file mode 100644
index 000000000..e14003412
--- /dev/null
+++ b/community/lmms/0001-Fix-calcSlope1-was-not-declared-errors.patch
@@ -0,0 +1,43 @@
+From d8e552de80f4a7d2834843b808369315cb5b4b40 Mon Sep 17 00:00:00 2001
+From: Daniel Winzen <d@winzen4.de>
+Date: Thu, 15 Jan 2015 22:15:04 +0100
+Subject: [PATCH] Fix calcSlope1 was not declared errors
+
+---
+ plugins/monstro/Monstro.cpp | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/monstro/Monstro.cpp b/plugins/monstro/Monstro.cpp
+index dc51619..d93af44 100644
+--- a/plugins/monstro/Monstro.cpp
++++ b/plugins/monstro/Monstro.cpp
+@@ -784,7 +784,7 @@ inline void MonstroSynth::updateModulators( float * env1, float * env2, float *
+ 			}
+ 			else if( m_env_phase[i] < 2.0f ) // attack phase
+ 			{
+-				env[i][f] = calcSlope1( fraction( m_env_phase[i] ) );
++				env[i][f] = calcSlope( i, fraction( m_env_phase[i] ) );
+ 				m_env_phase[i] = qMin( 2.0f, m_env_phase[i] + m_env_att[i] );
+ 			}
+ 			else if( m_env_phase[i] < 3.0f ) // hold phase
+@@ -794,7 +794,7 @@ inline void MonstroSynth::updateModulators( float * env1, float * env2, float *
+ 			}
+ 			else if( m_env_phase[i] < 4.0f ) // decay phase
+ 			{
+-				const sample_t s = calcSlope1( 1.0f - fraction( m_env_phase[i] ) );
++				const sample_t s = calcSlope( i, 1.0f - fraction( m_env_phase[i] ) );
+ 				if( s <= m_env_sus[i] )
+ 				{
+ 					env[i][f] = m_env_sus[i];
+@@ -808,7 +808,7 @@ inline void MonstroSynth::updateModulators( float * env1, float * env2, float *
+ 			}
+ 			else if( m_env_phase[i] < 5.0f ) // release phase
+ 			{
+-				env[i][f] = calcSlope1( 1.0f - fraction( m_env_phase[i] ) );
++				env[i][f] = calcSlope( i, 1.0f - fraction( m_env_phase[i] ) );
+ 				m_env_phase[i] += m_env_rel[i];
+ 			}
+ 			else env[i][f] = 0.0f;
+-- 
+2.2.2
+
diff --git a/community/lmms/PKGBUILD b/community/lmms/PKGBUILD
index 4d7bb9339..d86a58225 100644
--- a/community/lmms/PKGBUILD
+++ b/community/lmms/PKGBUILD
@@ -8,7 +8,7 @@
 #  - remove wine makedepend, no vst
 
 pkgname=lmms
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc='The Linux MultiMedia Studio.'
 arch=('i686' 'x86_64')
@@ -25,14 +25,13 @@ conflicts=('lmms-extras')
 options=('!makeflags')
 install=lmms.install
 source=("https://github.com/LMMS/${pkgname}/archive/v${pkgver}.tar.gz"
-        zynaddsubfx_unlink.patch)
-md5sums=('170ce0615063e9a171f1980972cca262'
-         'd2ea78ac0cf2979505f140c6845617cf')
+        0001-Fix-calcSlope1-was-not-declared-errors.patch)
+md5sums=('e56c3e58cdb97ca42e6fb89970c37254'
+         'b31417f5a2fed0f498343a552e957c5f')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  patch -Np1 -i ../zynaddsubfx_unlink.patch
+  patch -p1 -i ../0001-Fix-calcSlope1-was-not-declared-errors.patch
 }
 
 build() {
diff --git a/community/lmms/zynaddsubfx_unlink.patch b/community/lmms/zynaddsubfx_unlink.patch
deleted file mode 100644
index 6b2521f55..000000000
--- a/community/lmms/zynaddsubfx_unlink.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- lmms-0.4.13_orig/plugins/zynaddsubfx/LocalZynAddSubFx.cpp	2012-04-08 13:01:25.951925761 +0200
-+++ lmms-0.4.13_test/plugins/zynaddsubfx/LocalZynAddSubFx.cpp	2012-04-08 13:08:32.841905201 +0200
-@@ -23,6 +23,7 @@
-  */
- 
- #include <lmmsconfig.h>
-+#include <unistd.h>
- 
- #include "LocalZynAddSubFx.h"
-