[arch-commits] Commit in lmms/trunk (2 files)

[Lukas Fleischer]

    Date: Sunday, January 25, 2015 @ 11:17:27
  Author: lfleischer
Revision: 126556

upgpkg: lmms 1.1.1-1

* Upstream update.
* Fix FS#41302.

Added:
  lmms/trunk/0001-Fix-calcSlope1-was-not-declared-errors.patch
Modified:
  lmms/trunk/PKGBUILD

---------------------------------------------------+
 0001-Fix-calcSlope1-was-not-declared-errors.patch |   43 ++++++++++++++++++++
 PKGBUILD                                          |   14 +++---
 2 files changed, 50 insertions(+), 7 deletions(-)

Added: 0001-Fix-calcSlope1-was-not-declared-errors.patch
===================================================================
--- 0001-Fix-calcSlope1-was-not-declared-errors.patch	                        (rev 0)
+++ 0001-Fix-calcSlope1-was-not-declared-errors.patch	2015-01-25 10:17:27 UTC (rev 126556)
@@ -0,0 +1,43 @@
+From d8e552de80f4a7d2834843b808369315cb5b4b40 Mon Sep 17 00:00:00 2001
+From: Daniel Winzen <d at 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
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-25 09:28:45 UTC (rev 126555)
+++ PKGBUILD	2015-01-25 10:17:27 UTC (rev 126556)
@@ -5,7 +5,7 @@
 # Contributor: Storyteller <spiralsorrow at hotmail.com>
 
 pkgname=lmms
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=1
 pkgdesc='The Linux MultiMedia Studio.'
 arch=('i686' 'x86_64')
@@ -17,20 +17,20 @@
             'fftw: SpectrumAnalyzer plugin'
             'stk: STK instruments plugins'
             'pulseaudio: PulseAudio output')
-makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk')
-[[ $CARCH = i686 ]] && makedepends+=('wine')
+makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk' 'wine')
+makedepends_x86_64=('gcc-multilib')
 provides=('lmms-extras')
 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() {