Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_157577046779410"
MIME-Version: 1.0
Date: Sun, 8 Dec 2019 02:01:07 +0000
From: "Nia Alarie" <nia@netbsd.org>
Subject: CVS commit: pkgsrc/audio/csound6
To: pkgsrc-changes@NetBSD.org
Reply-To: nia@netbsd.org
Message-Id: <20191208020107.D594AFA97@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_157577046779410
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	nia
Date:		Sun Dec  8 02:01:07 UTC 2019

Modified Files:
	pkgsrc/audio/csound6: Makefile PLIST options.mk

Log Message:
csound6: Support more audio backends.

Default to PortAudio since it's supported natively on most pkgsrc platforms.

Fix building with PKG_DEVELOPER and hdf5 installed.

Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/audio/csound6/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/audio/csound6/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/csound6/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_157577046779410
Content-Disposition: inline
Content-Length: 4572
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/audio/csound6/Makefile
diff -u pkgsrc/audio/csound6/Makefile:1.42 pkgsrc/audio/csound6/Makefile:1.43
--- pkgsrc/audio/csound6/Makefile:1.42	Sat Dec  7 10:24:02 2019
+++ pkgsrc/audio/csound6/Makefile	Sun Dec  8 02:01:07 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2019/12/07 10:24:02 mrg Exp $
+# $NetBSD: Makefile,v 1.43 2019/12/08 02:01:07 nia Exp $
 
 DISTNAME=		csound-${CSOUND_VERSION}
 PKGNAME=		csound6-${CSOUND_VERSION}
+PKGREVISION=		1
 CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_GITHUB:=csound/}
 GITHUB_PROJECT=		csound
@@ -17,8 +18,9 @@ USE_LANGUAGES=		c c++
 USE_TOOLS+=		bison
 CFLAGS+=		-g -D__PKGSRC_PREFIX__=\"${PREFIX}/\" -DBETA
 USE_CMAKE=		yes
-CMAKE_ARGS+=		-DUSE_PULSEAUDIO:BOOL=ON
-CMAKE_ARGS+=		-DBUILD_RELEASE=1 -DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=		-DBUILD_RELEASE=1
+CMAKE_ARGS+=		-DCMAKE_BUILD_TYPE=Release
+CMAKE_ARGS+=		-DBUILD_HDF5_OPCODES=OFF
 # CMAKE_INSTALL_RPATH doesn't work for some reason, so do it here.
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/csound6
 
@@ -30,7 +32,10 @@ PYTHON_VERSIONS_ACCEPTED=	27 # not yet p
 INSTALLATION_DIRS=	bin
 
 CHECK_PORTABILITY_SKIP+=	installer/misc/makedeb.sh \
+				installer/macosx/beta-build.sh \
+				installer/macosx/release-build.sh \
 				installer/macosx/release-build-10.8.sh \
+				installer/macosx/release-build-10.10.sh \
 				frontends/max_csound_tilde/installer/build-installer.sh \
 				frontends/max_csound_tilde/installer/build-installer-windows.sh
 

Index: pkgsrc/audio/csound6/PLIST
diff -u pkgsrc/audio/csound6/PLIST:1.7 pkgsrc/audio/csound6/PLIST:1.8
--- pkgsrc/audio/csound6/PLIST:1.7	Sat Dec  7 10:24:02 2019
+++ pkgsrc/audio/csound6/PLIST	Sun Dec  8 02:01:07 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2019/12/07 10:24:02 mrg Exp $
+@comment $NetBSD: PLIST,v 1.8 2019/12/08 02:01:07 nia Exp $
 bin/csound6
 include/csound6/CppSound.hpp
 include/csound6/CsoundFile.hpp
@@ -75,6 +75,8 @@ lib/csound6/plugins-6.0/libgetftargs.so
 lib/csound6/plugins-6.0/libgtf.so
 lib/csound6/plugins-6.0/libimage.so
 lib/csound6/plugins-6.0/libipmidi.so
+${PLIST.jack}lib/csound6/plugins-6.0/libjackTransport.so
+${PLIST.jack}lib/csound6/plugins-6.0/libjacko.so
 lib/csound6/plugins-6.0/libliveconv.so
 lib/csound6/plugins-6.0/libmixer.so
 lib/csound6/plugins-6.0/libpadsynth.so
@@ -82,6 +84,9 @@ lib/csound6/plugins-6.0/libplaterev.so
 lib/csound6/plugins-6.0/libpvsops.so
 lib/csound6/plugins-6.0/libpy.so
 lib/csound6/plugins-6.0/libquadbezier.so
+${PLIST.alsa}lib/csound6/plugins-6.0/librtalsa.so
+${PLIST.jack}lib/csound6/plugins-6.0/librtjack.so
+${PLIST.portaudio}lib/csound6/plugins-6.0/librtpa.so
 ${PLIST.pulseaudio}lib/csound6/plugins-6.0/librtpulse.so
 lib/csound6/plugins-6.0/libscansyn.so
 lib/csound6/plugins-6.0/libscugens.so

Index: pkgsrc/audio/csound6/options.mk
diff -u pkgsrc/audio/csound6/options.mk:1.1 pkgsrc/audio/csound6/options.mk:1.2
--- pkgsrc/audio/csound6/options.mk:1.1	Sat Dec  7 10:24:02 2019
+++ pkgsrc/audio/csound6/options.mk	Sun Dec  8 02:01:07 2019
@@ -1,13 +1,53 @@
-# $NetBSD: options.mk,v 1.1 2019/12/07 10:24:02 mrg Exp $
+# $NetBSD: options.mk,v 1.2 2019/12/08 02:01:07 nia Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.csound6
-PKG_SUPPORTED_OPTIONS=	pulseaudio
-PKG_SUGGESTED_OPTIONS=	pulseaudio
+PKG_SUPPORTED_OPTIONS=	jack portaudio pulseaudio
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+PKG_SUPPORTED_OPTIONS+=	alsa
+PKG_SUGGESTED_OPTIONS+=	alsa
+.elif ${OPSYS} != "Darwin" && ${OPSYS} != "Haiku"
+PKG_SUGGESTED_OPTIONS+=	portaudio
+.endif
 
 .include "../../mk/bsd.options.mk"
 
+PLIST_VARS+=		alsa
+.if !empty(PKG_OPTIONS:Malsa)
+.include "../../audio/alsa-lib/buildlink3.mk"
+CMAKE_ARGS+=		-DUSE_ALSA=ON
+PLIST.alsa=		yes
+.else
+CMAKE_ARGS+=		-DUSE_ALSA=OFF
+.endif
+
+PLIST_VARS+=		jack
+.if !empty(PKG_OPTIONS:Mjack)
+.include "../../audio/jack/buildlink3.mk"
+CMAKE_ARGS+=		-DUSE_JACK=ON
+PLIST.jack=		yes
+.else
+CMAKE_ARGS+=		-DUSE_JACK=OFF
+.endif
+
+PLIST_VARS+=		portaudio
+.if !empty(PKG_OPTIONS:Mportaudio)
+.include "../../audio/portaudio/buildlink3.mk"
+CMAKE_ARGS+=		-DUSE_PORTAUDIO=ON
+CMAKE_ARGS+=		-DPORTAUDIO_INCLUDE_PATH=${BUILDLINK_DIR}/include/portaudio2
+CMAKE_ARGS+=		-DCMAKE_LIBRARY_PATH=${BUILDLINK_PREFIX.portaudio}/lib/portaudio2
+PLIST.portaudio=	yes
+.else
+CMAKE_ARGS+=		-DUSE_PORTAUDIO=OFF
+.endif
+
 PLIST_VARS+=            pulseaudio
 .if !empty(PKG_OPTIONS:Mpulseaudio)
 .include "../../audio/pulseaudio/buildlink3.mk"
+CMAKE_ARGS+=		-DUSE_PULSEAUDIO=ON
 PLIST.pulseaudio=	yes
+.else
+CMAKE_ARGS+=		-DUSE_PULSEAUDIO=OFF
 .endif


--_----------=_157577046779410--