On 2017/07/27 08:06, Stuart Henderson wrote:
> CVSROOT: /cvs
> Module name: ports
> Changes by: st...@cvs.openbsd.org 2017/07/27 08:06:31
>
> Modified files:
> audio/calf : Makefile distinfo
> audio/calf/patches: patch-configure patch-src_calf_fixed_point_h
> audio/calf/pkg : PLIST
>
> Log message:
> update to calf-0.0.18.6, switch homepage to http://calf-studio-gear.org/,
> add patch from espie@ fixing clang build on 32-bit arches.
>
> there is also a calf-0.0.60, but that requires additional work.
>
Here's a start at calf-0.0.60 if anyone wants to pick it up.
Fails with "candidate template ignored: deduced conflicting types for
parameter '_Tp' ('float' vs. 'double')"
Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/calf/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile 27 Jul 2017 14:06:31 -0000 1.26
+++ Makefile 27 Jul 2017 14:10:44 -0000
@@ -3,7 +3,7 @@
ONLY_FOR_ARCHS = ${GCC4_ARCHS} ${CLANG_ARCHS}
COMMENT = CALF LADSPA plugins
-DISTNAME = calf-0.0.18.6
+DISTNAME = calf-0.0.60
CATEGORIES = audio
HOMEPAGE = http://calf-studio-gear.org/
@@ -24,7 +24,8 @@ MASTER_SITES = http://calf-studio-gear.
COMPILER = gcc
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic
-LIB_DEPENDS = audio/jack \
+LIB_DEPENDS = audio/fluidsynth \
+ audio/jack \
devel/libglade2
BUILD_DEPENDS += audio/ladspa
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/calf/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo 27 Jul 2017 14:06:31 -0000 1.3
+++ distinfo 27 Jul 2017 14:10:44 -0000
@@ -1,2 +1,2 @@
-SHA256 (calf-0.0.18.6.tar.gz) = MEcz77r8AMlIB6D41aVhJYk3aSMdtI+NaoibnKeUhg8=
-SIZE (calf-0.0.18.6.tar.gz) = 599207
+SHA256 (calf-0.0.60.tar.gz) = qecVZ0C3GzG1yBcwtXxWue0Dvz7/mJOLOkFsCcDjLgU=
+SIZE (calf-0.0.60.tar.gz) = 5881741
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/audio/calf/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 27 Jul 2017 14:06:31 -0000 1.2
+++ patches/patch-configure 27 Jul 2017 14:10:44 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-configure,v 1.2 2017/07/27 14:06:31 sthen Exp $
+$OpenBSD: patch-configure,v 1.1.1.1 2010/10/23 21:52:00 jakemsr Exp $
Index: configure
--- configure.orig
+++ configure
-@@ -15066,7 +15066,7 @@ if test "${ac_cv_lib_jack_jack_port_register+set}" = s
+@@ -15904,7 +15904,7 @@ if ${ac_cv_lib_jack_jack_port_register+:} false; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -11,12 +11,12 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -15493,7 +15493,7 @@ $as_echo "$set_enable_debug" >&6; }
- if test "$set_enable_debug" = "yes"; then
+@@ -16507,7 +16507,7 @@ if test "$set_enable_debug" = "yes"; then
CXXFLAGS="$CXXFLAGS -O0 -g -Wall"
else
+ # TODO: remove -finline options if clang is used
- CXXFLAGS="$CXXFLAGS -O3 -finline-functions -finline-functions-called-once
-Wall"
+ CXXFLAGS="$CXXFLAGS -finline-functions -finline-functions-called-once -Wall"
fi
- if test "$DSSI_FOUND" = "yes"; then
+ if test "$set_enable_sse" = "yes"; then
Index: patches/patch-src_benchmark_cpp
===================================================================
RCS file: patches/patch-src_benchmark_cpp
diff -N patches/patch-src_benchmark_cpp
--- patches/patch-src_benchmark_cpp 3 May 2017 09:46:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_benchmark_cpp,v 1.1 2017/05/03 09:46:40 espie Exp $
-
-Index: src/benchmark.cpp
---- src/benchmark.cpp.orig
-+++ src/benchmark.cpp
-@@ -25,6 +25,7 @@
- #include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include <config.h>
- #include <calf/audio_fx.h>
-
Index: patches/patch-src_calf_buffer_h
===================================================================
RCS file: patches/patch-src_calf_buffer_h
diff -N patches/patch-src_calf_buffer_h
--- patches/patch-src_calf_buffer_h 3 May 2017 09:46:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_calf_buffer_h,v 1.1 2017/05/03 09:46:40 espie Exp $
-right, this template never even compiled
-
-Index: src/calf/buffer.h
---- src/calf/buffer.h.orig
-+++ src/calf/buffer.h
-@@ -153,7 +153,7 @@ void copy_buf(T &dest_buf, const U &src_buf, T scale =
- 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;
- }
Index: patches/patch-src_calf_fixed_point_h
===================================================================
RCS file: patches/patch-src_calf_fixed_point_h
diff -N patches/patch-src_calf_fixed_point_h
--- patches/patch-src_calf_fixed_point_h 27 Jul 2017 14:06:31 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-src_calf_fixed_point_h,v 1.2 2017/07/27 14:06:31 sthen Exp $
-kill unneeded sizes
-
-Index: src/calf/fixed_point.h
---- src/calf/fixed_point.h.orig
-+++ src/calf/fixed_point.h
-@@ -216,7 +216,7 @@ template<class T, int FracBits> class fixed_point { (p
- }
-
- 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 @@ template<class T, int FracBits> class fixed_point { (p
- /// 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();
Index: patches/patch-src_calf_giface_h
===================================================================
RCS file: patches/patch-src_calf_giface_h
diff -N patches/patch-src_calf_giface_h
--- patches/patch-src_calf_giface_h 3 May 2017 09:46:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_calf_giface_h,v 1.1 2017/05/03 09:46:40 espie Exp $
-shut up warning (class/struct mismatch)
-
-Index: src/calf/giface.h
---- src/calf/giface.h.orig
-+++ src/calf/giface.h
-@@ -282,8 +282,9 @@ struct plugin_metadata_iface
- };
-
- /// Interface for host-GUI-plugin interaction (should be really split in two,
but ... meh)
--struct plugin_ctl_iface: public virtual plugin_metadata_iface
-+class plugin_ctl_iface: public virtual plugin_metadata_iface
- {
-+public:
- /// @return value of given parameter
- virtual float get_param_value(int param_no) = 0;
- /// Set value of given parameter
Index: patches/patch-src_calf_primitives_h
===================================================================
RCS file: /cvs/ports/audio/calf/patches/patch-src_calf_primitives_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_calf_primitives_h
--- patches/patch-src_calf_primitives_h 3 May 2017 09:46:40 -0000 1.3
+++ patches/patch-src_calf_primitives_h 27 Jul 2017 14:10:44 -0000
@@ -4,7 +4,7 @@ Err, yeah, let's return something
Index: src/calf/primitives.h
--- src/calf/primitives.h.orig
+++ src/calf/primitives.h
-@@ -373,6 +373,7 @@ class scheduler { (public)
+@@ -381,6 +381,7 @@ class scheduler { (public)
if (time < next_task)
return true;
do_tasks();
Index: patches/patch-src_ctl_curve_cpp
===================================================================
RCS file: patches/patch-src_ctl_curve_cpp
diff -N patches/patch-src_ctl_curve_cpp
--- patches/patch-src_ctl_curve_cpp 18 Nov 2014 10:17:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_ctl_curve_cpp,v 1.1 2014/11/18 10:17:17 brad Exp $
-
-Replace the malloc.h header with stdlib.h
-
---- src/ctl_curve.cpp.orig Mon Nov 3 22:43:27 2014
-+++ src/ctl_curve.cpp Mon Nov 3 22:48:57 2014
-@@ -20,8 +20,8 @@
- * Boston, MA 02111-1307, USA.
- */
- #include <calf/ctl_curve.h>
--#include <malloc.h>
- #include <stdint.h>
-+#include <stdlib.h>
- #include <math.h>
-
- static gpointer parent_class = NULL;
Index: patches/patch-src_ctl_keyboard_cpp
===================================================================
RCS file: patches/patch-src_ctl_keyboard_cpp
diff -N patches/patch-src_ctl_keyboard_cpp
--- patches/patch-src_ctl_keyboard_cpp 18 Nov 2014 10:17:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_ctl_keyboard_cpp,v 1.1 2014/11/18 10:17:17 brad Exp $
-
-Replace the malloc.h header with stdlib.h
-
---- src/ctl_keyboard.cpp.orig Mon Nov 3 22:44:21 2014
-+++ src/ctl_keyboard.cpp Mon Nov 3 22:45:31 2014
-@@ -22,7 +22,7 @@
- */
- #include <calf/ctl_keyboard.h>
- #include <stdint.h>
--#include <malloc.h>
-+#include <stdlib.h>
-
- static const int semitones_b[] = { 1, 3, -1, 6, 8, 10, -1 };
- static const int semitones_w[] = { 0, 2, 4, 5, 7, 9, 11 };
Index: patches/patch-src_ctl_knob_cpp
===================================================================
RCS file: patches/patch-src_ctl_knob_cpp
diff -N patches/patch-src_ctl_knob_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ctl_knob_cpp 27 Jul 2017 14:10:44 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Index: src/ctl_knob.cpp
+--- src/ctl_knob.cpp.orig
++++ src/ctl_knob.cpp
+@@ -22,12 +22,10 @@
+ #include <calf/ctl_knob.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <cairo/cairo.h>
+-#if !defined(__APPLE__)
+-#include <malloc.h>
+-#endif
+ #include <math.h>
+ #include <stdint.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <gdk/gdk.h>
+
+ ///////////////////////////////////////// knob
///////////////////////////////////////////////
Index: patches/patch-src_ctl_led_cpp
===================================================================
RCS file: patches/patch-src_ctl_led_cpp
diff -N patches/patch-src_ctl_led_cpp
--- patches/patch-src_ctl_led_cpp 18 Nov 2014 10:17:17 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_ctl_led_cpp,v 1.1 2014/11/18 10:17:17 brad Exp $
-
-Replace the malloc.h header with stdlib.h
-
---- src/ctl_led.cpp.orig Mon Nov 3 22:44:48 2014
-+++ src/ctl_led.cpp Mon Nov 3 22:45:51 2014
-@@ -21,7 +21,7 @@
- #include <calf/ctl_led.h>
- #include <math.h>
- #include <stdint.h>
--#include <malloc.h>
-+#include <stdlib.h>
-
- GtkWidget *
- calf_led_new()
Index: patches/patch-src_ctl_tube_cpp
===================================================================
RCS file: patches/patch-src_ctl_tube_cpp
diff -N patches/patch-src_ctl_tube_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_ctl_tube_cpp 27 Jul 2017 14:10:44 -0000
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Index: src/ctl_tube.cpp
+--- src/ctl_tube.cpp.orig
++++ src/ctl_tube.cpp
+@@ -21,12 +21,10 @@
+ #include "config.h"
+ #include <calf/ctl_tube.h>
+ #include <cairo/cairo.h>
+-#if !defined(__APPLE__)
+-#include <malloc.h>
+-#endif
+ #include <math.h>
+ #include <stdint.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <gdk/gdk.h>
+ #include <sys/time.h>
+
Index: patches/patch-src_osctlnet_cpp
===================================================================
RCS file: patches/patch-src_osctlnet_cpp
diff -N patches/patch-src_osctlnet_cpp
--- patches/patch-src_osctlnet_cpp 3 May 2017 09:46:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_osctlnet_cpp,v 1.1 2017/05/03 09:46:40 espie Exp $
-
-Index: src/osctlnet.cpp
---- src/osctlnet.cpp.orig
-+++ src/osctlnet.cpp
-@@ -26,6 +26,7 @@
- #include <stdlib.h>
- #include <sstream>
- #include <stdio.h>
-+#include <unistd.h>
- using namespace osctl;
- using namespace std;
-
Index: patches/patch-src_preset_cpp
===================================================================
RCS file: /cvs/ports/audio/calf/patches/patch-src_preset_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_preset_cpp
--- patches/patch-src_preset_cpp 3 May 2017 09:46:40 -0000 1.1
+++ patches/patch-src_preset_cpp 27 Jul 2017 14:10:44 -0000
@@ -3,11 +3,11 @@ $OpenBSD: patch-src_preset_cpp,v 1.1 201
Index: src/preset.cpp
--- src/preset.cpp.orig
+++ src/preset.cpp
-@@ -25,6 +25,7 @@
+@@ -26,6 +26,7 @@
#include <errno.h>
- #include <string.h>
+ #include <unistd.h>
#include <sys/stat.h>
+#include <unistd.h>
- #include <expat.h>
- #include <calf/preset.h>
+ using namespace std;
+ using namespace calf_plugins;
