Index: head/audio/csound6/Makefile =================================================================== --- head/audio/csound6/Makefile (revision 400218) +++ head/audio/csound6/Makefile (revision 400219) @@ -1,141 +1,149 @@ # Created by: trevor # $FreeBSD$ PORTNAME= csound -PORTVERSION= 6.05 +PORTVERSION= 6.06 CATEGORIES= audio lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION} PKGNAMESUFFIX= 6 DISTNAME= ${PORTNAME:S/c/C/}${PORTVERSION} DIST_SUBDIR= csound MAINTAINER= ports@FreeBSD.org COMMENT= Sound synthesizer LICENSE= LGPL21 BUILD_DEPENDS= boost-libs>0:${PORTSDIR}/devel/boost-libs \ swig>2:${PORTSDIR}/devel/swig20 \ eigen>0:${PORTSDIR}/math/eigen3 \ gmm++>0:${PORTSDIR}/math/gmm++ -LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile +LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ + libsndfile.so:${PORTSDIR}/audio/libsndfile 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 CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message 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 ALSA_DESC= Build ALSA I/O module ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_CMAKE_OFF= -DUSE_ALSA:BOOL=OFF ALSA_PREVENTS= DSSI CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl CURL_CMAKE_OFF= -DUSE_CURL:BOOL=OFF DSSI_DESC= Build DSSI/LADSPA host opcodes DSSI_BUILD_DEPENDS= dssi>0:${PORTSDIR}/audio/dssi DSSI_LIB_DEPENDS= libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat DSSI_RUN_DEPENDS= dssi>0:${PORTSDIR}/audio/dssi DSSI_CMAKE_OFF= -DBUILD_DSSI_OPCODES:BOOL=OFF DSSI_CFLAGS= -isystem ${LOCALBASE}/include/dssi +DSSI_PREVENTS= ALSA FLTK_DESC= Build FLTK plugin and GUI FLTK_LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk FLTK_CMAKE_ON= -DBUILD_WINSOUND:BOOL=ON FLTK_CMAKE_OFF= -DBUILD_CSOUND_AC:BOOL=OFF \ -DBUILD_VIRTUAL_KEYBOARD:BOOL=OFF \ -DUSE_FLTK:BOOL=OFF 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 \ -DUSE_JACK:BOOL=OFF LUA_DESC= Build Lua Interface and opcodes LUA_LIB_DEPENDS= libluajit-5.1.so:${PORTSDIR}/lang/luajit LUA_CMAKE_OFF= -DBUILD_CSOUND_AC_LUA_INTERFACE: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:${PORTSDIR}/audio/portaudio PORTAUDIO_CMAKE_OFF= -DUSE_PORTAUDIO:BOOL=OFF PULSEAUDIO_DESC= Build PulseAudio I/O module PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CMAKE_OFF= -DUSE_PULSEAUDIO:BOOL=OFF .include .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex CMAKE_ARGS+= -DFLEX_EXECUTABLE:STRING="${LOCALBASE}/bin/flex" .endif post-patch: @${REINPLACE_CMD} -e \ '/-O3/s|^|#| ; \ /PYTHON_MODULE_INSTALL_DIR/s|^|#| ; \ /CMAKE_SYSTEM_NAME/s|"Linux"|"${OPSYS}"| ; \ s|(LIBINTL_LIBRARY OR LINUX)|(LIBINTL_LIBRARY)| ; \ s|(NOT LINUX)|(LINUX)| ; \ s|-D_GNU_SOURCE|| ; \ s| dl)|)|' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e \ 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/InOut/CMakeLists.txt @${REINPLACE_CMD} -e \ 's|/usr/include/Python2.7|${PYTHON_INCLUDEDIR}| ; \ s|/usr/local|${LOCALBASE}| ; \ /linuxjoystick/s|^|#| ; \ s| dl)|)|' \ ${WRKSRC}/Opcodes/CMakeLists.txt @${REINPLACE_CMD} -e \ '/CMAKE_SYSTEM_NAME/s|"Linux"|"${OPSYS}"|' \ ${WRKSRC}/frontends/CMakeLists.txt @${REINPLACE_CMD} -e \ 's| mixer)| csmixer)|' \ ${WRKSRC}/util/CMakeLists.txt +.for i in Engine/auxfd.c H/prototyp.h OOps/diskin2.c OOps/dumpf.c \ + Opcodes/partials.c Top/csound.c + @${REINPLACE_CMD} -e \ + 's|\([[:blank:]]fd\)\(close\)|\1__\2|' ${WRKSRC}/${i} +.endfor post-install: @${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6 @${LN} -sf libcsound64.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsound64.so.6 + post-install-FLTK-on: @${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6 .include Index: head/audio/csound6/distinfo =================================================================== --- head/audio/csound6/distinfo (revision 400218) +++ head/audio/csound6/distinfo (revision 400219) @@ -1,2 +1,2 @@ -SHA256 (csound/Csound6.05.tar.gz) = 0d0ab4c1804265f4947e07c5e41ee72bc1a122b873bd77b9e7179f4c4db43a28 -SIZE (csound/Csound6.05.tar.gz) = 26208635 +SHA256 (csound/Csound6.06.tar.gz) = 03e6542d60eaffc9b4c5e81f36243e8872dedbe94c036adaa8e07c27938feb11 +SIZE (csound/Csound6.06.tar.gz) = 27232172 Index: head/audio/csound6/files/patch-Opcodes-urandom.c =================================================================== --- head/audio/csound6/files/patch-Opcodes-urandom.c (revision 400218) +++ head/audio/csound6/files/patch-Opcodes-urandom.c (nonexistent) @@ -1,10 +0,0 @@ ---- Opcodes/urandom.c.orig 2015-04-25 19:06:23 UTC -+++ Opcodes/urandom.c -@@ -22,7 +22,6 @@ - */ - - #include "csdl.h" --#include - - typedef struct { - OPDS h; Property changes on: head/audio/csound6/files/patch-Opcodes-urandom.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/audio/csound6/pkg-plist =================================================================== --- head/audio/csound6/pkg-plist (revision 400218) +++ head/audio/csound6/pkg-plist (revision 400219) @@ -1,118 +1,120 @@ bin/atsa bin/cs bin/csanalyze bin/csb64enc bin/csbeats bin/csdebugger bin/csmixer bin/csound bin/cvanal bin/dnoise bin/envext bin/extract bin/extractor bin/het_export bin/het_import bin/hetro bin/lpanal bin/lpc_export bin/lpc_import bin/makecsd bin/pv_export bin/pv_import bin/pvanal bin/pvlook bin/scale bin/scot bin/scsort bin/sdif2ad bin/sndinfo +bin/src_conv bin/srconv %%FLTK%%bin/winsound include/csound/CppSound.hpp include/csound/CsoundFile.hpp include/csound/OpcodeBase.hpp include/csound/cfgvar.h include/csound/csPerfThread.hpp include/csound/cs_par_structs.h include/csound/cscore.h include/csound/csdebug.h include/csound/csdl.h include/csound/csound.h include/csound/csound.hpp include/csound/csoundCore.h include/csound/csound_data_structures.h include/csound/csound_standard_types.h include/csound/csound_type_system.h include/csound/cwindow.h include/csound/filebuilding.h include/csound/float-version.h include/csound/interlocks.h include/csound/msg_attr.h include/csound/pools.h include/csound/pstream.h include/csound/pvfileio.h include/csound/soundio.h include/csound/sysdep.h include/csound/text.h include/csound/version.h lib/csound/plugins-6.0/csladspa.so %%LUA%%lib/csound/plugins-6.0/libLuaCsound.so lib/csound/plugins-6.0/libampmidid.so lib/csound/plugins-6.0/libbuchla.so lib/csound/plugins-6.0/libcellular.so lib/csound/plugins-6.0/libchua.so lib/csound/plugins-6.0/libcontrol.so lib/csound/plugins-6.0/libcs_date.so lib/csound/plugins-6.0/libdoppler.so %%DSSI%%lib/csound/plugins-6.0/libdssi4cs.so lib/csound/plugins-6.0/libexciter.so lib/csound/plugins-6.0/libfareygen.so %%FLUIDSYNTH%%lib/csound/plugins-6.0/libfluidOpcodes.so lib/csound/plugins-6.0/libfractalnoise.so +lib/csound/plugins-6.0/libframebuffer.so %%HDF5%%lib/csound/plugins-6.0/libhdf5.so %%PNG%%lib/csound/plugins-6.0/libimage.so lib/csound/plugins-6.0/libipmidi.so %%JACK%%lib/csound/plugins-6.0/libjackTransport.so %%JACK%%lib/csound/plugins-6.0/libjacko.so lib/csound/plugins-6.0/liblinear_algebra.so lib/csound/plugins-6.0/libmixer.so %%OSC%%lib/csound/plugins-6.0/libosc.so lib/csound/plugins-6.0/libpadsynth.so lib/csound/plugins-6.0/libplaterev.so lib/csound/plugins-6.0/libpy.so %%ALSA%%lib/csound/plugins-6.0/librtalsa.so %%JACK%%lib/csound/plugins-6.0/librtjack.so %%PORTAUDIO%%lib/csound/plugins-6.0/librtpa.so %%PULSEAUDIO%%lib/csound/plugins-6.0/librtpulse.so lib/csound/plugins-6.0/libscansyn.so lib/csound/plugins-6.0/libserial.so lib/csound/plugins-6.0/libsignalflowgraph.so lib/csound/plugins-6.0/libstdutil.so lib/csound/plugins-6.0/libsystem_call.so lib/csound/plugins-6.0/liburandom.so %%FLTK%%lib/csound/plugins-6.0/libvirtual.so %%FLTK%%lib/csound/plugins-6.0/libwidgets.so %%FLTK%%lib/libCsoundAC.so %%FLTK%%lib/libCsoundAC.so.6 %%FLTK%%lib/libCsoundAC.so.6.0 lib/libcsnd6.so lib/libcsnd6.so.6 lib/libcsnd6.so.6.0 lib/libcsound64.so lib/libcsound64.so.6 lib/libcsound64.so.6.0 %%LUA%%lib/luaCsnd6.so %%LUA%%lib/luaCsoundAC.so %%FLTK%%%%PYTHON_SITELIBDIR%%/CsoundAC.py %%FLTK%%%%PYTHON_SITELIBDIR%%/_CsoundAC.so %%PYTHON_SITELIBDIR%%/_csnd6.so %%PYTHON_SITELIBDIR%%/csnd6.py %%PYTHON_SITELIBDIR%%/icsound.py %%NLS%%share/locale/de/LC_MESSAGES/csound6.mo %%NLS%%share/locale/en_US/LC_MESSAGES/csound6.mo %%NLS%%share/locale/es_CO/LC_MESSAGES/csound6.mo %%NLS%%share/locale/fr/LC_MESSAGES/csound6.mo %%NLS%%share/locale/it/LC_MESSAGES/csound6.mo %%NLS%%share/locale/ro/LC_MESSAGES/csound6.mo %%NLS%%share/locale/ru/LC_MESSAGES/csound6.mo