svn commit: r400219 - in head/audio/csound6: . files

[Thomas Zander]

Author: riggs
Date: Tue Oct 27 07:50:02 2015
New Revision: 400219
URL: https://svnweb.freebsd.org/changeset/ports/400219

Log:
  Update to upstream version 6.06
  
  PR:		203795
  Submitted by:	tkato432 at yahoo.com

Deleted:
  head/audio/csound6/files/patch-Opcodes-urandom.c
Modified:
  head/audio/csound6/Makefile
  head/audio/csound6/distinfo
  head/audio/csound6/pkg-plist

Modified: head/audio/csound6/Makefile
==============================================================================
--- head/audio/csound6/Makefile	Tue Oct 27 07:33:47 2015	(r400218)
+++ head/audio/csound6/Makefile	Tue Oct 27 07:50:02 2015	(r400219)
@@ -2,7 +2,7 @@
 # $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
@@ -18,7 +18,8 @@ BUILD_DEPENDS=	boost-libs>0:${PORTSDIR}/
 		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 \
@@ -57,6 +58,7 @@ DSSI_LIB_DEPENDS=	libdssialsacompat.so:$
 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
@@ -131,10 +133,16 @@ post-patch:
 	@${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
 

Modified: head/audio/csound6/distinfo
==============================================================================
--- head/audio/csound6/distinfo	Tue Oct 27 07:33:47 2015	(r400218)
+++ head/audio/csound6/distinfo	Tue Oct 27 07:50:02 2015	(r400219)
@@ -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

Modified: head/audio/csound6/pkg-plist
==============================================================================
--- head/audio/csound6/pkg-plist	Tue Oct 27 07:33:47 2015	(r400218)
+++ head/audio/csound6/pkg-plist	Tue Oct 27 07:50:02 2015	(r400219)
@@ -27,6 +27,7 @@ bin/scot
 bin/scsort
 bin/sdif2ad
 bin/sndinfo
+bin/src_conv
 bin/srconv
 %%FLTK%%bin/winsound
 include/csound/CppSound.hpp
@@ -70,6 +71,7 @@ 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