[arch-commits] Commit in lmms/repos (18 files)
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 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] )
+ {
+
[arch-commits] Commit in lmms/repos (18 files)
Date: Thursday, January 8, 2015 @ 21:33:39
Author: lfleischer
Revision: 125625
archrelease: copy trunk to community-i686, community-x86_64
Added:
lmms/repos/community-i686/PKGBUILD
(from rev 125623, lmms/trunk/PKGBUILD)
lmms/repos/community-i686/lmms-1.0.3-build-fix.patch
(from rev 125623, lmms/trunk/lmms-1.0.3-build-fix.patch)
lmms/repos/community-i686/lmms.install
(from rev 125623, lmms/trunk/lmms.install)
lmms/repos/community-i686/zynaddsubfx_unlink.patch
(from rev 125623, lmms/trunk/zynaddsubfx_unlink.patch)
lmms/repos/community-x86_64/PKGBUILD
(from rev 125624, lmms/trunk/PKGBUILD)
lmms/repos/community-x86_64/lmms-1.0.3-build-fix.patch
(from rev 125624, lmms/trunk/lmms-1.0.3-build-fix.patch)
lmms/repos/community-x86_64/lmms.install
(from rev 125624, lmms/trunk/lmms.install)
lmms/repos/community-x86_64/zynaddsubfx_unlink.patch
(from rev 125624, lmms/trunk/zynaddsubfx_unlink.patch)
Deleted:
lmms/repos/community-i686/PKGBUILD
lmms/repos/community-i686/lmms-1.0.2-build-fix.patch
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.2-build-fix.patch
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/PKGBUILD | 52 ---
community-i686/lmms-1.0.2-build-fix.patch | 86 --
community-i686/lmms-1.0.3-build-fix.patch | 59 -
community-i686/lmms.install | 11 --
community-i686/zynaddsubfx_unlink.patch | 10 --
community-x86_64/PKGBUILD | 52 ---
community-x86_64/lmms-1.0.2-build-fix.patch | 86 --
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, 256 insertions(+), 436 deletions(-)
Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2015-01-08 20:33:29 UTC (rev 125624)
+++ community-i686/PKGBUILD 2015-01-08 20:33:39 UTC (rev 125625)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer archlinux at cryptocrack dot de
-# Contributor: Shinlun Hsieh yngwi...@yahoo.com.tw
-# Contributor: Mateusz Herych heni...@gmail.com
-# Contributor: Storyteller spiralsor...@hotmail.com
-
-pkgname=lmms
-pkgver=1.0.3
-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}/releases/download/v{$pkgver}/${pkgname}-${pkgver}-src.tar.bz2;
-lmms-1.0.3-build-fix.patch
-zynaddsubfx_unlink.patch)
-md5sums=('1f63ad9abd1781206d852e79b2191638'
- 'fa8ab5c48b021b87f8040479190a'
- 'd2ea78ac0cf2979505f140c6845617cf')
-
-prepare() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- patch -Np1 -i ../lmms-1.0.3-build-fix.patch
- 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 125623,
lmms/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-01-08 20:33:39 UTC (rev 125625)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Lukas Fleischer archlinux at cryptocrack dot de
+# Contributor: Shinlun Hsieh yngwi...@yahoo.com.tw
+# Contributor: Mateusz Herych heni...@gmail.com
+# Contributor: Storyteller spiralsor...@hotmail.com
+
+pkgname=lmms
+pkgver=1.1.0
+pkgrel=1
+pkgdesc='The Linux MultiMedia Studio.'
+arch=('i686' 'x86_64')
