Thu Jun 27 15:48:11 2013 UTC ()
Make enum public in local fltk copy that is used outside derived
classes. Remove size hints for array arguments that end up being
negative. Dereference pointer before calling member. Fix complex usage.
Add dependency on qt4-tools to make cmake happy.


(joerg)
diff -r1.29 -r1.30 pkgsrc/audio/lmms/Makefile
diff -r1.5 -r1.6 pkgsrc/audio/lmms/distinfo
diff -r0 -r1.1 pkgsrc/audio/lmms/patches/patch-plugins_ladspa__effect_calf_src_calf_buffer.h
diff -r0 -r1.1 pkgsrc/audio/lmms/patches/patch-plugins_ladspa__effect_calf_src_calf_fixed__point.h
diff -r0 -r1.1 pkgsrc/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_FL_Fl__Widget.H
diff -r0 -r1.1 pkgsrc/audio/lmms/patches/patch-plugins_zynaddsubfx_src_Effects_Alienwah.cpp

cvs diff -r1.29 -r1.30 pkgsrc/audio/lmms/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/lmms/Makefile 2013/06/17 15:16:47 1.29
+++ pkgsrc/audio/lmms/Makefile 2013/06/27 15:48:11 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2013/06/17 15:16:47 ryoon Exp $ 1# $NetBSD: Makefile,v 1.30 2013/06/27 15:48:11 joerg Exp $
2# 2#
3 3
4DISTNAME= lmms-0.4.15 4DISTNAME= lmms-0.4.15
5CATEGORIES= audio 5CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lmms/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lmms/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://lmms.sourceforge.net/ 10HOMEPAGE= http://lmms.sourceforge.net/
11COMMENT= Linux MultiMedia Studio 11COMMENT= Linux MultiMedia Studio
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
@@ -34,16 +34,17 @@ BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.11 @@ -34,16 +34,17 @@ BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.11
34.include "../../audio/jack/buildlink3.mk" 34.include "../../audio/jack/buildlink3.mk"
35.include "../../audio/libsamplerate/buildlink3.mk" 35.include "../../audio/libsamplerate/buildlink3.mk"
36.include "../../audio/libsndfile/buildlink3.mk" 36.include "../../audio/libsndfile/buildlink3.mk"
37.include "../../audio/libvorbis/buildlink3.mk" 37.include "../../audio/libvorbis/buildlink3.mk"
38.include "../../audio/portaudio/buildlink3.mk" 38.include "../../audio/portaudio/buildlink3.mk"
39.include "../../audio/pulseaudio/buildlink3.mk" 39.include "../../audio/pulseaudio/buildlink3.mk"
40.include "../../devel/SDL/buildlink3.mk" 40.include "../../devel/SDL/buildlink3.mk"
41.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
42.include "../../graphics/png/buildlink3.mk" 42.include "../../graphics/png/buildlink3.mk"
43.include "../../mk/jpeg.buildlink3.mk" 43.include "../../mk/jpeg.buildlink3.mk"
44.include "../../math/fftwf/buildlink3.mk" 44.include "../../math/fftwf/buildlink3.mk"
45.include "../../x11/libXfixes/buildlink3.mk" 45.include "../../x11/libXfixes/buildlink3.mk"
46.include "../../x11/qt4-libs/buildlink3.mk" 46.include "../../x11/qt4-libs/buildlink3.mk"
 47.include "../../x11/qt4-tools/buildlink3.mk"
47.include "../../mk/pthread.buildlink3.mk" 48.include "../../mk/pthread.buildlink3.mk"
48.include "../../sysutils/desktop-file-utils/desktopdb.mk" 49.include "../../sysutils/desktop-file-utils/desktopdb.mk"
49.include "../../mk/bsd.pkg.mk" 50.include "../../mk/bsd.pkg.mk"

cvs diff -r1.5 -r1.6 pkgsrc/audio/lmms/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/lmms/distinfo 2013/06/17 15:16:47 1.5
+++ pkgsrc/audio/lmms/distinfo 2013/06/27 15:48:11 1.6
@@ -1,11 +1,15 @@ @@ -1,11 +1,15 @@
1$NetBSD: distinfo,v 1.5 2013/06/17 15:16:47 ryoon Exp $ 1$NetBSD: distinfo,v 1.6 2013/06/27 15:48:11 joerg Exp $
2 2
3SHA1 (lmms-0.4.15.tar.bz2) = 7dc0a616291fa6e5f917e0e6f926e4c427b3c16c 3SHA1 (lmms-0.4.15.tar.bz2) = 7dc0a616291fa6e5f917e0e6f926e4c427b3c16c
4RMD160 (lmms-0.4.15.tar.bz2) = d660769cda53e0d6ca15f2e578478e8f27dbb851 4RMD160 (lmms-0.4.15.tar.bz2) = d660769cda53e0d6ca15f2e578478e8f27dbb851
5Size (lmms-0.4.15.tar.bz2) = 14211150 bytes 5Size (lmms-0.4.15.tar.bz2) = 14211150 bytes
6SHA1 (patch-CMakeLists.txt) = e48c68a6d96df7dbdb760c5d8414d262262ffd8a 6SHA1 (patch-CMakeLists.txt) = e48c68a6d96df7dbdb760c5d8414d262262ffd8a
 7SHA1 (patch-plugins_ladspa__effect_calf_src_calf_buffer.h) = b9d6f50680775cecbe0f485cf8f9c8d6172568a3
 8SHA1 (patch-plugins_ladspa__effect_calf_src_calf_fixed__point.h) = a77ecd2ab667aa3dbd436878b568ed499da7114b
 9SHA1 (patch-plugins_zynaddsubfx_fltk_FL_Fl__Widget.H) = 000762568741d957bf342b23c4eeb6353fc574db
7SHA1 (patch-plugins_zynaddsubfx_fltk_configh.cmake.in) = 332db7257adba4a2b884bf68065f067f02734409 10SHA1 (patch-plugins_zynaddsubfx_fltk_configh.cmake.in) = 332db7257adba4a2b884bf68065f067f02734409
8SHA1 (patch-plugins_zynaddsubfx_fltk_src_numericsort.c) = 3461f6e532d4d47c27f0d36daf1deb61922b4fc0 11SHA1 (patch-plugins_zynaddsubfx_fltk_src_numericsort.c) = 3461f6e532d4d47c27f0d36daf1deb61922b4fc0
9SHA1 (patch-plugins_zynaddsubfx_fltk_src_scandir.c) = 2ca4b691b1be385ca34f04c634e04126dc2efbd9 12SHA1 (patch-plugins_zynaddsubfx_fltk_src_scandir.c) = 2ca4b691b1be385ca34f04c634e04126dc2efbd9
 13SHA1 (patch-plugins_zynaddsubfx_src_Effects_Alienwah.cpp) = 89babf5b6a06899dfbaa8201383d9a20b78fabe8
10SHA1 (patch-src_core_audio_AudioAlsa.cpp) = 7fe90c5be3f4a45a67b9ca87bcd26cd074ad2976 14SHA1 (patch-src_core_audio_AudioAlsa.cpp) = 7fe90c5be3f4a45a67b9ca87bcd26cd074ad2976
11SHA1 (patch-src_core_audio_AudioOss.cpp) = 13d1f848a8ba94afa91d8ebee6326d246cf1a690 15SHA1 (patch-src_core_audio_AudioOss.cpp) = 13d1f848a8ba94afa91d8ebee6326d246cf1a690

File Added: pkgsrc/audio/lmms/patches/Attic/patch-plugins_ladspa__effect_calf_src_calf_buffer.h
$NetBSD: patch-plugins_ladspa__effect_calf_src_calf_buffer.h,v 1.1 2013/06/27 15:48:11 joerg Exp $

--- plugins/ladspa_effect/calf/src/calf/buffer.h.orig	2013-06-27 13:06:01.000000000 +0000
+++ plugins/ladspa_effect/calf/src/calf/buffer.h
@@ -153,7 +153,7 @@ void copy_buf(T &dest_buf, const U &src_
     typedef typename T::data_type data_type;
     data_type *dest = dest_buf.data();
     const data_type *src = src_buf.data();
-    int size = src.size();
+    int size = src->size();
     for (int i=0; i<size; i++) 
         *dest++ = (*src++) * scale + add;
 }

File Added: pkgsrc/audio/lmms/patches/Attic/patch-plugins_ladspa__effect_calf_src_calf_fixed__point.h
$NetBSD: patch-plugins_ladspa__effect_calf_src_calf_fixed__point.h,v 1.1 2013/06/27 15:48:11 joerg Exp $

--- plugins/ladspa_effect/calf/src/calf/fixed_point.h.orig	2013-06-27 13:17:57.000000000 +0000
+++ plugins/ladspa_effect/calf/src/calf/fixed_point.h
@@ -216,7 +216,7 @@ public:
     }
 
     template<class U, int UseBits> 
-    inline U lerp_table_lookup_int(U data[(1<<IntBits)+1]) const {
+    inline U lerp_table_lookup_int(U data[]) const {
         unsigned int pos = uipart();
         return lerp_by_fract_int<U, UseBits>(data[pos], data[pos+1]);
     }
@@ -224,19 +224,19 @@ public:
     /// Untested... I've started it to get a sin/cos readout for rotaryorgan, but decided to use table-less solution instead
     /// Do not assume it works, because it most probably doesn't
     template<class U, int UseBits> 
-    inline U lerp_table_lookup_int_shift(U data[(1<<IntBits)+1], unsigned int shift) {
+    inline U lerp_table_lookup_int_shift(U data[], unsigned int shift) {
         unsigned int pos = (uipart() + shift) & ((1 << IntBits) - 1);
         return lerp_by_fract_int<U, UseBits>(data[pos], data[pos+1]);
     }
 
     template<class U> 
-    inline U lerp_table_lookup_float(U data[(1<<IntBits)+1]) const {
+    inline U lerp_table_lookup_float(U data[]) const {
         unsigned int pos = uipart();
         return data[pos] + (data[pos+1]-data[pos]) * fpart_as_double();
     }
 
     template<class U> 
-    inline U lerp_table_lookup_float_mask(U data[(1<<IntBits)+1], unsigned int mask) const {
+    inline U lerp_table_lookup_float_mask(U data[], unsigned int mask) const {
         unsigned int pos = ui64part() & mask;
         // printf("full = %lld pos = %d + %f\n", value, pos, fpart_as_double());
         return data[pos] + (data[pos+1]-data[pos]) * fpart_as_double();

File Added: pkgsrc/audio/lmms/patches/Attic/patch-plugins_zynaddsubfx_fltk_FL_Fl__Widget.H
$NetBSD: patch-plugins_zynaddsubfx_fltk_FL_Fl__Widget.H,v 1.1 2013/06/27 15:48:11 joerg Exp $

--- plugins/zynaddsubfx/fltk/FL/Fl_Widget.H.orig	2013-06-27 13:20:50.000000000 +0000
+++ plugins/zynaddsubfx/fltk/FL/Fl_Widget.H
@@ -160,6 +160,7 @@ protected:
   /** flags possible values enumeration.
       See activate(), output(), visible(), changed(), set_visible_focus()
   */
+public:
   enum {
         INACTIVE        = 1<<0,   ///< the widget can't receive focus, and is disabled but potentially visible
         INVISIBLE       = 1<<1,   ///< the widget is not drawn, but can receive a few special events
@@ -184,6 +185,7 @@ protected:
         USERFLAG2       = 1<<30,  ///< reserved for 3rd party extensions
         USERFLAG1       = 1<<31   ///< reserved for 3rd party extensions
   };
+protected:
   void draw_box() const;
   void draw_box(Fl_Boxtype t, Fl_Color c) const;
   void draw_box(Fl_Boxtype t, int x,int y,int w,int h, Fl_Color c) const;

File Added: pkgsrc/audio/lmms/patches/Attic/patch-plugins_zynaddsubfx_src_Effects_Alienwah.cpp
$NetBSD: patch-plugins_zynaddsubfx_src_Effects_Alienwah.cpp,v 1.1 2013/06/27 15:48:11 joerg Exp $

--- plugins/zynaddsubfx/src/Effects/Alienwah.cpp.orig	2013-06-27 13:21:58.000000000 +0000
+++ plugins/zynaddsubfx/src/Effects/Alienwah.cpp
@@ -67,7 +67,7 @@ void Alienwah::out(const Stereo<float *>
         tmp = clfol * x + oldclfol * x1;
 
         out = tmp * oldl[oldk];
-        out.real() += (1 - fabs(fb)) * smp.l[i] * (1.0 - panning);
+        out.real(out.real() + (1 - fabs(fb)) * smp.l[i] * (1.0 - panning));
 
         oldl[oldk]  = out;
         REALTYPE l = out.real() * 10.0 * (fb + 0.1);
@@ -76,7 +76,7 @@ void Alienwah::out(const Stereo<float *>
         tmp = clfor * x + oldclfor * x1;
 
         out = tmp * oldr[oldk];
-        out.real() += (1 - fabs(fb)) * smp.r[i] * (1.0 - panning);
+        out.real(out.real() + (1 - fabs(fb)) * smp.r[i] * (1.0 - panning));
 
         oldr[oldk]  = out;
         REALTYPE r = out.real() * 10.0 * (fb + 0.1);