Date: Sunday, January 25, 2015 @ 11:17:44
Author: lfleischer
Revision: 126557
archrelease: copy trunk to community-i686, community-x86_64
Added:
lmms/repos/community-i686/0001-Fix-calcSlope1-was-not-declared-errors.patch
(from rev 126556,
lmms/trunk/0001-Fix-calcSlope1-was-not-declared-errors.patch)
lmms/repos/community-i686/PKGBUILD
(from rev 126556, lmms/trunk/PKGBUILD)
lmms/repos/community-i686/lmms-1.0.3-build-fix.patch
(from rev 126556, lmms/trunk/lmms-1.0.3-build-fix.patch)
lmms/repos/community-i686/lmms.install
(from rev 126556, lmms/trunk/lmms.install)
lmms/repos/community-i686/zynaddsubfx_unlink.patch
(from rev 126556, lmms/trunk/zynaddsubfx_unlink.patch)
lmms/repos/community-x86_64/0001-Fix-calcSlope1-was-not-declared-errors.patch
(from rev 126556,
lmms/trunk/0001-Fix-calcSlope1-was-not-declared-errors.patch)
lmms/repos/community-x86_64/PKGBUILD
(from rev 126556, lmms/trunk/PKGBUILD)
lmms/repos/community-x86_64/lmms-1.0.3-build-fix.patch
(from rev 126556, lmms/trunk/lmms-1.0.3-build-fix.patch)
lmms/repos/community-x86_64/lmms.install
(from rev 126556, lmms/trunk/lmms.install)
lmms/repos/community-x86_64/zynaddsubfx_unlink.patch
(from rev 126556, lmms/trunk/zynaddsubfx_unlink.patch)
Deleted:
lmms/repos/community-i686/PKGBUILD
lmms/repos/community-i686/lmms-1.0.3-build-fix.patch
lmms/repos/community-i686/lmms.install
lmms/repos/community-i686/zynaddsubfx_unlink.patch
lmms/repos/community-x86_64/PKGBUILD
lmms/repos/community-x86_64/lmms-1.0.3-build-fix.patch
lmms/repos/community-x86_64/lmms.install
lmms/repos/community-x86_64/zynaddsubfx_unlink.patch
--------------------------------------------------------------------+
/PKGBUILD | 96
++++++++
/lmms-1.0.3-build-fix.patch | 118
++++++++++
/lmms.install | 22 +
/zynaddsubfx_unlink.patch | 20 +
community-i686/0001-Fix-calcSlope1-was-not-declared-errors.patch | 43 +++
community-i686/PKGBUILD | 48 ----
community-i686/lmms-1.0.3-build-fix.patch | 59 -----
community-i686/lmms.install | 11
community-i686/zynaddsubfx_unlink.patch | 10
community-x86_64/0001-Fix-calcSlope1-was-not-declared-errors.patch | 43 +++
community-x86_64/PKGBUILD | 48 ----
community-x86_64/lmms-1.0.3-build-fix.patch | 59 -----
community-x86_64/lmms.install | 11
community-x86_64/zynaddsubfx_unlink.patch | 10
14 files changed, 342 insertions(+), 256 deletions(-)
Copied:
lmms/repos/community-i686/0001-Fix-calcSlope1-was-not-declared-errors.patch
(from rev 126556, lmms/trunk/0001-Fix-calcSlope1-was-not-declared-errors.patch)
===================================================================
--- community-i686/0001-Fix-calcSlope1-was-not-declared-errors.patch
(rev 0)
+++ community-i686/0001-Fix-calcSlope1-was-not-declared-errors.patch
2015-01-25 10:17:44 UTC (rev 126557)
@@ -0,0 +1,43 @@
+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
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-01-25 10:17:27 UTC (rev 126556)
+++ community-i686/PKGBUILD 2015-01-25 10:17:44 UTC (rev 126557)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Shinlun Hsieh <[email protected]>
-# Contributor: Mateusz Herych <[email protected]>
-# Contributor: Storyteller <[email protected]>
-
-pkgname=lmms
-pkgver=1.1.0
-pkgrel=1
-pkgdesc='The Linux MultiMedia Studio.'
-arch=('i686' 'x86_64')
-url='http://lmms.sourceforge.net/'
-license=('GPL')
-depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft'
'libxinerama' 'qt4' 'sdl_sound'
- 'libsamplerate' 'shared-mime-info' 'fltk')
-optdepends=('wine: VST support (experimental)'
- 'fftw: SpectrumAnalyzer plugin'
- 'stk: STK instruments plugins'
- 'pulseaudio: PulseAudio output')
-makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk')
-[[ $CARCH = i686 ]] && makedepends+=('wine')
-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')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../zynaddsubfx_unlink.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
-
- cmake . -DCMAKE_INSTALL_PREFIX=/usr -USE=vst
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" install
-}
Copied: lmms/repos/community-i686/PKGBUILD (from rev 126556,
lmms/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-01-25 10:17:44 UTC (rev 126557)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Shinlun Hsieh <[email protected]>
+# Contributor: Mateusz Herych <[email protected]>
+# Contributor: Storyteller <[email protected]>
+
+pkgname=lmms
+pkgver=1.1.1
+pkgrel=1
+pkgdesc='The Linux MultiMedia Studio.'
+arch=('i686' 'x86_64')
+url='http://lmms.sourceforge.net/'
+license=('GPL')
+depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft'
'libxinerama' 'qt4' 'sdl_sound'
+ 'libsamplerate' 'shared-mime-info' 'fltk')
+optdepends=('wine: VST support (experimental)'
+ 'fftw: SpectrumAnalyzer plugin'
+ 'stk: STK instruments plugins'
+ 'pulseaudio: PulseAudio output')
+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";
+ 0001-Fix-calcSlope1-was-not-declared-errors.patch)
+md5sums=('e56c3e58cdb97ca42e6fb89970c37254'
+ 'b31417f5a2fed0f498343a552e957c5f')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../0001-Fix-calcSlope1-was-not-declared-errors.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
+
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr -USE=vst
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-i686/lmms-1.0.3-build-fix.patch
===================================================================
--- community-i686/lmms-1.0.3-build-fix.patch 2015-01-25 10:17:27 UTC (rev
126556)
+++ community-i686/lmms-1.0.3-build-fix.patch 2015-01-25 10:17:44 UTC (rev
126557)
@@ -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
-
Copied: lmms/repos/community-i686/lmms-1.0.3-build-fix.patch (from rev 126556,
lmms/trunk/lmms-1.0.3-build-fix.patch)
===================================================================
--- community-i686/lmms-1.0.3-build-fix.patch (rev 0)
+++ community-i686/lmms-1.0.3-build-fix.patch 2015-01-25 10:17:44 UTC (rev
126557)
@@ -0,0 +1,59 @@
+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: community-i686/lmms.install
===================================================================
--- community-i686/lmms.install 2015-01-25 10:17:27 UTC (rev 126556)
+++ community-i686/lmms.install 2015-01-25 10:17:44 UTC (rev 126557)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: lmms/repos/community-i686/lmms.install (from rev 126556,
lmms/trunk/lmms.install)
===================================================================
--- community-i686/lmms.install (rev 0)
+++ community-i686/lmms.install 2015-01-25 10:17:44 UTC (rev 126557)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: community-i686/zynaddsubfx_unlink.patch
===================================================================
--- community-i686/zynaddsubfx_unlink.patch 2015-01-25 10:17:27 UTC (rev
126556)
+++ community-i686/zynaddsubfx_unlink.patch 2015-01-25 10:17:44 UTC (rev
126557)
@@ -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"
-
Copied: lmms/repos/community-i686/zynaddsubfx_unlink.patch (from rev 126556,
lmms/trunk/zynaddsubfx_unlink.patch)
===================================================================
--- community-i686/zynaddsubfx_unlink.patch (rev 0)
+++ community-i686/zynaddsubfx_unlink.patch 2015-01-25 10:17:44 UTC (rev
126557)
@@ -0,0 +1,10 @@
+--- 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"
+
Copied:
lmms/repos/community-x86_64/0001-Fix-calcSlope1-was-not-declared-errors.patch
(from rev 126556, lmms/trunk/0001-Fix-calcSlope1-was-not-declared-errors.patch)
===================================================================
--- community-x86_64/0001-Fix-calcSlope1-was-not-declared-errors.patch
(rev 0)
+++ community-x86_64/0001-Fix-calcSlope1-was-not-declared-errors.patch
2015-01-25 10:17:44 UTC (rev 126557)
@@ -0,0 +1,43 @@
+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
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-01-25 10:17:27 UTC (rev 126556)
+++ community-x86_64/PKGBUILD 2015-01-25 10:17:44 UTC (rev 126557)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Shinlun Hsieh <[email protected]>
-# Contributor: Mateusz Herych <[email protected]>
-# Contributor: Storyteller <[email protected]>
-
-pkgname=lmms
-pkgver=1.1.0
-pkgrel=1
-pkgdesc='The Linux MultiMedia Studio.'
-arch=('i686' 'x86_64')
-url='http://lmms.sourceforge.net/'
-license=('GPL')
-depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft'
'libxinerama' 'qt4' 'sdl_sound'
- 'libsamplerate' 'shared-mime-info' 'fltk')
-optdepends=('wine: VST support (experimental)'
- 'fftw: SpectrumAnalyzer plugin'
- 'stk: STK instruments plugins'
- 'pulseaudio: PulseAudio output')
-makedepends=('cmake' 'ladspa' 'libxft' 'freetype2' 'fftw' 'stk')
-[[ $CARCH = i686 ]] && makedepends+=('wine')
-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')
-
-prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -Np1 -i ../zynaddsubfx_unlink.patch
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
-
- cmake . -DCMAKE_INSTALL_PREFIX=/usr -USE=vst
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="${pkgdir}" install
-}
Copied: lmms/repos/community-x86_64/PKGBUILD (from rev 126556,
lmms/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-01-25 10:17:44 UTC (rev 126557)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Shinlun Hsieh <[email protected]>
+# Contributor: Mateusz Herych <[email protected]>
+# Contributor: Storyteller <[email protected]>
+
+pkgname=lmms
+pkgver=1.1.1
+pkgrel=1
+pkgdesc='The Linux MultiMedia Studio.'
+arch=('i686' 'x86_64')
+url='http://lmms.sourceforge.net/'
+license=('GPL')
+depends=('sdl' 'glib2' 'fluidsynth' 'libpng' 'libvorbis' 'libxft'
'libxinerama' 'qt4' 'sdl_sound'
+ 'libsamplerate' 'shared-mime-info' 'fltk')
+optdepends=('wine: VST support (experimental)'
+ 'fftw: SpectrumAnalyzer plugin'
+ 'stk: STK instruments plugins'
+ 'pulseaudio: PulseAudio output')
+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";
+ 0001-Fix-calcSlope1-was-not-declared-errors.patch)
+md5sums=('e56c3e58cdb97ca42e6fb89970c37254'
+ 'b31417f5a2fed0f498343a552e957c5f')
+
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -p1 -i ../0001-Fix-calcSlope1-was-not-declared-errors.patch
+}
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
+
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr -USE=vst
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make DESTDIR="${pkgdir}" install
+}
Deleted: community-x86_64/lmms-1.0.3-build-fix.patch
===================================================================
--- community-x86_64/lmms-1.0.3-build-fix.patch 2015-01-25 10:17:27 UTC (rev
126556)
+++ community-x86_64/lmms-1.0.3-build-fix.patch 2015-01-25 10:17:44 UTC (rev
126557)
@@ -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
-
Copied: lmms/repos/community-x86_64/lmms-1.0.3-build-fix.patch (from rev
126556, lmms/trunk/lmms-1.0.3-build-fix.patch)
===================================================================
--- community-x86_64/lmms-1.0.3-build-fix.patch (rev 0)
+++ community-x86_64/lmms-1.0.3-build-fix.patch 2015-01-25 10:17:44 UTC (rev
126557)
@@ -0,0 +1,59 @@
+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: community-x86_64/lmms.install
===================================================================
--- community-x86_64/lmms.install 2015-01-25 10:17:27 UTC (rev 126556)
+++ community-x86_64/lmms.install 2015-01-25 10:17:44 UTC (rev 126557)
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
Copied: lmms/repos/community-x86_64/lmms.install (from rev 126556,
lmms/trunk/lmms.install)
===================================================================
--- community-x86_64/lmms.install (rev 0)
+++ community-x86_64/lmms.install 2015-01-25 10:17:44 UTC (rev 126557)
@@ -0,0 +1,11 @@
+post_install() {
+ update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ post_install $1
+}
Deleted: community-x86_64/zynaddsubfx_unlink.patch
===================================================================
--- community-x86_64/zynaddsubfx_unlink.patch 2015-01-25 10:17:27 UTC (rev
126556)
+++ community-x86_64/zynaddsubfx_unlink.patch 2015-01-25 10:17:44 UTC (rev
126557)
@@ -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"
-
Copied: lmms/repos/community-x86_64/zynaddsubfx_unlink.patch (from rev 126556,
lmms/trunk/zynaddsubfx_unlink.patch)
===================================================================
--- community-x86_64/zynaddsubfx_unlink.patch (rev 0)
+++ community-x86_64/zynaddsubfx_unlink.patch 2015-01-25 10:17:44 UTC (rev
126557)
@@ -0,0 +1,10 @@
+--- 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"
+
