Index: head/audio/csound/Makefile =================================================================== --- head/audio/csound/Makefile (revision 487321) +++ head/audio/csound/Makefile (revision 487322) @@ -1,186 +1,186 @@ # Created by: trevor # $FreeBSD$ PORTNAME= csound -DISTVERSION= 6.12.2 -PORTREVISION= 3 +DISTVERSION= 6.12.2-83 +DISTVERSIONSUFFIX= -gdf2edd269 CATEGORIES= audio lang MAINTAINER= yuri@FreeBSD.org COMMENT= Sound synthesizer LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= boost-libs>0:devel/boost-libs \ swig3.0:devel/swig30 \ gmm++>0:math/gmm++ LIB_DEPENDS= libsamplerate.so:audio/libsamplerate \ libsndfile.so:audio/libsndfile USES= alias bison cmake:outsource compiler:c++11-lib eigen:3 localbase ncurses python:2.7 USE_GITHUB= yes USE_LDCONFIG= yes 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 BINARY_ALIAS= swig=swig3.0 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_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_SUB= yes 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 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_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_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 +xFLUIDSYNTH_BROKEN= FluidSynth 2.x is broken upstream: https://github.com/csound/csound/issues/1078#issuecomment-441459803 HDF5_DESC= Build HDF5 read/write opcodes 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_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 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 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 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-4.6.0.so:audio/stk WIIMOTE_DESC= Build the Wiimote opcodes WIIMOTE_CMAKE_BOOL= BUILD_WIIMOTE_OPCODES WIIMOTE_BROKEN= Need to port wiiuse: https://github.com/rpavlik/wiiuse 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 487321) +++ head/audio/csound/distinfo (revision 487322) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542488559 -SHA256 (csound-csound-6.12.2_GH0.tar.gz) = 39f4872b896eb1cbbf596fcacc0f2122fd3e5ebbb5cec14a81b4207d6b8630ff -SIZE (csound-csound-6.12.2_GH0.tar.gz) = 26297850 +TIMESTAMP = 1544642888 +SHA256 (csound-csound-6.12.2-83-gdf2edd269_GH0.tar.gz) = e14038c44fd954bea0fcb34af994757ca5f4fe75f99c80a1e8df867d5b9e7eee +SIZE (csound-csound-6.12.2-83-gdf2edd269_GH0.tar.gz) = 26295519 Index: head/audio/csound/files/patch-CMakeLists.txt =================================================================== --- head/audio/csound/files/patch-CMakeLists.txt (revision 487321) +++ head/audio/csound/files/patch-CMakeLists.txt (revision 487322) @@ -1,84 +1,86 @@ ---- CMakeLists.txt.orig 2018-11-07 14:05:23 UTC +--- CMakeLists.txt.orig 2018-12-12 19:23:43 UTC +++ CMakeLists.txt @@ -164,8 +164,8 @@ endif() # set -Werror if in Debug configuration if(NOT MSVC AND NOT WASM) -set(CMAKE_CXX_FLAGS_RELEASE "-O3 ") -set(CMAKE_C_FLAGS_RELEASE "-O3 ") +#set(CMAKE_CXX_FLAGS_RELEASE "-O3 ") +#set(CMAKE_C_FLAGS_RELEASE "-O3 ") if(${CMAKE_BUILD_TYPE} MATCHES "Debug") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wno-missing-field-initializers") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wno-missing-field-initializers") @@ -206,7 +206,7 @@ execute_process ( OUTPUT_VARIABLE PYTHON_USER_SITE_PACKAGES ) -SET(PYTHON_MODULE_INSTALL_DIR ${PYTHON_USER_SITE_PACKAGES} CACHE PATH "Python module install dir") +#SET(PYTHON_MODULE_INSTALL_DIR ${PYTHON_USER_SITE_PACKAGES} CACHE PATH "Python module install dir") set(JAVA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR} CACHE PATH "Java module install dir") set(LUA_MODULE_INSTALL_DIR ${LIBRARY_INSTALL_DIR} CACHE PATH "Lua module install dir") @@ -373,12 +373,12 @@ endif() endif(WIN32) -if(APPLE) +if(APPLE OR CMAKE_SYSTEM_NAME MATCHES "${OPSYS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") set_target_properties(${CSOUNDLIB} PROPERTIES CXX_COMPILE_FLAGS "-std=c++11") endif() -if(CMAKE_SYSTEM_NAME MATCHES "Linux") +if(CMAKE_SYSTEM_NAME MATCHES "${OPSYS}") set(LINUX YES) else() set(LINUX NO) -@@ -527,15 +527,17 @@ find_package(FLTK ) +@@ -527,9 +527,11 @@ find_package(FLTK ) # LIST_REPLACE(FLTK_LIBRARIES 2 "fltk_images_SHARED") # endif() #endif() -find_package(FAUST) -find_package(Java) -find_package(JNI) +if (BUILD_FAUST_OPCODES) -+ find_package(FAUST) ++ find_package(FAUST) +endif() +#find_package(Java) +#find_package(JNI) find_package(LIBLO) find_package(LUAJIT) find_package(MUSICXML) +@@ -540,7 +542,7 @@ find_package(MUSICXML) + find_package(PORTSMF) find_package(PythonLibs 2.7) -if(NOT STK_LOCAL) +if(BUILD_STK_OPCODES AND NOT STK_LOCAL) find_package(STK) endif() find_package(SWIG) -@@ -1245,11 +1247,11 @@ if(CURL_FOUND) +@@ -1251,11 +1253,11 @@ if(USE_CURL AND CURL_FOUND) endif() # Linux does not have a separate libintl, it is part of libc -set(LIBINTL_AVAIL (LIBINTL_LIBRARY OR LINUX)) +set(LIBINTL_AVAIL (LIBINTL_LIBRARY)) check_deps(USE_GETTEXT LIBINTL_HEADER LIBINTL_AVAIL GETTEXT_MSGFMT_EXECUTABLE) if(USE_GETTEXT) message(STATUS "Using GNU gettext.") - if(NOT LINUX) + if(LINUX) list(APPEND libcsound_LIBS ${LIBINTL_LIBRARY}) endif() list(APPEND libcsound_CFLAGS -DGNU_GETTEXT) -@@ -1269,8 +1271,8 @@ endif() +@@ -1275,8 +1277,8 @@ endif() if(LINUX) message(STATUS "Building on Linux.") - add_definitions(-DLINUX -DPIPES -DNO_FLTK_THREADS -D_GNU_SOURCE -DHAVE_SOCKETS) - list(APPEND libcsound_LIBS m dl) + add_definitions(-DLINUX -DPIPES -DNO_FLTK_THREADS -DHAVE_SOCKETS) + list(APPEND libcsound_LIBS m) find_library(LIBRT_LIBRARY rt) Index: head/audio/csound/files/patch-cmake_Modules_FindFAUST.cmake =================================================================== --- head/audio/csound/files/patch-cmake_Modules_FindFAUST.cmake (revision 487321) +++ head/audio/csound/files/patch-cmake_Modules_FindFAUST.cmake (revision 487322) @@ -1,11 +1,11 @@ ---- cmake/Modules/FindFAUST.cmake.orig 2018-11-17 16:56:13 UTC +--- cmake/Modules/FindFAUST.cmake.orig 2018-12-12 19:23:43 UTC +++ cmake/Modules/FindFAUST.cmake @@ -27,7 +27,7 @@ if(FAUST_FOUND) # This is a static build of faust, hence # we have to add all the LLVM flags... - find_program(LLVM_CONFIG llvm-config HINTS /usr/bin /usr/local/bin /usr/local/opt/llvm/bin) + find_program(LLVM_CONFIG llvm-config${FAUST_LLVM_VERSION} HINTS /usr/bin /usr/local/bin /usr/local/opt/llvm/bin) if(NOT LLVM_CONFIG) - message(FATAL_ERROR "Using a static Faust library requires LLVM tooling to be present in the path") - endif() + message(WARNING "Using a static Faust library requires LLVM tooling to be present in the path.") + UNSET(FAUST_FOUND)