Attachment #156890 for bug #200290




# $FreeBSD: head/audio/csound6/Makefile 385360 2015-05-04 00:33:14Z eadler $

PORTNAME=	csound
PORTVERSION=	6.05
CATEGORIES=	audio lang
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION}
PKGNAMESUFFIX=	6

USES=		bison cmake python:2
CMAKE_ARGS=	-DBUILD_CSOUNDVST:BOOL=OFF \
		-DBUILD_JAVA_INTERFACE:BOOL=OFF \
		-DBUILD_P5GLOVE_OPCODES:BOOL=OFF \
		-DBUILD_PD_CLASS:BOOL=OFF \
		-DBUILD_STK_OPCODES:BOOL=OFF \
		-DBUILD_TESTS:BOOL=OFF \
		-DBUILD_WIIMOTE_OPCODES:BOOL=OFF \
		-DPYTHON_MODULE_INSTALL_DIR:PATH="${PYTHONPREFIX_SITELIBDIR}"
USE_LDCONFIG=	yes
SSP_UNSAFE=	yes


CONFLICTS=		csound-5.*
CONFLICTS_INSTALL=	outguess-*

OPTIONS_DEFINE=		ALSA CURL DSSI FLTK FLUIDSYNTH HDF5 JACK LUA NLS \
			OPENMP OSC PNG PORTAUDIO PULSEAUDIO
OPTIONS_DEFAULT=	FLTK OPENMP
OPTIONS_SUB=		yes

FLUIDSYNTH_DESC=	Building FluidSynth opcodes
FLUIDSYNTH_LIB_DEPENDS=	libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
FLUIDSYNTH_CMAKE_OFF=	-DBUILD_FLUID_OPCODES:BOOL=OFF
HDF5_DESC=		Build HDF5 read/write opcodes
HDF5_LIB_DEPENDS=	libhdf5.so:${PORTSDIR}/science/hdf5
HDF5_CMAKE_OFF=		-DBUILD_HDF5_OPCODES:BOOL=OFF
JACK_DESC=		Build Jack I/O module and opcodes
JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
JACK_CMAKE_OFF=		-DBUILD_JACK_OPCODES:BOOL=OFF \

			-DBUILD_LUA_INTERFACE:BOOL=OFF \
			-DBUILD_LUA_OPCODES:BOOL=OFF
NLS_USES=		gettext
NLS_CMAKE_OFF=		-DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH="" \
			-DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH="" \
			-DLIBINTL_LIBRARY:FILEPATH="" \
			-DUSE_GETTEXT:BOOL=OFF
OPENMP_USES=		compiler:gcc-c++11-lib
OPENMP_USES_OFF=	compiler:c++11-lib
OPENMP_CMAKE_OFF=	-DUSE_OPEN_MP:BOOL=OFF
OSC_DESC=		Build OSC opcodes
OSC_LIB_DEPENDS=	liblo.so:${PORTSDIR}/audio/liblo
OSC_CMAKE_OFF=		-DBUILD_OSC_OPCODES:BOOL=OFF
PNG_DESC=		Build Image opcodes
PNG_LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
PNG_CMAKE_OFF=		-DBUILD_IMAGE_OPCODES:BOOL=OFF
PORTAUDIO_DESC=		Build PortAudio I/O module
PORTAUDIO_LIB_DEPENDS=	libportaudio.so.2:${PORTSDIR}/audio/portaudio2
PORTAUDIO_CMAKE_ON=	-DPORTAUDIO_INCLUDE_PATH:PATH="${LOCALBASE}/include/portaudio2" \
			-DPORTAUDIO_LIBRARY:FILEPATH="${LOCALBASE}/lib/portaudio2/libportaudio.so"
			-DPORTAUDIO_LIBRARY:STRING="${LOCALBASE}/lib/portaudio2/libportaudio.so"
PORTAUDIO_CMAKE_OFF=	-DUSE_PORTAUDIO:BOOL=OFF
PULSEAUDIO_DESC=	Build PulseAudio I/O module
PULSEAUDIO_LIB_DEPENDS=	libpulse-simple.so:${PORTSDIR}/audio/pulseaudio

		 s| dl)|)|' \
		${WRKSRC}/Opcodes/CMakeLists.txt
	@${REINPLACE_CMD} -e \
		'/CMAKE_SYSTEM_NAME/s|"Linux"|"${OPSYS}"|' \
		 s|--{WINSOUND_H}|$${WINSOUND_H}|' \
		${WRKSRC}/frontends/CMakeLists.txt
	@${REINPLACE_CMD} -e \
		's| mixer)| csmixer)|' \
		${WRKSRC}/util/CMakeLists.txt
	@${REINPLACE_CMD} -e \
		's|_IS_GNUCC)|_IS_GNUCC OR __COMPILER_CLANG)|' \
		${WRKSRC}/util1/CMakeLists.txt

post-install:
	@${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6

Lines 1-2 Link Here

(-)audio/csound6/distinfo (-2 / +2 lines)
1	SHA256 (csound/Csound6.04.tar.gz) = 0ff0203b87d10779dca962292a407e15ab0b284b558c9c63f892b74ed1e06080	1	SHA256 (csound/Csound6.05.tar.gz) = 0d0ab4c1804265f4947e07c5e41ee72bc1a122b873bd77b9e7179f4c4db43a28
2	SIZE (csound/Csound6.04.tar.gz) = 23959744	2	SIZE (csound/Csound6.05.tar.gz) = 26208635

Lines 1-6 Link Here

(-)audio/csound6/files/patch-H__remote.h (-2 / +2 lines)
1	--- H/remote.h.orig	1	--- H/remote.h.orig 2015-04-25 19:06:22 UTC
2	+++ H/remote.h	2	+++ H/remote.h
3	@@ -37,7 +37,10 @@	3	@@ -42,7 +42,10 @@
4	#ifdef MACOSX	4	#ifdef MACOSX
5	#include <net/if.h>	5	#include <net/if.h>
6	#endif	6	#endif




--- InOut/rtalsa.c.orig	2015-04-25 19:06:22 UTC
+++ InOut/rtalsa.c
@@ -23,6 +23,7 @@
     02111-1307 USA
 */

 #ifndef _ISOC99_SOURCE
 #define _ISOC99_SOURCE 1
 #endif
@@ -32,6 +33,7 @@
 #ifndef _BSD_SOURCE
 #define _BSD_SOURCE 1
 #endif
+*/
 
 #include "csdl.h"
 
@@ -50,6 +52,8 @@
 #include <signal.h>
 #include <sys/mman.h>
 #include <sys/resource.h>

Lines 1-5 Link Here

(-)audio/csound6/files/patch-Opcodes-urandom.c (-2 / +2 lines)
1	--- Opcodes/urandom.c.old 2011-01-30 02:14:59.000000000 -0600	1	--- Opcodes/urandom.c.orig 2015-04-25 19:06:23 UTC
2	+++ Opcodes/urandom.c 2011-01-30 02:15:08.000000000 -0600	2	+++ Opcodes/urandom.c
3	@@ -22,7 +22,6 @@	3	@@ -22,7 +22,6 @@
4	*/	4	*/
5		5




--- Top/csound.c.orig	2015-04-25 19:06:23 UTC
+++ Top/csound.c
@@ -60,10 +60,13 @@
 #include "cs_par_dispatch.h"

 #if defined(USE_OPENMP)
 #include <omp.h>
 #endif /* USE_OPENMP */
@@ -3495,7 +3498,7 @@ void csoundNotifyFileOpened(CSOUND* csou
 /* ------------------------------------ */
 
 #if defined(HAVE_RDTSC)
-#if !(defined(LINUX) && defined(__GNUC__) && defined(__i386__))

 #undef HAVE_RDTSC
 #endif
 #endif
@@ -3508,6 +3511,13 @@ static double timeResolutionSeconds = -1
 static int getTimeResolution(void)
 {
 #if defined(HAVE_RDTSC)

     FILE    *f;
     char    buf[256];
 
@@ -3543,9 +3553,14 @@ static int getTimeResolution(void)
       }
     }
     fclose(f);

Lines 1-4 Link Here

(-)audio/csound6/files/patch-frontends__CsoundAC__ChordSpace.hpp (-2 / +2 lines)
1	--- frontends/CsoundAC/ChordSpace.hpp.orig	1	--- frontends/CsoundAC/ChordSpace.hpp.orig 2015-04-25 19:06:23 UTC
2	+++ frontends/CsoundAC/ChordSpace.hpp	2	+++ frontends/CsoundAC/ChordSpace.hpp
3	@@ -29,6 +29,7 @@	3	@@ -29,6 +29,7 @@
4	#include <climits>	4	#include <climits>
Lines 8-14 Link Here
8	#include <eigen3/Eigen/Dense>	8	#include <eigen3/Eigen/Dense>
9	#include "Event.hpp"	9	#include "Event.hpp"
10	#include <iostream>	10	#include <iostream>
11	@@ -545,7 +546,7 @@	11	@@ -554,7 +555,7 @@ public:
12	char buffer[0x1000];	12	char buffer[0x1000];
13	std::stringstream stream;	13	std::stringstream stream;
14	for (size_t voice = 0; voice < voices(); ++voice) {	14	for (size_t voice = 0; voice < voices(); ++voice) {




--- frontends/CsoundAC/Composition.cpp.orig	2015-04-25 19:06:23 UTC
+++ frontends/CsoundAC/Composition.cpp
@@ -22,6 +22,7 @@
 #endif

 #include <cstdlib>
 #include <map>
 
@@ -289,7 +290,7 @@ namespace csound
   int Composition::normalizeOutputSoundfile(double levelDb)
   {
     char buffer[0x100];

                   0x100,
                   "sox %s -V3 -b 32 -e floating-point %s gain -n %f\n",
                   getOutputSoundfileName().c_str(),
@@ -307,7 +308,7 @@ namespace csound
   int Composition::translateToCdAudio(double levelDb)
   {
     char buffer[0x100];

                   getOutputSoundfileName().c_str(),
                   getCdSoundfileName().c_str(),
                   levelDb);
@@ -323,7 +324,7 @@ namespace csound
   int Composition::translateToMp3(double bitrate, double levelDb)
   {
     char buffer[0x100];

Return to bug 200290

Lines 2-8 Link Here

(-)audio/csound6/Makefile (-17 / +18 lines)
2	# $FreeBSD: head/audio/csound6/Makefile 385360 2015-05-04 00:33:14Z eadler $	2	# $FreeBSD: head/audio/csound6/Makefile 385360 2015-05-04 00:33:14Z eadler $
3		3
4	PORTNAME= csound	4	PORTNAME= csound
5	PORTVERSION= 6.04	5	PORTVERSION= 6.05
6	CATEGORIES= audio lang	6	CATEGORIES= audio lang
7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION}
8	PKGNAMESUFFIX= 6	8	PKGNAMESUFFIX= 6
Lines 23-32 Link Here
23	USES= bison cmake python:2	23	USES= bison cmake python:2
24	CMAKE_ARGS= -DBUILD_CSOUNDVST:BOOL=OFF \	24	CMAKE_ARGS= -DBUILD_CSOUNDVST:BOOL=OFF \
25	-DBUILD_JAVA_INTERFACE:BOOL=OFF \	25	-DBUILD_JAVA_INTERFACE:BOOL=OFF \
		26	-DBUILD_P5GLOVE_OPCODES:BOOL=OFF \
26	-DBUILD_PD_CLASS:BOOL=OFF \	27	-DBUILD_PD_CLASS:BOOL=OFF \
27	-DBUILD_STK_OPCODES:BOOL=OFF \	28	-DBUILD_STK_OPCODES:BOOL=OFF \
28	-DBUILD_TESTS:BOOL=OFF \	29	-DBUILD_TESTS:BOOL=OFF \
29	-DPYTHON_MODULE_INSTALL_DIR:STRING="${PYTHONPREFIX_SITELIBDIR}"	30	-DBUILD_WIIMOTE_OPCODES:BOOL=OFF \
		31	-DPYTHON_MODULE_INSTALL_DIR:PATH="${PYTHONPREFIX_SITELIBDIR}"
30	USE_LDCONFIG= yes	32	USE_LDCONFIG= yes
31	SSP_UNSAFE= yes	33	SSP_UNSAFE= yes
32		34
Lines 38-44 Link Here
38	CONFLICTS= csound-5.*	40	CONFLICTS= csound-5.*
39	CONFLICTS_INSTALL= outguess-*	41	CONFLICTS_INSTALL= outguess-*
40		42
41	OPTIONS_DEFINE= ALSA CURL DSSI FLTK FLUIDSYNTH JACK LUA NLS \	43	OPTIONS_DEFINE= ALSA CURL DSSI FLTK FLUIDSYNTH HDF5 JACK LUA NLS \
42	OPENMP OSC PNG PORTAUDIO PULSEAUDIO	44	OPENMP OSC PNG PORTAUDIO PULSEAUDIO
43	OPTIONS_DEFAULT= FLTK OPENMP	45	OPTIONS_DEFAULT= FLTK OPENMP
44	OPTIONS_SUB= yes	46	OPTIONS_SUB= yes
Lines 63-68 Link Here
63	FLUIDSYNTH_DESC= Building FluidSynth opcodes	65	FLUIDSYNTH_DESC= Building FluidSynth opcodes
64	FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth	66	FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth
65	FLUIDSYNTH_CMAKE_OFF= -DBUILD_FLUID_OPCODES:BOOL=OFF	67	FLUIDSYNTH_CMAKE_OFF= -DBUILD_FLUID_OPCODES:BOOL=OFF
		68	HDF5_DESC= Build HDF5 read/write opcodes
		69	HDF5_LIB_DEPENDS= libhdf5.so:${PORTSDIR}/science/hdf5
		70	HDF5_CMAKE_OFF= -DBUILD_HDF5_OPCODES:BOOL=OFF
66	JACK_DESC= Build Jack I/O module and opcodes	71	JACK_DESC= Build Jack I/O module and opcodes
67	JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack	72	JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
68	JACK_CMAKE_OFF= -DBUILD_JACK_OPCODES:BOOL=OFF \	73	JACK_CMAKE_OFF= -DBUILD_JACK_OPCODES:BOOL=OFF \
Lines 73-95 Link Here
73	-DBUILD_LUA_INTERFACE:BOOL=OFF \	78	-DBUILD_LUA_INTERFACE:BOOL=OFF \
74	-DBUILD_LUA_OPCODES:BOOL=OFF	79	-DBUILD_LUA_OPCODES:BOOL=OFF
75	NLS_USES= gettext	80	NLS_USES= gettext
76	NLS_CMAKE_OFF= -DGETTEXT_MSGFMT_EXECUTABLE="" \	81	NLS_CMAKE_OFF= -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH="" \
77	-DLIBINTL_HEADER:STRING="" \	82	-DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH="" \
78	-DLIBINTL_LIBRARY:STRING="" \	83	-DLIBINTL_LIBRARY:FILEPATH="" \
79	-DUSE_GETTEXT:BOOL=OFF	84	-DUSE_GETTEXT:BOOL=OFF
80	OPENMP_USES= compiler:openmp	85	OPENMP_USES= compiler:gcc-c++11-lib
		86	OPENMP_USES_OFF= compiler:c++11-lib
81	OPENMP_CMAKE_OFF= -DUSE_OPEN_MP:BOOL=OFF	87	OPENMP_CMAKE_OFF= -DUSE_OPEN_MP:BOOL=OFF
82	OSC_DESC= Build OSC opcodes	88	OSC_DESC= Build OSC opcodes
83	OSC_LIB_DEPENDS= liblo.so:${PORTSDIR}/audio/liblo	89	OSC_LIB_DEPENDS= liblo.so:${PORTSDIR}/audio/liblo
84	OSC_CMAKE_OFF= -DBUILD_OSC_OPCODES:BOOL=OFF	90	OSC_CMAKE_OFF= -DBUILD_OSC_OPCODES:BOOL=OFF
85	PNG_DESC= Build Image opcodes	91	PNG_DESC= Build Image opcodes
86	PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png	92	PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png
87	PNG_CMAKE_OFF= -DBUILD_IMAGE_OPCODES:BOOL=OFF	93	PNG_CMAKE_OFF= -DBUILD_IMAGE_OPCODES:BOOL=OFF
88	PORTAUDIO_DESC= Build PortAudio I/O module	94	PORTAUDIO_DESC= Build PortAudio I/O module
89	PORTAUDIO_BUILD_DEPENDS=portaudio2>0:${PORTSDIR}/audio/portaudio2	95	PORTAUDIO_LIB_DEPENDS= libportaudio.so.2:${PORTSDIR}/audio/portaudio2
90	PORTAUDIO_RUN_DEPENDS= portaudio2>0:${PORTSDIR}/audio/portaudio2	96	PORTAUDIO_CMAKE_ON= -DPORTAUDIO_INCLUDE_PATH:PATH="${LOCALBASE}/include/portaudio2" \
91	PORTAUDIO_CMAKE_ON= -DPORTAUDIO_INCLUDE_PATH:STRING="${LOCALBASE}/include/portaudio2" \	97	-DPORTAUDIO_LIBRARY:FILEPATH="${LOCALBASE}/lib/portaudio2/libportaudio.so"
92	-DPORTAUDIO_LIBRARY:STRING="${LOCALBASE}/lib/portaudio2/libportaudio.so"
93	PORTAUDIO_CMAKE_OFF= -DUSE_PORTAUDIO:BOOL=OFF	98	PORTAUDIO_CMAKE_OFF= -DUSE_PORTAUDIO:BOOL=OFF
94	PULSEAUDIO_DESC= Build PulseAudio I/O module	99	PULSEAUDIO_DESC= Build PulseAudio I/O module
95	PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:${PORTSDIR}/audio/pulseaudio	100	PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:${PORTSDIR}/audio/pulseaudio
Lines 129-143 Link Here
129	s\| dl)\|)\|' \	134	s\| dl)\|)\|' \
130	${WRKSRC}/Opcodes/CMakeLists.txt	135	${WRKSRC}/Opcodes/CMakeLists.txt
131	@${REINPLACE_CMD} -e \	136	@${REINPLACE_CMD} -e \
132	'/CMAKE_SYSTEM_NAME/s\|"Linux"\|"${OPSYS}"\| ; \	137	'/CMAKE_SYSTEM_NAME/s\|"Linux"\|"${OPSYS}"\|' \
133	s\|--{WINSOUND_H}\|$${WINSOUND_H}\|' \
134	${WRKSRC}/frontends/CMakeLists.txt	138	${WRKSRC}/frontends/CMakeLists.txt
135	@${REINPLACE_CMD} -e \	139	@${REINPLACE_CMD} -e \
136	's\| mixer)\| csmixer)\|' \	140	's\| mixer)\| csmixer)\|' \
137	${WRKSRC}/util/CMakeLists.txt	141	${WRKSRC}/util/CMakeLists.txt
138	@${REINPLACE_CMD} -e \
139	's\|_IS_GNUCC)\|_IS_GNUCC OR __COMPILER_CLANG)\|' \
140	${WRKSRC}/util1/CMakeLists.txt
141		142
142	post-install:	143	post-install:
143	@${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6	144	@${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6

Lines 1-5 Link Here

(-)audio/csound6/files/patch-InOut-rtalsa.c (-6 / +6 lines)
1	--- InOut/rtalsa.c.orig 2011-12-22 19:41:53.000000000 +0900	1	--- InOut/rtalsa.c.orig 2015-04-25 19:06:22 UTC
2	+++ InOut/rtalsa.c 2011-12-27 23:53:00.000000000 +0900	2	+++ InOut/rtalsa.c
3	@@ -23,6 +23,7 @@	3	@@ -23,6 +23,7 @@
4	02111-1307 USA	4	02111-1307 USA
5	*/	5	*/
Lines 8-22 Link Here
8	#ifndef _ISOC99_SOURCE	8	#ifndef _ISOC99_SOURCE
9	#define _ISOC99_SOURCE 1	9	#define _ISOC99_SOURCE 1
10	#endif	10	#endif
11	@@ -39,6 +40,7 @@	11	@@ -32,6 +33,7 @@
12	#ifndef _POSIX_C_SOURCE	12	#ifndef _BSD_SOURCE
13	#define _POSIX_C_SOURCE 1	13	#define _BSD_SOURCE 1
14	#endif	14	#endif
15	+*/	15	+*/
16		16
17	#include "csdl.h"	17	#include "csdl.h"
18		18
19	@@ -57,6 +59,8 @@	19	@@ -50,6 +52,8 @@
20	#include <signal.h>	20	#include <signal.h>
21	#include <sys/mman.h>	21	#include <sys/mman.h>
22	#include <sys/resource.h>	22	#include <sys/resource.h>

Lines 1-4 Link Here

(-)audio/csound6/files/patch-Top-csound.c (-5 / +5 lines)
1	--- Top/csound.c.orig	1	--- Top/csound.c.orig 2015-04-25 19:06:23 UTC
2	+++ Top/csound.c	2	+++ Top/csound.c
3	@@ -60,10 +60,13 @@	3	@@ -60,10 +60,13 @@
4	#include "cs_par_dispatch.h"	4	#include "cs_par_dispatch.h"
Lines 15-22 Link Here
15	#if defined(USE_OPENMP)	15	#if defined(USE_OPENMP)
16	#include <omp.h>	16	#include <omp.h>
17	#endif /* USE_OPENMP */	17	#endif /* USE_OPENMP */
18	@@ -3469,7 +3473,7 @@	18	@@ -3495,7 +3498,7 @@ void csoundNotifyFileOpened(CSOUND* csou
19	/* ------------------------------------ */	19	/* ------------------------------------ */
20		20
21	#if defined(HAVE_RDTSC)	21	#if defined(HAVE_RDTSC)
22	-#if !(defined(LINUX) && defined(__GNUC__) && defined(__i386__))	22	-#if !(defined(LINUX) && defined(__GNUC__) && defined(__i386__))
Lines 24-30 Link Here
24	#undef HAVE_RDTSC	24	#undef HAVE_RDTSC
25	#endif	25	#endif
26	#endif	26	#endif
27	@@ -3482,6 +3486,13 @@	27	@@ -3508,6 +3511,13 @@ static double timeResolutionSeconds = -1
28	static int getTimeResolution(void)	28	static int getTimeResolution(void)
29	{	29	{
30	#if defined(HAVE_RDTSC)	30	#if defined(HAVE_RDTSC)
Lines 38-44 Link Here
38	FILE *f;	38	FILE *f;
39	char buf[256];	39	char buf[256];
40		40
41	@@ -3517,9 +3528,14 @@	41	@@ -3543,9 +3553,14 @@ static int getTimeResolution(void)
42	}	42	}
43	}	43	}
44	fclose(f);	44	fclose(f);

Lines 1-4 Link Here

(-)audio/csound6/files/patch-frontends__CsoundAC__Composition.cpp (-4 / +4 lines)
1	--- frontends/CsoundAC/Composition.cpp.orig	1	--- frontends/CsoundAC/Composition.cpp.orig 2015-04-25 19:06:23 UTC
2	+++ frontends/CsoundAC/Composition.cpp	2	+++ frontends/CsoundAC/Composition.cpp
3	@@ -22,6 +22,7 @@	3	@@ -22,6 +22,7 @@
4	#endif	4	#endif
Lines 8-14 Link Here
8	#include <cstdlib>	8	#include <cstdlib>
9	#include <map>	9	#include <map>
10		10
11	@@ -289,7 +290,7 @@	11	@@ -289,7 +290,7 @@ namespace csound
12	int Composition::normalizeOutputSoundfile(double levelDb)	12	int Composition::normalizeOutputSoundfile(double levelDb)
13	{	13	{
14	char buffer[0x100];	14	char buffer[0x100];
Lines 17-23 Link Here
17	0x100,	17	0x100,
18	"sox %s -V3 -b 32 -e floating-point %s gain -n %f\n",	18	"sox %s -V3 -b 32 -e floating-point %s gain -n %f\n",
19	getOutputSoundfileName().c_str(),	19	getOutputSoundfileName().c_str(),
20	@@ -307,7 +308,7 @@	20	@@ -307,7 +308,7 @@ namespace csound
21	int Composition::translateToCdAudio(double levelDb)	21	int Composition::translateToCdAudio(double levelDb)
22	{	22	{
23	char buffer[0x100];	23	char buffer[0x100];
Lines 26-32 Link Here
26	getOutputSoundfileName().c_str(),	26	getOutputSoundfileName().c_str(),
27	getCdSoundfileName().c_str(),	27	getCdSoundfileName().c_str(),
28	levelDb);	28	levelDb);
29	@@ -323,7 +324,7 @@	29	@@ -323,7 +324,7 @@ namespace csound
30	int Composition::translateToMp3(double bitrate, double levelDb)	30	int Composition::translateToMp3(double bitrate, double levelDb)
31	{	31	{
32	char buffer[0x100];	32	char buffer[0x100];

Lines 70-75 Link Here

(-)audio/csound6/pkg-plist (+2 lines)
70	lib/csound/plugins-6.0/libfareygen.so	70	lib/csound/plugins-6.0/libfareygen.so
71	%%FLUIDSYNTH%%lib/csound/plugins-6.0/libfluidOpcodes.so	71	%%FLUIDSYNTH%%lib/csound/plugins-6.0/libfluidOpcodes.so
72	lib/csound/plugins-6.0/libfractalnoise.so	72	lib/csound/plugins-6.0/libfractalnoise.so
		73	%%HDF5%%lib/csound/plugins-6.0/libhdf5.so
73	%%PNG%%lib/csound/plugins-6.0/libimage.so	74	%%PNG%%lib/csound/plugins-6.0/libimage.so
74	lib/csound/plugins-6.0/libipmidi.so	75	lib/csound/plugins-6.0/libipmidi.so
75	%%JACK%%lib/csound/plugins-6.0/libjackTransport.so	76	%%JACK%%lib/csound/plugins-6.0/libjackTransport.so
Lines 77-82 Link Here
77	lib/csound/plugins-6.0/liblinear_algebra.so	78	lib/csound/plugins-6.0/liblinear_algebra.so
78	lib/csound/plugins-6.0/libmixer.so	79	lib/csound/plugins-6.0/libmixer.so
79	%%OSC%%lib/csound/plugins-6.0/libosc.so	80	%%OSC%%lib/csound/plugins-6.0/libosc.so
		81	lib/csound/plugins-6.0/libpadsynth.so
80	lib/csound/plugins-6.0/libplaterev.so	82	lib/csound/plugins-6.0/libplaterev.so
81	lib/csound/plugins-6.0/libpy.so	83	lib/csound/plugins-6.0/libpy.so
82	%%ALSA%%lib/csound/plugins-6.0/librtalsa.so	84	%%ALSA%%lib/csound/plugins-6.0/librtalsa.so