Date: Saturday, April 11, 2015 @ 10:15:57 Author: lfleischer Revision: 131151
upgpkg: lmms 1.1.3-1 Upstream update. Modified: lmms/trunk/PKGBUILD Deleted: lmms/trunk/0001-Fix-calcSlope1-was-not-declared-errors.patch lmms/trunk/lmms-1.0.3-build-fix.patch lmms/trunk/zynaddsubfx_unlink.patch ---------------------------------------------------+ 0001-Fix-calcSlope1-was-not-declared-errors.patch | 43 -------------- PKGBUILD | 13 +--- lmms-1.0.3-build-fix.patch | 59 -------------------- zynaddsubfx_unlink.patch | 10 --- 4 files changed, 3 insertions(+), 122 deletions(-) Deleted: 0001-Fix-calcSlope1-was-not-declared-errors.patch =================================================================== --- 0001-Fix-calcSlope1-was-not-declared-errors.patch 2015-04-11 06:58:19 UTC (rev 131150) +++ 0001-Fix-calcSlope1-was-not-declared-errors.patch 2015-04-11 08:15:57 UTC (rev 131151) @@ -1,43 +0,0 @@ -From d8e552de80f4a7d2834843b808369315cb5b4b40 Mon Sep 17 00:00:00 2001 -From: Daniel Winzen <[email protected]> -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-04-11 06:58:19 UTC (rev 131150) +++ PKGBUILD 2015-04-11 08:15:57 UTC (rev 131151) @@ -5,7 +5,7 @@ # Contributor: Storyteller <[email protected]> pkgname=lmms -pkgver=1.1.1 +pkgver=1.1.3 pkgrel=1 pkgdesc='The Linux MultiMedia Studio.' arch=('i686' 'x86_64') @@ -23,16 +23,9 @@ conflicts=('lmms-extras') options=('!makeflags') install=lmms.install -source=("$pkgname-$pkgver.tar.gz::https://github.com/LMMS/${pkgname}/archive/v${pkgver}.tar.gz"; - 0001-Fix-calcSlope1-was-not-declared-errors.patch) -md5sums=('e56c3e58cdb97ca42e6fb89970c37254' - 'b31417f5a2fed0f498343a552e957c5f') +source=("$pkgname-$pkgver.tar.gz::https://github.com/LMMS/${pkgname}/archive/v${pkgver}.tar.gz";) +md5sums=('88d9e66d240b711c37315e3c9da644a1') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../0001-Fix-calcSlope1-was-not-declared-errors.patch -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" Deleted: lmms-1.0.3-build-fix.patch =================================================================== --- lmms-1.0.3-build-fix.patch 2015-04-11 06:58:19 UTC (rev 131150) +++ lmms-1.0.3-build-fix.patch 2015-04-11 08:15:57 UTC (rev 131151) @@ -1,59 +0,0 @@ -From f91925f34aa1ee8ecacb12b8c4943c7e8aaabbfe Mon Sep 17 00:00:00 2001 -From: Rafael Ruggiero <[email protected]> -Date: Tue, 15 Jul 2014 17:41:07 -0300 -Subject: [PATCH] Update bode_shifter_cv_1432.c - ---- - plugins/LadspaEffect/swh/bode_shifter_cv_1432.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c -index 967edf6..a9c764e 100644 ---- a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c -+++ b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c -@@ -350,7 +350,7 @@ static void runAddingBodeShifterCV(LADSPA_Handle instance, unsigned long sample_ - /* Perform the Hilbert FIR convolution - * (probably FFT would be faster) */ - hilb = 0.0f; -- for (i = 0; i <= NZEROS/2; i++) { -+ for (i = 0; i < NZEROS/2; i++) { - hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); - } - --- -1.9.3 - -From ad35c553b39fc70237605952bf2c6ff1fac5b7b7 Mon Sep 17 00:00:00 2001 -From: Rafael Ruggiero <[email protected]> -Date: Tue, 15 Jul 2014 17:42:01 -0300 -Subject: [PATCH] Update surround_encoder_1401.c - ---- - plugins/LadspaEffect/swh/surround_encoder_1401.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/LadspaEffect/swh/surround_encoder_1401.c b/plugins/LadspaEffect/swh/surround_encoder_1401.c -index d4b6ace..100a03e 100644 ---- a/plugins/LadspaEffect/swh/surround_encoder_1401.c -+++ b/plugins/LadspaEffect/swh/surround_encoder_1401.c -@@ -228,7 +228,7 @@ static void runSurroundEncoder(LADSPA_Handle instance, unsigned long sample_coun - for (pos = 0; pos < sample_count; pos++) { - delay[dptr] = s[pos]; - hilb = 0.0f; -- for (i = 0; i <= NZEROS/2; i++) { -+ for (i = 0; i < NZEROS/2; i++) { - hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); - } - dptr = (dptr + 1) & (D_SIZE - 1); -@@ -296,7 +296,7 @@ static void runAddingSurroundEncoder(LADSPA_Handle instance, unsigned long sampl - for (pos = 0; pos < sample_count; pos++) { - delay[dptr] = s[pos]; - hilb = 0.0f; -- for (i = 0; i <= NZEROS/2; i++) { -+ for (i = 0; i < NZEROS/2; i++) { - hilb += (xcoeffs[i] * delay[(dptr - i*2) & (D_SIZE - 1)]); - } - dptr = (dptr + 1) & (D_SIZE - 1); --- -1.9.3 - Deleted: zynaddsubfx_unlink.patch =================================================================== --- zynaddsubfx_unlink.patch 2015-04-11 06:58:19 UTC (rev 131150) +++ zynaddsubfx_unlink.patch 2015-04-11 08:15:57 UTC (rev 131151) @@ -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" -
