Index: head/audio/csound/Makefile =================================================================== --- head/audio/csound/Makefile (revision 565856) +++ head/audio/csound/Makefile (revision 565857) @@ -1,198 +1,199 @@ # Created by: trevor # $FreeBSD$ PORTNAME= csound -DISTVERSION= 6.14.0 -PORTREVISION= 3 +DISTVERSION= 6.15.0 CATEGORIES= audio lang -PATCH_SITES= https://github.com/csound/csound/commit/ -PATCHFILES= c444e8f752c3acc31d364b901204e09eae2e791e.patch:-p1 - MAINTAINER= yuri@FreeBSD.org COMMENT= Sound synthesizer LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ swig:devel/swig \ gmm++>0:math/gmm++ LIB_DEPENDS= libsamplerate.so:audio/libsamplerate \ libsndfile.so:audio/libsndfile -USES= alias bison cmake compiler:c++11-lib eigen:3 localbase ncurses python +USES= alias bison cmake compiler:c++11-lib eigen:3 localbase ncurses python:build # is python needed: https://github.com/csound/csound/issues/1437 ? USE_GITHUB= yes USE_LDCONFIG= yes CFLAGS_powerpc= -maltivec CFLAGS_powerpcspe= -DPFFFT_SIMD_DISABLE CFLAGS_powerpc64= -maltivec CMAKE_ARGS= -DBUILD_CSOUNDVST:BOOL=OFF \ -DBUILD_PD_CLASS:BOOL=OFF \ -DPYTHON_MODULE_INSTALL_DIR:PATH="${PYTHONPREFIX_SITELIBDIR}" \ -DOPSYS:STRING="${OPSYS}" CMAKE_OFF= USE_ALSA BUILD_JAVA_INTERFACE BUILD_TESTS SSP_UNSAFE= yes LDFLAGS+= -lexecinfo SUB_FILES= pkg-message OPTIONS_DEFINE= CURL FLTK HDF5 NLS OPENMP PORTAUDIO PULSEAUDIO -OPTIONS_GROUP= PLUGINS -OPTIONS_GROUP_PLUGINS= BUCHLA CHUA DSSI EXCITER FAUST FLUIDSYNTH IMAGE JACK LUA LINALG OSC P5GLOVE PADSYNTH PLATEREV PVSGENDY SCANSYN SELECT SERIAL STACK STK WIIMOTE # Opcodes/CMakeLists.txt, Opcodes/stk/CMakeLists.txt +OPTIONS_GROUP= OPCODES # list is in Opcodes/CMakeLists.txt +OPTIONS_GROUP_OPCODES= BUCHLA CHUA COUNTER DSSI EXCITER FAUST FLUIDSYNTH IMAGE JACK LUA LINALG MP3OUT OSC P5GLOVE PADSYNTH PLATEREV PVSGENDY PYTHON SCANSYN SELECT SERIAL STACK STK VST4CS WIIMOTE # Opcodes/CMakeLists.txt, Opcodes/stk/CMakeLists.txt OPTIONS_DEFAULT= FLTK OPENMP -OPTIONS_DEFAULT+= BUCHLA CHUA DSSI EXCITER FAUST IMAGE JACK LINALG OSC P5GLOVE PADSYNTH PLATEREV SCANSYN SELECT SERIAL STACK STK # for PLUGINS +OPTIONS_DEFAULT+= BUCHLA CHUA DSSI EXCITER FAUST IMAGE JACK LINALG OSC P5GLOVE PADSYNTH PLATEREV SCANSYN SELECT SERIAL STACK STK # for OPCODES OPTIONS_SUB= yes +OPCODES_DESC= Build/install opcodes + BUCHLA_DESC= Build the Buchla filter opcode BUCHLA_CMAKE_BOOL= BUILD_BUCHLA_OPCODES CHUA_DESC= Build the chua opcodes CHUA_CMAKE_BOOL= BUILD_CHUA_OPCODES +COUNTER_DESC= Build the serial opcode +COUNTER_CMAKE_BOOL= BUILD_COUNTER_OPCODES + CURL_CMAKE_BOOL= USE_CURL # see https://github.com/csound/csound/issues/1067 CURL_LIB_DEPENDS= libcurl.so:ftp/curl DSSI_DESC= Build DSSI opcodes DSSI_BUILD_DEPENDS= dssi>0:audio/dssi DSSI_LIB_DEPENDS= libdssialsacompat.so:audio/libdssialsacompat DSSI_RUN_DEPENDS= dssi>0:audio/dssi DSSI_CMAKE_BOOL= BUILD_DSSI_OPCODES DSSI_CFLAGS= -isystem ${LOCALBASE}/include/dssi EXCITER_DESC= Build the exciter opcode EXCITER_CMAKE_BOOL= BUILD_EXCITER_OPCODES FLTK_DESC= Build FLTK plugin and GUI FLTK_USES= xorg FLTK_USE= XORG=ice,sm,x11,xext FLTK_LIB_DEPENDS= libfltk.so: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 FAUST_DESC= Build the Faust opcodes FAUST_USES= ssl -FAUST_LLVM_VERSION= 60 -FAUST_BUILD_DEPENDS= faust>0:audio/faust -FAUST_RUN_DEPENDS= faust>0:audio/faust \ - llvm${FAUST_LLVM_VERSION}>0:devel/llvm${FAUST_LLVM_VERSION} +FAUST_LLVM_VERSION= 11 # should be the same as in audio/faust +FAUST_LIB_DEPENDS= libfaust.so:audio/faust FAUST_CMAKE_BOOL= BUILD_FAUST_OPCODES FAUST_CMAKE_ON= -DFAUST_LLVM_VERSION:STRING=${FAUST_LLVM_VERSION} FLUIDSYNTH_DESC= Building FluidSynth opcodes FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth FLUIDSYNTH_CMAKE_BOOL= BUILD_FLUID_OPCODES FLUIDSYNTH_BROKEN= FluidSynth 2.x is broken upstream: https://github.com/csound/csound/issues/1078#issuecomment-441459803 -HDF5_DESC= Build HDF5 read/write opcodes +HDF5_DESC= Build HDF5 read/write plugin HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 \ libsz.so:science/szip HDF5_CMAKE_BOOL= BUILD_HDF5_OPCODES JACK_DESC= Build the JACK related opcodes JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CMAKE_BOOL= BUILD_JACK_OPCODES USE_JACK LINALG_DESC= Build the linear algebra opcodes LINALG_CMAKE_BOOL= BUILD_LINEAR_ALGEBRA_OPCODES LINALG_CXXFLAGS= -DGMM_VERSION=x # workaround based on https://github.com/csound/csound/issues/1069#issuecomment-439648756 -LUA_DESC= Build Lua Interface and opcodes +LUA_DESC= Build Lua Interface and module LUA_LIB_DEPENDS= libluajit-5.1.so:lang/luajit -LUA_CMAKE_OFF= -DBUILD_CSOUND_AC_LUA_INTERFACE:BOOL=OFF \ - -DBUILD_LUA_INTERFACE:BOOL=OFF \ - -DBUILD_LUA_OPCODES:BOOL=OFF +LUA_CMAKE_BOOL= BUILD_CSOUND_AC_LUA_INTERFACE BUILD_LUA_INTERFACE BUILD_LUA_OPCODES + NLS_USES= gettext NLS_CMAKE_OFF= -DGETTEXT_MSGFMT_EXECUTABLE:FILEPATH="" \ -DGETTEXT_MSGMERGE_EXECUTABLE:FILEPATH="" \ -DLIBINTL_LIBRARY:FILEPATH="" \ -DUSE_GETTEXT:BOOL=OFF + OPENMP_CMAKE_BOOL= USE_OPEN_MP +MP3OUT_DESC= Build MP3OUT opcodes +MP3OUT_CMAKE_BOOL= BUILD_MP3OUT_OPCODE + OSC_DESC= Build OSC opcodes OSC_LIB_DEPENDS= liblo.so:audio/liblo OSC_CMAKE_BOOL= BUILD_OSC_OPCODES PADSYNTH_DESC= Build the Padsynth opcode PADSYNTH_CMAKE_BOOL= BUILD_PADSYNTH_OPCODES IMAGE_DESC= Build Image opcodes IMAGE_LIB_DEPENDS= libpng.so:graphics/png IMAGE_CMAKE_BOOL= BUILD_IMAGE_OPCODES P5GLOVE_DESC= Build PortAudio I/O module P5GLOVE_CMAKE_BOOL= BUILD_P5GLOVE_OPCODES PORTAUDIO_DESC= Build PortAudio I/O module PORTAUDIO_LIB_DEPENDS= libportaudio.so:audio/portaudio PORTAUDIO_CMAKE_BOOL= USE_PORTAUDIO PULSEAUDIO_DESC= Build PulseAudio I/O module PULSEAUDIO_LIB_DEPENDS= libpulse-simple.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= USE_PULSEAUDIO PLATEREV_DESC= Build the platerev opcode PLATEREV_CMAKE_BOOL= BUILD_PLATEREV_OPCODES PVSGENDY_DESC= Build the pvsgendy opcode PVSGENDY_CMAKE_BOOL= BUILD_PVSGENDY_OPCODE +PYTHON_DESC= Build the Python opcodes +PYTHON_USES= python +PYTHON_CMAKE_BOOL= BUILD_PYTHON_OPCODES + SCANSYN_DESC= Build the select opcodes SCANSYN_CMAKE_BOOL= BUILD_SCANSYN_OPCODES SELECT_DESC= Build the select opcode SELECT_CMAKE_BOOL= BUILD_SELECT_OPCODE SERIAL_DESC= Build the serial opcode SERIAL_CMAKE_BOOL= BUILD_SERIAL_OPCODES STACK_DESC= Build the stack opcodes STACK_CMAKE_BOOL= BUILD_STACK_OPCODES STK_DESC= Build the stk opcodes STK_CMAKE_BOOL= BUILD_STK_OPCODES STK_LIB_DEPENDS= libstk.so:audio/stk +VST4CS_DESC= Build the vst4cs opcodes +VST4CS_CMAKE_BOOL= BUILD_VST4CS_OPCODES + WIIMOTE_DESC= Build the Wiimote opcodes WIIMOTE_CMAKE_BOOL= BUILD_WIIMOTE_OPCODES WIIMOTE_BROKEN= Need to port wiiuse: https://github.com/rpavlik/wiiuse .include .if ${ARCH} == "i386" BROKEN_FreeBSD_11= libcsound64.so.6.0: undefined reference to `__atomic_store_8' / undefined reference to `__atomic_load_8' .endif post-patch: @${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/csound/distinfo =================================================================== --- head/audio/csound/distinfo (revision 565856) +++ head/audio/csound/distinfo (revision 565857) @@ -1,5 +1,3 @@ -TIMESTAMP = 1598638243 -SHA256 (csound-csound-6.14.0_GH0.tar.gz) = bef349c5304b2d3431ef417933b4c9e9469c0a408a4fa4a98acf0070af360a22 -SIZE (csound-csound-6.14.0_GH0.tar.gz) = 26812543 -SHA256 (c444e8f752c3acc31d364b901204e09eae2e791e.patch) = 7314a10797e51cb291c488581f833b23eafe4af556b37c6b20573c2f0f5af0d0 -SIZE (c444e8f752c3acc31d364b901204e09eae2e791e.patch) = 621 +TIMESTAMP = 1613608252 +SHA256 (csound-csound-6.15.0_GH0.tar.gz) = d47ed0fb70c752cb06ee2655ee9f010d8d1e369fc73d09d2ac2bc1b3060bf724 +SIZE (csound-csound-6.15.0_GH0.tar.gz) = 31879171 Index: head/audio/csound/files/patch-InOut_CMakeLists.txt =================================================================== --- head/audio/csound/files/patch-InOut_CMakeLists.txt (nonexistent) +++ head/audio/csound/files/patch-InOut_CMakeLists.txt (revision 565857) @@ -0,0 +1,13 @@ +- https://github.com/csound/csound/issues/1438 + +--- InOut/CMakeLists.txt.orig 2021-02-18 01:47:49 UTC ++++ InOut/CMakeLists.txt +@@ -15,7 +15,7 @@ option(USE_AUDIOUNIT "Build the CoreAudio AudioUnit I/ + option(USE_FLTK "Use FLTK for graphs and widget opcodes" ON) + option(BUILD_VIRTUAL_KEYBOARD "Build Virtual MIDI keyboard" ON) + +-list(APPEND CMAKE_REQUIRED_INCLUDES "/usr/local/include") ++list(APPEND CMAKE_REQUIRED_INCLUDES "${CMAKE_INSTALL_PREFIX}/include") + + # FIND LIBRARIES AND HEADERS + Property changes on: head/audio/csound/files/patch-InOut_CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/csound/pkg-plist =================================================================== --- head/audio/csound/pkg-plist (revision 565856) +++ head/audio/csound/pkg-plist (revision 565857) @@ -1,132 +1,141 @@ 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/arrays.h 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_threaded.hpp include/csound/csound_type_system.h include/csound/cwindow.h include/csound/filebuilding.h include/csound/find_opcode.h include/csound/float-version.h include/csound/interlocks.h include/csound/modload.h include/csound/msg_attr.h include/csound/plugin.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/plugins64-6.0/libampmidid.so lib/csound/plugins64-6.0/libarrayops.so lib/csound/plugins64-6.0/libbeosc.so %%BUCHLA%%lib/csound/plugins64-6.0/libbuchla.so lib/csound/plugins64-6.0/libcellular.so %%CHUA%%lib/csound/plugins64-6.0/libchua.so lib/csound/plugins64-6.0/libcontrol.so +%%COUNTER%%lib/csound/plugins64-6.0/libcounter.so lib/csound/plugins64-6.0/libcs_date.so lib/csound/plugins64-6.0/libdoppler.so %%DSSI%%lib/csound/plugins64-6.0/libdssi4cs.so lib/csound/plugins64-6.0/libemugens.so %%EXCITER%%lib/csound/plugins64-6.0/libexciter.so lib/csound/plugins64-6.0/libfareygen.so %%FAUST%%lib/csound/plugins64-6.0/libfaustcsound.so %%FLUIDSYNTH%%lib/csound/plugins64-6.0/libfluidOpcodes.so lib/csound/plugins64-6.0/libfractalnoise.so lib/csound/plugins64-6.0/libframebuffer.so lib/csound/plugins64-6.0/libftsamplebank.so lib/csound/plugins64-6.0/libgetftargs.so lib/csound/plugins64-6.0/libgtf.so %%IMAGE%%lib/csound/plugins64-6.0/libimage.so lib/csound/plugins64-6.0/libipmidi.so %%JACK%%lib/csound/plugins64-6.0/libjackTransport.so %%JACK%%lib/csound/plugins64-6.0/libjacko.so %%HDF5%%lib/csound/plugins64-6.0/libhdf5ops.so %%LINALG%%lib/csound/plugins64-6.0/liblinear_algebra.so lib/csound/plugins64-6.0/libliveconv.so lib/csound/plugins64-6.0/libmixer.so %%OSC%%lib/csound/plugins64-6.0/libosc.so %%PADSYNTH%%lib/csound/plugins64-6.0/libpadsynth.so %%PLATEREV%%lib/csound/plugins64-6.0/libplaterev.so lib/csound/plugins64-6.0/libpvsops.so -lib/csound/plugins64-6.0/libpy.so +%%PYTHON%%lib/csound/plugins64-6.0/libpy.so lib/csound/plugins64-6.0/libquadbezier.so %%JACK%%lib/csound/plugins64-6.0/librtjack.so %%PORTAUDIO%%lib/csound/plugins64-6.0/librtpa.so %%PULSEAUDIO%%lib/csound/plugins64-6.0/librtpulse.so %%SCANSYN%%lib/csound/plugins64-6.0/libscansyn.so lib/csound/plugins64-6.0/libscugens.so %%SELECT%%lib/csound/plugins64-6.0/libselect.so %%SERIAL%%lib/csound/plugins64-6.0/libserial.so lib/csound/plugins64-6.0/libsignalflowgraph.so %%STACK%%lib/csound/plugins64-6.0/libstackops.so lib/csound/plugins64-6.0/libstdutil.so +lib/csound/plugins64-6.0/libsterrain.so %%STK%%lib/csound/plugins64-6.0/libstkops.so lib/csound/plugins64-6.0/libsystem_call.so lib/csound/plugins64-6.0/liburandom.so %%FLTK%%lib/csound/plugins64-6.0/libvirtual.so %%FLTK%%lib/csound/plugins64-6.0/libwidgets.so %%FLTK%%lib/libCsoundAC.so.6 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 -%%PYTHON_SITELIBDIR%%/_csnd6.so -%%PYTHON_SITELIBDIR%%/csnd6.py -%%PYTHON_SITELIBDIR%%/ctcsound.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/_csnd6.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/csnd6.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/ctcsound.py share/cmake/Csound/FindCsound.cmake %%NLS%%share/locale/de/LC_MESSAGES/csound6.mo %%NLS%%share/locale/en_US/LC_MESSAGES/csound6.mo %%NLS%%share/locale/es/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/ru/LC_MESSAGES/csound6.mo +share/samples/README +share/samples/hrtf-44100-left.dat +share/samples/hrtf-44100-right.dat +share/samples/hrtf-48000-left.dat +share/samples/hrtf-48000-right.dat +share/samples/hrtf-96000-left.dat +share/samples/hrtf-96000-right.dat +share/samples/sf_GMbank.sf2