diff options
Diffstat (limited to 'audio')
6 files changed, 98 insertions, 2 deletions
diff --git a/audio/lmms/Makefile b/audio/lmms/Makefile index 5f319e295d4..3a25412391d 100644 --- a/audio/lmms/Makefile +++ b/audio/lmms/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2013/06/17 15:16:47 ryoon Exp $ +# $NetBSD: Makefile,v 1.30 2013/06/27 15:48:11 joerg Exp $ # DISTNAME= lmms-0.4.15 @@ -44,6 +44,7 @@ BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.11 .include "../../math/fftwf/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" +.include "../../x11/qt4-tools/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/lmms/distinfo b/audio/lmms/distinfo index 498c9465646..78df9268a63 100644 --- a/audio/lmms/distinfo +++ b/audio/lmms/distinfo @@ -1,11 +1,15 @@ -$NetBSD: distinfo,v 1.5 2013/06/17 15:16:47 ryoon Exp $ +$NetBSD: distinfo,v 1.6 2013/06/27 15:48:11 joerg Exp $ SHA1 (lmms-0.4.15.tar.bz2) = 7dc0a616291fa6e5f917e0e6f926e4c427b3c16c RMD160 (lmms-0.4.15.tar.bz2) = d660769cda53e0d6ca15f2e578478e8f27dbb851 Size (lmms-0.4.15.tar.bz2) = 14211150 bytes SHA1 (patch-CMakeLists.txt) = e48c68a6d96df7dbdb760c5d8414d262262ffd8a +SHA1 (patch-plugins_ladspa__effect_calf_src_calf_buffer.h) = b9d6f50680775cecbe0f485cf8f9c8d6172568a3 +SHA1 (patch-plugins_ladspa__effect_calf_src_calf_fixed__point.h) = a77ecd2ab667aa3dbd436878b568ed499da7114b +SHA1 (patch-plugins_zynaddsubfx_fltk_FL_Fl__Widget.H) = 000762568741d957bf342b23c4eeb6353fc574db SHA1 (patch-plugins_zynaddsubfx_fltk_configh.cmake.in) = 332db7257adba4a2b884bf68065f067f02734409 SHA1 (patch-plugins_zynaddsubfx_fltk_src_numericsort.c) = 3461f6e532d4d47c27f0d36daf1deb61922b4fc0 SHA1 (patch-plugins_zynaddsubfx_fltk_src_scandir.c) = 2ca4b691b1be385ca34f04c634e04126dc2efbd9 +SHA1 (patch-plugins_zynaddsubfx_src_Effects_Alienwah.cpp) = 89babf5b6a06899dfbaa8201383d9a20b78fabe8 SHA1 (patch-src_core_audio_AudioAlsa.cpp) = 7fe90c5be3f4a45a67b9ca87bcd26cd074ad2976 SHA1 (patch-src_core_audio_AudioOss.cpp) = 13d1f848a8ba94afa91d8ebee6326d246cf1a690 diff --git a/audio/lmms/patches/patch-plugins_ladspa__effect_calf_src_calf_buffer.h b/audio/lmms/patches/patch-plugins_ladspa__effect_calf_src_calf_buffer.h new file mode 100644 index 00000000000..de4fdee26ef --- /dev/null +++ b/audio/lmms/patches/patch-plugins_ladspa__effect_calf_src_calf_buffer.h @@ -0,0 +1,13 @@ +$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; + } diff --git a/audio/lmms/patches/patch-plugins_ladspa__effect_calf_src_calf_fixed__point.h b/audio/lmms/patches/patch-plugins_ladspa__effect_calf_src_calf_fixed__point.h new file mode 100644 index 00000000000..a10b73ee285 --- /dev/null +++ b/audio/lmms/patches/patch-plugins_ladspa__effect_calf_src_calf_fixed__point.h @@ -0,0 +1,36 @@ +$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(); diff --git a/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_FL_Fl__Widget.H b/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_FL_Fl__Widget.H new file mode 100644 index 00000000000..11504f2d99f --- /dev/null +++ b/audio/lmms/patches/patch-plugins_zynaddsubfx_fltk_FL_Fl__Widget.H @@ -0,0 +1,20 @@ +$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; diff --git a/audio/lmms/patches/patch-plugins_zynaddsubfx_src_Effects_Alienwah.cpp b/audio/lmms/patches/patch-plugins_zynaddsubfx_src_Effects_Alienwah.cpp new file mode 100644 index 00000000000..96255b83dd0 --- /dev/null +++ b/audio/lmms/patches/patch-plugins_zynaddsubfx_src_Effects_Alienwah.cpp @@ -0,0 +1,22 @@ +$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); |