View | Details | Raw Unified | Return to bug 168588
Collapse All | Expand All

(-)audio/csound/Makefile (-18 / +18 lines)
Lines 6-15 Link Here
6
#
6
#
7
7
8
PORTNAME=	csound
8
PORTNAME=	csound
9
PORTVERSION=	5.17.6
9
PORTVERSION=	5.17.11
10
PORTREVISION=	1
11
CATEGORIES=	audio lang
10
CATEGORIES=	audio lang
12
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R} \
11
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION} \
13
		SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
12
		SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
14
DISTNAME=	${PORTNAME:S/c/C/}${PORTVERSION}
13
DISTNAME=	${PORTNAME:S/c/C/}${PORTVERSION}
15
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
14
DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
Lines 27-37 Link Here
27
		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
26
		${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
28
LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
27
LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
29
28
30
OPTIONS_DEFINE=	ALSA LADSPA FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO FLTK
29
OPTIONS_DEFINE=	ALSA DSSI FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO FLTK
31
OPTIONS_DEFAULT=	FLTK
30
OPTIONS_DEFAULT=FLTK
32
FLTK_DESC=		Build FLTK plugin and GUI
31
ALSA_DESC=	Build ALSA I/O module
33
OSC_DESC=		Build OSC opcodes
32
DSSI_DESC=	Build DSSI/LADSPA host opcodes
34
FLUIDSYNTH_DESC=	Build FluidSynth opcodes
33
FLUIDSYNTH_DESC=Building FluidSynth opcodes
34
JACK_DESC=	Build Jack I/O module and opcodes
35
OSC_DESC=	Build OSC opcodes
36
PORTAUDIO_DESC=	Build the PortAudio I/O module
37
PULSEAUDIO_DESC=Build the PulseAudio I/O module
38
FLTK_DESC=	Build FLTK plugin and GUI
35
39
36
CONFLICTS_INSTALL=	outguess-*
40
CONFLICTS_INSTALL=	outguess-*
37
41
Lines 64-77 Link Here
64
ALSA_H=		##alsa/asoundlib.h##
68
ALSA_H=		##alsa/asoundlib.h##
65
.endif
69
.endif
66
70
67
.if ${PORT_OPTIONS:MLADSPA}
71
.if ${PORT_OPTIONS:MDSSI}
68
BUILD_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
72
BUILD_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
69
RUN_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
73
RUN_DEPENDS+=	dssi>=0:${PORTSDIR}/audio/dssi
70
SCONS_ARGS+=	buildLADSPA=1
74
SCONS_ARGS+=	buildDSSI=1
71
PLIST_SUB+=	LADSPA=""
75
PLIST_SUB+=	DSSI=""
72
.else
76
.else
73
SCONS_ARGS+=	buildLADSPA=0
77
SCONS_ARGS+=	buildDSSI=0
74
PLIST_SUB+=	LADSPA="@comment "
78
PLIST_SUB+=	DSSI="@comment "
75
.endif
79
.endif
76
80
77
.if ${PORT_OPTIONS:MFLUIDSYNTH}
81
.if ${PORT_OPTIONS:MFLUIDSYNTH}
Lines 185-196 Link Here
185
		s| pthread | |" ${WRKSRC}/SConstruct
189
		s| pthread | |" ${WRKSRC}/SConstruct
186
	@${REINPLACE_CMD} -e "s|<portaudio.h>|<portaudio2/portaudio.h>|" \
190
	@${REINPLACE_CMD} -e "s|<portaudio.h>|<portaudio2/portaudio.h>|" \
187
		${WRKSRC}/InOut/rtpa.c
191
		${WRKSRC}/InOut/rtpa.c
188
	@${REINPLACE_CMD} -e "s|linux/if.h|sys/socket.h|" \
192
	@${REINPLACE_CMD} -e "s|linux/if.h|sys/types.h|" \
189
		${WRKSRC}/OOps/remote.c
193
		${WRKSRC}/OOps/remote.c
190
	@${REINPLACE_CMD} -e "s|values.h|limits.h|" \
191
		${WRKSRC}/Opcodes/cpumeter.c
192
	@${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|" \
193
		${WRKSRC}/frontends/CsoundAC/Counterpoint.hpp
194
194
195
post-install:
195
post-install:
196
	@${LN} -sf libcsound64.so.5 ${PREFIX}/lib/libcsound64.so
196
	@${LN} -sf libcsound64.so.5 ${PREFIX}/lib/libcsound64.so
(-)audio/csound/distinfo (-2 / +2 lines)
Lines 1-4 Link Here
1
SHA256 (csound/Csound5.17.6.tar.gz) = d161acddb4a419fc15097e4f508b7b4e09fadb25b72906cf4f485ca9415fe6d1
1
SHA256 (csound/Csound5.17.11.tar.gz) = a86595c4328b63e9b37205b40bf1441182a453451b0ea20558a7777dbc0380b7
2
SIZE (csound/Csound5.17.6.tar.gz) = 9132954
2
SIZE (csound/Csound5.17.11.tar.gz) = 9152189
3
SHA256 (csound/Csound5.17_manual_html.zip) = cad3ee307c801c972d9d5f626a79c88dddda6872d8a4af64dd4f3edfe7c0f626
3
SHA256 (csound/Csound5.17_manual_html.zip) = cad3ee307c801c972d9d5f626a79c88dddda6872d8a4af64dd4f3edfe7c0f626
4
SIZE (csound/Csound5.17_manual_html.zip) = 9621312
4
SIZE (csound/Csound5.17_manual_html.zip) = 9621312
(-)audio/csound/files/patch-H__sysdep.h (+26 lines)
Line 0 Link Here
1
--- H/sysdep.h.orig	2012-05-29 02:41:30.000000000 +0900
2
+++ H/sysdep.h	2012-05-31 11:19:28.000000000 +0900
3
@@ -96,7 +96,11 @@
4
   #define EXP exp
5
   #define LOG log
6
   #define LOG10 log10
7
+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
8
+  #define LOG2(x) (log(x) / log(2))
9
+#else
10
   #define LOG2 log2
11
+#endif
12
   #define POWER pow
13
   #define SQRT sqrt
14
   #define HYPOT hypot
15
@@ -122,7 +126,11 @@
16
   #define EXP expf
17
   #define LOG logf
18
   #define LOG10 log10f
19
+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
20
+  #define LOG2(x) (logf(x) / logf(2))
21
+#else
22
   #define LOG2 log2f
23
+#endif
24
   #define POWER powf
25
   #define SQRT sqrtf
26
   #define HYPOT hypotf
(-)audio/csound/files/patch-Opcodes__tl__fractalnoise.cpp (-18 lines)
Lines 1-18 Link Here
1
--- Opcodes/tl/fractalnoise.cpp.orig	2012-02-06 20:21:34.000000000 +0900
2
+++ Opcodes/tl/fractalnoise.cpp	2012-02-08 00:36:44.000000000 +0900
3
@@ -34,6 +34,7 @@
4
     return int(((unsigned int)x) >> n);
5
 }
6
 
7
+#if 0
8
 /* VECTOR INTRINSICS */
9
 
10
 inline void *aligned_calloc(size_t nmemb, size_t size)
11
@@ -41,6 +42,7 @@
12
     return (void*)((unsigned long)(calloc((nmemb*size)+15,
13
                                           (sizeof(char)))+15) & 0xfffffff0);
14
 }
15
+#endif
16
 
17
 /* ABSTRACT USER INTERFACE */
18
 
(-)audio/csound/pkg-plist (-1 / +1 lines)
Lines 53-59 Link Here
53
lib/csound/plugins64/libcontrol.so
53
lib/csound/plugins64/libcontrol.so
54
lib/csound/plugins64/libcs_date.so
54
lib/csound/plugins64/libcs_date.so
55
lib/csound/plugins64/libdoppler.so
55
lib/csound/plugins64/libdoppler.so
56
%%LADSPA%%lib/csound/plugins64/libdssi4cs.so
56
%%DSSI%%lib/csound/plugins64/libdssi4cs.so
57
lib/csound/plugins64/libfareygen.so
57
lib/csound/plugins64/libfareygen.so
58
%%FLUIDSYNTH%%lib/csound/plugins64/libfluidOpcodes.so
58
%%FLUIDSYNTH%%lib/csound/plugins64/libfluidOpcodes.so
59
lib/csound/plugins64/libfractalnoise.so
59
lib/csound/plugins64/libfractalnoise.so

Return to bug 168588