Date: Fri, 22 Aug 2014 13:06:30 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365642 - in head/audio/csound: . files Message-ID: <201408221306.s7MD6U5h032795@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Aug 22 13:06:29 2014 New Revision: 365642 URL: http://svnweb.freebsd.org/changeset/ports/365642 QAT: https://qat.redports.org/buildarchive/r365642/ Log: - Add PNG option to fix plist (libimage.so is optional) - DSSI option requires alsa library - Fix DOCS option Added: head/audio/csound/files/patch-SConstruct (contents, props changed) Modified: head/audio/csound/Makefile head/audio/csound/pkg-plist Modified: head/audio/csound/Makefile ============================================================================== --- head/audio/csound/Makefile Fri Aug 22 13:05:51 2014 (r365641) +++ head/audio/csound/Makefile Fri Aug 22 13:06:29 2014 (r365642) @@ -3,6 +3,7 @@ PORTNAME= csound PORTVERSION= 5.19.01 +PORTREVISION= 1 CATEGORIES= audio lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R} \ SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual @@ -22,10 +23,11 @@ LIB_DEPENDS= libsndfile.so:${PORTSDIR}/a PORTSCOUT= limit:^5\. -OPTIONS_DEFINE= ALSA DSSI FLTK FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO DOCS +OPTIONS_DEFINE= ALSA PNG DSSI FLTK FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO DOCS OPTIONS_DEFAULT=FLTK OPTIONS_SUB= yes ALSA_DESC= Build ALSA I/O module +PNG_DESC= Build image opcodes DSSI_DESC= Build DSSI/LADSPA host opcodes FLUIDSYNTH_DESC=Building FluidSynth opcodes JACK_DESC= Build Jack I/O module and opcodes @@ -38,8 +40,7 @@ CONFLICTS_INSTALL= outguess-* csound6 WRKSRC= ${WRKDIR}/${PORTNAME:S/c/C/}${PORTVERSION} -USES= bison gettext scons compiler:openmp -USE_PYTHON= yes +USES= bison gettext scons compiler:openmp python MAKE_ARGS= instdir="${STAGEDIR}" prefix="${PREFIX}" \ CC="${CC}" CXX="${CXX}" \ buildCsoundAC=0 buildCsoundVST=0 buildInterfaces=1 \ @@ -65,8 +66,16 @@ MAKE_ARGS+= useALSA=0 ALSA_H= ##alsa/asoundlib.h## .endif +.if ${PORT_OPTIONS:MPNG} +LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png +MAKE_ARGS+= buildImageOpcodes=1 +.else +MAKE_ARGS+= buildImageOpcodes=0 +.endif + .if ${PORT_OPTIONS:MDSSI} BUILD_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi +LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib RUN_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi MAKE_ARGS+= buildDSSI=1 .else @@ -141,6 +150,8 @@ CXXLIB= c++ CXXLIB= # empty .endif +.include <bsd.port.options.mk> + post-patch: @${SED} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|; \ @@ -179,7 +190,11 @@ post-patch: post-install: ${LN} -sf libcsound64.so.5 ${STAGEDIR}${PREFIX}/lib/libcsound64.so +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) +.endif + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so* \ + ${STAGEDIR}${PREFIX}/lib/csound/plugins64/*.so .include <bsd.port.post.mk> Added: head/audio/csound/files/patch-SConstruct ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/csound/files/patch-SConstruct Fri Aug 22 13:06:29 2014 (r365642) @@ -0,0 +1,11 @@ +--- SConstruct.orig 2013-01-07 16:49:34.000000000 +0400 ++++ SConstruct 2014-08-22 15:37:51.000000000 +0400 +@@ -2057,7 +2057,7 @@ + + # DSSI HOST OPCODES + +-if (commonEnvironment['buildDSSI'] == '1' and (getPlatform() == 'linux' or getPlatform() == 'darwin') and configure.CheckHeader("ladspa.h", language = "C")) and configure.CheckHeader("dssi.h", language = "C"): ++if (commonEnvironment['buildDSSI'] == '1'): + print "CONFIGURATION DECISION: Building DSSI plugin host opcodes." + dssiEnvironment = pluginEnvironment.Clone() + dssiEnvironment.Append(LIBS = ['dl']) Modified: head/audio/csound/pkg-plist ============================================================================== --- head/audio/csound/pkg-plist Fri Aug 22 13:05:51 2014 (r365641) +++ head/audio/csound/pkg-plist Fri Aug 22 13:06:29 2014 (r365642) @@ -58,7 +58,7 @@ lib/csound/plugins64/libdoppler.so lib/csound/plugins64/libfareygen.so %%FLUIDSYNTH%%lib/csound/plugins64/libfluidOpcodes.so lib/csound/plugins64/libfractalnoise.so -lib/csound/plugins64/libimage.so +%%PNG%%lib/csound/plugins64/libimage.so lib/csound/plugins64/libipmidi.so %%JACK%%lib/csound/plugins64/libjackTransport.so %%JACK%%lib/csound/plugins64/libjacko.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408221306.s7MD6U5h032795>