[arch-commits] Commit in lmms/trunk (PKGBUILD lmms-1.0.2-build-fix.patch)

[Lukas Fleischer]

    Date: Tuesday, July 22, 2014 @ 13:51:30
  Author: lfleischer
Revision: 116097

upgpkg: lmms 1.0.2-1

Upstream update.

Added:
  lmms/trunk/lmms-1.0.2-build-fix.patch
Modified:
  lmms/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   17 ++++++--
 lmms-1.0.2-build-fix.patch |   86 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-07-22 09:09:08 UTC (rev 116096)
+++ PKGBUILD	2014-07-22 11:51:30 UTC (rev 116097)
@@ -5,7 +5,7 @@
 # Contributor: Storyteller <spiralsorrow at hotmail.com>
 
 pkgname=lmms
-pkgver=1.0.0
+pkgver=1.0.2
 pkgrel=1
 pkgdesc='The Linux MultiMedia Studio.'
 arch=('i686' 'x86_64')
@@ -23,18 +23,25 @@
 conflicts=('lmms-extras')
 options=('!makeflags')
 install=lmms.install
-source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2/download"
+source=("${pkgname}-${pkgver}-src.tar.bz2::http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.bz2/download"
+        lmms-1.0.2-build-fix.patch
         zynaddsubfx_unlink.patch)
-md5sums=('72260dd6e29bf018875fd751c1d43465'
+md5sums=('db1c3e432cad933c9fd124c4840c0bf1'
+         '2ff166311a02cf6220dda5cac660528a'
          'd2ea78ac0cf2979505f140c6845617cf')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  patch -Np1 -i ../lmms-1.0.2-build-fix.patch
+  patch -Np1 -i ../zynaddsubfx_unlink.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   sed -i 's|lib64|lib|g' cmake/modules/DetectMachine.cmake
 
-  patch -Np1 -i ../zynaddsubfx_unlink.patch
-
   cmake . -DCMAKE_INSTALL_PREFIX=/usr -USE=vst
   make
 }

Added: lmms-1.0.2-build-fix.patch
===================================================================
--- lmms-1.0.2-build-fix.patch	                        (rev 0)
+++ lmms-1.0.2-build-fix.patch	2014-07-22 11:51:30 UTC (rev 116097)
@@ -0,0 +1,86 @@
+From ab55b26e4b1521e5401f60a2f618f31579e9cc5c Mon Sep 17 00:00:00 2001
+From: Tobias Doerffel <tobias.doerffel at gmail.com>
+Date: Sat, 5 Jul 2014 17:46:10 +0200
+Subject: [PATCH] SWH/BodeShifterCV: fix out-of-bounds array access
+
+The xcoeffs array only has 100 elements and thus accessing xcoeffs[100]
+leads to undefined behaviour.
+---
+ 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 41fb4f0..967edf6 100644
+--- a/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
++++ b/plugins/LadspaEffect/swh/bode_shifter_cv_1432.c
+@@ -247,7 +247,7 @@ static void runBodeShifterCV(LADSPA_Handle instance, unsigned long sample_count)
+ 	  /* 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 f91925f34aa1ee8ecacb12b8c4943c7e8aaabbfe Mon Sep 17 00:00:00 2001
+From: Rafael Ruggiero <rafael46w at gmail.com>
+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 <rafael46w at gmail.com>
+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
+