Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 9AB961A923A for ; Sat, 13 Nov 2021 10:48:06 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id BC4DD84F15; Sat, 13 Nov 2021 10:48:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 013D484EE5 for ; Sat, 13 Nov 2021 10:48:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id yWnead_rU0Ex for ; Sat, 13 Nov 2021 10:48:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 06E8784EDB for ; Sat, 13 Nov 2021 10:48:03 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E99E0FAEC; Sat, 13 Nov 2021 10:48:03 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1636800483137970" MIME-Version: 1.0 Date: Sat, 13 Nov 2021 10:48:03 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/audio To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20211113104803.E99E0FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1636800483137970 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Sat Nov 13 10:48:03 UTC 2021 Modified Files: pkgsrc/audio/amsynth: Makefile options.mk pkgsrc/audio/hydrogen: Makefile options.mk pkgsrc/audio/lmms: Makefile options.mk pkgsrc/audio/musescore: Makefile options.mk pkgsrc/audio/zynaddsubfx: Makefile options.mk Added Files: pkgsrc/audio/jack: platform.mk Log Message: audio: Enable JACK (where supported) for some "professional" tools To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/audio/amsynth/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/amsynth/options.mk cvs rdiff -u -r1.75 -r1.76 pkgsrc/audio/hydrogen/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/hydrogen/options.mk cvs rdiff -u -r0 -r1.1 pkgsrc/audio/jack/platform.mk cvs rdiff -u -r1.76 -r1.77 pkgsrc/audio/lmms/Makefile cvs rdiff -u -r1.5 -r1.6 pkgsrc/audio/lmms/options.mk cvs rdiff -u -r1.25 -r1.26 pkgsrc/audio/musescore/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/audio/musescore/options.mk cvs rdiff -u -r1.3 -r1.4 pkgsrc/audio/zynaddsubfx/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/audio/zynaddsubfx/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1636800483137970 Content-Disposition: inline Content-Length: 7425 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/amsynth/Makefile diff -u pkgsrc/audio/amsynth/Makefile:1.10 pkgsrc/audio/amsynth/Makefile:1.11 --- pkgsrc/audio/amsynth/Makefile:1.10 Wed Sep 8 21:04:53 2021 +++ pkgsrc/audio/amsynth/Makefile Sat Nov 13 10:48:03 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2021/09/08 21:04:53 nia Exp $ +# $NetBSD: Makefile,v 1.11 2021/11/13 10:48:03 nia Exp $ DISTNAME= amsynth-1.12.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=amsynth/} GITHUB_PROJECT= amsynth Index: pkgsrc/audio/amsynth/options.mk diff -u pkgsrc/audio/amsynth/options.mk:1.1 pkgsrc/audio/amsynth/options.mk:1.2 --- pkgsrc/audio/amsynth/options.mk:1.1 Sat Apr 11 10:56:54 2020 +++ pkgsrc/audio/amsynth/options.mk Sat Nov 13 10:48:03 2021 @@ -1,9 +1,15 @@ -# $NetBSD: options.mk,v 1.1 2020/04/11 10:56:54 nia Exp $ +# $NetBSD: options.mk,v 1.2 2021/11/13 10:48:03 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.amsynth -PKG_SUPPORTED_OPTIONS= alsa jack +PKG_SUPPORTED_OPTIONS= alsa PKG_SUGGESTED_OPTIONS.Linux= alsa +.include "../../audio/jack/platform.mk" +.if ${PLATFORM_SUPPORTS_JACK:tl} == "yes" +PKG_SUPPORTED_OPTIONS+= jack +PKG_SUGGESTED_OPTIONS+= jack +.endif + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Malsa) Index: pkgsrc/audio/hydrogen/Makefile diff -u pkgsrc/audio/hydrogen/Makefile:1.75 pkgsrc/audio/hydrogen/Makefile:1.76 --- pkgsrc/audio/hydrogen/Makefile:1.75 Wed Sep 29 19:00:18 2021 +++ pkgsrc/audio/hydrogen/Makefile Sat Nov 13 10:48:03 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.75 2021/09/29 19:00:18 adam Exp $ +# $NetBSD: Makefile,v 1.76 2021/11/13 10:48:03 nia Exp $ DISTNAME= hydrogen-1.0.2 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=hydrogen-music/} GITHUB_PROJECT= Hydrogen Index: pkgsrc/audio/hydrogen/options.mk diff -u pkgsrc/audio/hydrogen/options.mk:1.2 pkgsrc/audio/hydrogen/options.mk:1.3 --- pkgsrc/audio/hydrogen/options.mk:1.2 Thu Jun 18 12:57:48 2020 +++ pkgsrc/audio/hydrogen/options.mk Sat Nov 13 10:48:03 2021 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2020/06/18 12:57:48 nia Exp $ +# $NetBSD: options.mk,v 1.3 2021/11/13 10:48:03 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.hydrogen @@ -6,6 +6,12 @@ PKG_SUPPORTED_OPTIONS+= alsa jack porta PKG_SUGGESTED_OPTIONS.Linux= alsa PKG_SUGGESTED_OPTIONS.*= portaudio +.include "../../audio/jack/platform.mk" +.if ${PLATFORM_SUPPORTS_JACK:tl} == "yes" +PKG_SUPPORTED_OPTIONS+= jack +PKG_SUGGESTED_OPTIONS+= jack +.endif + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Malsa) Index: pkgsrc/audio/lmms/Makefile diff -u pkgsrc/audio/lmms/Makefile:1.76 pkgsrc/audio/lmms/Makefile:1.77 --- pkgsrc/audio/lmms/Makefile:1.76 Wed Sep 8 21:04:56 2021 +++ pkgsrc/audio/lmms/Makefile Sat Nov 13 10:48:03 2021 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.76 2021/09/08 21:04:56 nia Exp $ +# $NetBSD: Makefile,v 1.77 2021/11/13 10:48:03 nia Exp $ DISTNAME= lmms_1.2.2 PKGNAME= ${DISTNAME:S/_/-/1} -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=LMMS/} GITHUB_PROJECT= lmms Index: pkgsrc/audio/lmms/options.mk diff -u pkgsrc/audio/lmms/options.mk:1.5 pkgsrc/audio/lmms/options.mk:1.6 --- pkgsrc/audio/lmms/options.mk:1.5 Thu Oct 24 17:55:22 2019 +++ pkgsrc/audio/lmms/options.mk Sat Nov 13 10:48:03 2021 @@ -1,11 +1,16 @@ -# $NetBSD: options.mk,v 1.5 2019/10/24 17:55:22 nia Exp $ +# $NetBSD: options.mk,v 1.6 2021/11/13 10:48:03 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.lmms PKG_SUPPORTED_OPTIONS+= alsa jack portaudio pulseaudio sdl PKG_SUGGESTED_OPTIONS.Linux+= alsa -.include "../../mk/bsd.fast.prefs.mk" +.include "../../audio/jack/platform.mk" +.if ${PLATFORM_SUPPORTS_JACK:tl} == "yes" +PKG_SUPPORTED_OPTIONS+= jack +PKG_SUGGESTED_OPTIONS+= jack +.endif + .include "../../mk/oss.buildlink3.mk" .if ${OPSYS} != "Linux" && ${OSS_TYPE} == "none" Index: pkgsrc/audio/musescore/Makefile diff -u pkgsrc/audio/musescore/Makefile:1.25 pkgsrc/audio/musescore/Makefile:1.26 --- pkgsrc/audio/musescore/Makefile:1.25 Wed Sep 8 21:04:56 2021 +++ pkgsrc/audio/musescore/Makefile Sat Nov 13 10:48:03 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.25 2021/09/08 21:04:56 nia Exp $ +# $NetBSD: Makefile,v 1.26 2021/11/13 10:48:03 nia Exp $ DISTNAME= musescore-3.6.2 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_GITHUB:=musescore/} GITHUB_PROJECT= MuseScore Index: pkgsrc/audio/musescore/options.mk diff -u pkgsrc/audio/musescore/options.mk:1.2 pkgsrc/audio/musescore/options.mk:1.3 --- pkgsrc/audio/musescore/options.mk:1.2 Sun Oct 20 11:10:47 2019 +++ pkgsrc/audio/musescore/options.mk Sat Nov 13 10:48:03 2021 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2019/10/20 11:10:47 nia Exp $ +# $NetBSD: options.mk,v 1.3 2021/11/13 10:48:03 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.musescore PKG_SUPPORTED_OPTIONS= alsa jack portaudio pulseaudio @@ -11,6 +11,12 @@ PKG_SUGGESTED_OPTIONS= alsa PKG_SUGGESTED_OPTIONS= portaudio .endif +.include "../../audio/jack/platform.mk" +.if ${PLATFORM_SUPPORTS_JACK:tl} == "yes" +PKG_SUPPORTED_OPTIONS+= jack +PKG_SUGGESTED_OPTIONS+= jack +.endif + .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Malsa) Index: pkgsrc/audio/zynaddsubfx/Makefile diff -u pkgsrc/audio/zynaddsubfx/Makefile:1.3 pkgsrc/audio/zynaddsubfx/Makefile:1.4 --- pkgsrc/audio/zynaddsubfx/Makefile:1.3 Wed Sep 8 21:04:58 2021 +++ pkgsrc/audio/zynaddsubfx/Makefile Sat Nov 13 10:48:03 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.3 2021/09/08 21:04:58 nia Exp $ +# $NetBSD: Makefile,v 1.4 2021/11/13 10:48:03 nia Exp $ DISTNAME= zynaddsubfx-3.0.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zynaddsubfx/} EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/audio/zynaddsubfx/options.mk diff -u pkgsrc/audio/zynaddsubfx/options.mk:1.1 pkgsrc/audio/zynaddsubfx/options.mk:1.2 --- pkgsrc/audio/zynaddsubfx/options.mk:1.1 Fri Oct 30 15:47:01 2020 +++ pkgsrc/audio/zynaddsubfx/options.mk Sat Nov 13 10:48:03 2021 @@ -1,11 +1,17 @@ -# $NetBSD: options.mk,v 1.1 2020/10/30 15:47:01 nia Exp $ +# $NetBSD: options.mk,v 1.2 2021/11/13 10:48:03 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.zynaddsubfx PKG_SUPPORTED_OPTIONS= alsa jack portaudio -PKG_SUGGESTED_OPTIONS.Linux= alsa jack +PKG_SUGGESTED_OPTIONS.Linux= alsa .include "../../mk/oss.buildlink3.mk" +.include "../../audio/jack/platform.mk" +.if ${PLATFORM_SUPPORTS_JACK:tl} == "yes" +PKG_SUPPORTED_OPTIONS+= jack +PKG_SUGGESTED_OPTIONS+= jack +.endif + .if ${OSS_TYPE} == "none" && ${OPSYS} != "Linux" PKG_SUGGESTED_OPTIONS= portaudio .endif Added files: Index: pkgsrc/audio/jack/platform.mk diff -u /dev/null pkgsrc/audio/jack/platform.mk:1.1 --- /dev/null Sat Nov 13 10:48:03 2021 +++ pkgsrc/audio/jack/platform.mk Sat Nov 13 10:48:03 2021 @@ -0,0 +1,21 @@ +# $NetBSD: platform.mk,v 1.1 2021/11/13 10:48:03 nia Exp $ + +.if !defined(PLATFORM_SUPPORTS_JACK) +. include "../../mk/bsd.fast.prefs.mk" + +JACK_PLATFORMS+= Darwin-*-* +JACK_PLATFORMS+= Linux-*-* + +.if ${OPSYS} == "NetBSD" && empty(OPSYS_VERSION:M[5-8].*) +PLATFORM_SUPPORTS_JACK= yes +.endif + +. for _jack_platform in ${JACK_PLATFORMS} +. if !empty(MACHINE_PLATFORM:M${_jack_platform}) +PLATFORM_SUPPORTS_JACK= yes +. endif +. endfor + +PLATFORM_SUPPORTS_JACK?= no + +.endif # !defined(PLATFORM_SUPPORTS_JACK) --_----------=_1636800483137970--