Date: Fri, 27 Jun 2014 16:08:00 +0000 (UTC) From: Martin Wilke <miwi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359561 - in head/audio/csound6: . files Message-ID: <201406271608.s5RG805h059904@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: miwi Date: Fri Jun 27 16:07:59 2014 New Revision: 359561 URL: http://svnweb.freebsd.org/changeset/ports/359561 QAT: https://qat.redports.org/buildarchive/r359561/ Log: - Update to 6.03.2 PR: 190887 Modified: head/audio/csound6/Makefile head/audio/csound6/distinfo head/audio/csound6/files/patch-Top-csound.c head/audio/csound6/pkg-plist Modified: head/audio/csound6/Makefile ============================================================================== --- head/audio/csound6/Makefile Fri Jun 27 16:06:52 2014 (r359560) +++ head/audio/csound6/Makefile Fri Jun 27 16:07:59 2014 (r359561) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= csound -PORTVERSION= 6.02 +PORTVERSION= 6.03.2 CATEGORIES= audio lang -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION} +MASTER_SITES= SF/${PORTNAME}/${PORTNAME}6/${PORTNAME:S/c/C/}${PORTVERSION:R} PKGNAMESUFFIX= 6 DISTNAME= ${PORTNAME:S/c/C/}${PORTVERSION} DIST_SUBDIR= csound @@ -20,26 +20,7 @@ BUILD_DEPENDS= boost-libs>0:${PORTSDIR}/ gmm++>0:${PORTSDIR}/math/gmm++ LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile -CONFLICTS= csound-5.* - -OPTIONS_DEFINE= ALSA DSSI FLTK FLUIDSYNTH JACK LUA NLS OPENMP OSC PNG \ - PORTAUDIO PULSEAUDIO -OPTIONS_DEFAULT=FLTK OPENMP -OPTIONS_SUB= yes -ALSA_DESC= Build ALSA I/O module -DSSI_DESC= Build DSSI/LADSPA host opcodes -FLTK_DESC= Build FLTK plugin and GUI -FLUIDSYNTH_DESC=Building FluidSynth opcodes -JACK_DESC= Build Jack I/O module and opcodes -LUA_DESC= Build Lua Interface and opcodes -OSC_DESC= Build OSC opcodes -PNG_DESC= Build Image opcodes -PORTAUDIO_DESC= Build PortAudio I/O module -PULSEAUDIO_DESC=Build PulseAudio I/O module - -CONFLICTS_INSTALL= outguess-* - -USES= bison cmake gettext +USES= bison cmake USE_PYTHON= 2 CMAKE_ARGS= -DBUILD_CSOUNDVST:BOOL=OFF \ -DBUILD_JAVA_INTERFACE:BOOL=OFF \ @@ -55,34 +36,61 @@ LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message +CONFLICTS= csound-5.* +CONFLICTS_INSTALL= outguess-* + +OPTIONS_DEFINE= ALSA CURL DSSI FLTK FLUIDSYNTH 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 +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_RUN_DEPENDS= dssi>0:${PORTSDIR}/audio/dssi DSSI_CMAKE_OFF= -DBUILD_DSSI_OPCODES:BOOL=OFF +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= -DUSE_FLTK:BOOL=OFF +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 +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= -DUSE_GETTEXT:BOOL=OFF +NLS_CMAKE_OFF= -DGETTEXT_MSGFMT_EXECUTABLE="" \ + -DLIBINTL_HEADER:STRING="" \ + -DLIBINTL_LIBRARY:STRING="" \ + -DUSE_GETTEXT:BOOL=OFF OPENMP_USES= compiler:openmp 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= libpng15.so:${PORTSDIR}/graphics/png PNG_CMAKE_OFF= -DBUILD_IMAGE_OPCODES:BOOL=OFF +PORTAUDIO_DESC= Build PortAudio I/O module PORTAUDIO_BUILD_DEPENDS=portaudio2>0:${PORTSDIR}/audio/portaudio2 PORTAUDIO_RUN_DEPENDS= portaudio2>0:${PORTSDIR}/audio/portaudio2 +PORTAUDIO_CMAKE_ON= -DPORTAUDIO_INCLUDE_PATH:STRING="${LOCALBASE}/include/portaudio2" \ + -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 PULSEAUDIO_CMAKE_OFF= -DUSE_PULSEAUDIO:BOOL=OFF @@ -127,8 +135,10 @@ post-patch: ${WRKSRC}/util1/CMakeLists.txt post-install: -.for i in libCsoundAC.so libcsnd6.so libcsound64.so - @${LN} -sf ${i}.6.0 ${STAGEDIR}${PREFIX}/lib/${i}.6 -.endfor + @${LN} -sf libcsnd6.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsnd6.so.6 + @${LN} -sf libcsound64.so.6.0 ${STAGEDIR}${PREFIX}/lib/libcsound64.so.6 +.if ${PORT_OPTIONS:MFLTK} + @${LN} -sf libCsoundAC.so.6.0 ${STAGEDIR}${PREFIX}/lib/libCsoundAC.so.6 +.endif .include <bsd.port.mk> Modified: head/audio/csound6/distinfo ============================================================================== --- head/audio/csound6/distinfo Fri Jun 27 16:06:52 2014 (r359560) +++ head/audio/csound6/distinfo Fri Jun 27 16:07:59 2014 (r359561) @@ -1,2 +1,2 @@ -SHA256 (csound/Csound6.02.tar.gz) = b964199642b1141d4e3253a86996c613c2420c4e2cc39cad347ad7115768c0a5 -SIZE (csound/Csound6.02.tar.gz) = 23459796 +SHA256 (csound/Csound6.03.2.tar.gz) = f5f8364e0bc10aba473800e66176c08ac32b43ca69ad02dc9554bad54e91d170 +SIZE (csound/Csound6.03.2.tar.gz) = 24571513 Modified: head/audio/csound6/files/patch-Top-csound.c ============================================================================== --- head/audio/csound6/files/patch-Top-csound.c Fri Jun 27 16:06:52 2014 (r359560) +++ head/audio/csound6/files/patch-Top-csound.c Fri Jun 27 16:07:59 2014 (r359561) @@ -4,8 +4,8 @@ #include "cs_par_dispatch.h" #include "csound_orc_semantics.h" --#if defined(linux) || defined(__HAIKU__) -+#if defined(linux) || defined(__HAIKU__) || defined(__FreeBSD__) +-#if defined(linux) || defined(__HAIKU__) || defined(EMSCRIPTEN) ++#if defined(linux) || defined(__HAIKU__) || defined(__FreeBSD__) || defined(EMSCRIPTEN) #define PTHREAD_SPINLOCK_INITIALIZER 0 #endif @@ -15,7 +15,7 @@ #if defined(USE_OPENMP) #include <omp.h> #endif /* USE_OPENMP */ -@@ -899,7 +902,7 @@ +@@ -919,7 +922,7 @@ #if defined(ANDROID) || (!defined(LINUX) && !defined(SGI) && \ !defined(__HAIKU__) && !defined(__BEOS__) && \ @@ -24,7 +24,7 @@ static char *signal_to_string(int sig) { switch(sig) { -@@ -3172,7 +3175,7 @@ +@@ -3420,7 +3423,7 @@ /* ------------------------------------ */ #if defined(HAVE_RDTSC) @@ -33,7 +33,7 @@ #undef HAVE_RDTSC #endif #endif -@@ -3185,6 +3188,13 @@ +@@ -3433,6 +3436,13 @@ static int getTimeResolution(void) { #if defined(HAVE_RDTSC) @@ -47,7 +47,7 @@ FILE *f; char buf[256]; -@@ -3220,9 +3230,14 @@ +@@ -3468,9 +3478,14 @@ } } fclose(f); Modified: head/audio/csound6/pkg-plist ============================================================================== --- head/audio/csound6/pkg-plist Fri Jun 27 16:06:52 2014 (r359560) +++ head/audio/csound6/pkg-plist Fri Jun 27 16:07:59 2014 (r359561) @@ -3,6 +3,7 @@ bin/cs bin/csanalyze bin/csb64enc bin/csbeats +bin/csdebugger bin/csmixer bin/csound bin/cvanal @@ -36,6 +37,7 @@ 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 @@ -45,7 +47,7 @@ include/csound/csound_standard_types.h include/csound/csound_type_system.h include/csound/cwindow.h include/csound/filebuilding.h -include/csound/float-version-double.h +@comment include/csound/float-version-double.h include/csound/float-version.h include/csound/interlocks.h include/csound/msg_attr.h @@ -87,11 +89,11 @@ lib/csound/plugins-6.0/libsignalflowgrap lib/csound/plugins-6.0/libstdutil.so lib/csound/plugins-6.0/libsystem_call.so lib/csound/plugins-6.0/liburandom.so -lib/csound/plugins-6.0/libvirtual.so +%%FLTK%%lib/csound/plugins-6.0/libvirtual.so %%FLTK%%lib/csound/plugins-6.0/libwidgets.so -lib/libCsoundAC.so -lib/libCsoundAC.so.6 -lib/libCsoundAC.so.6.0 +%%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 @@ -100,8 +102,8 @@ lib/libcsound64.so.6 lib/libcsound64.so.6.0 %%LUA%%lib/luaCsnd6.so %%LUA%%lib/luaCsoundAC.so -%%PYTHON_SITELIBDIR%%/CsoundAC.py -%%PYTHON_SITELIBDIR%%/_CsoundAC.so +%%FLTK%%%%PYTHON_SITELIBDIR%%/CsoundAC.py +%%FLTK%%%%PYTHON_SITELIBDIR%%/_CsoundAC.so %%PYTHON_SITELIBDIR%%/_csnd6.so %%PYTHON_SITELIBDIR%%/csnd6.py %%NLS%%share/locale/de/LC_MESSAGES/csound6.mo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406271608.s5RG805h059904>