From nobody Fri Sep 02 23:44:07 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MKDyb70zzz4bgbg; Fri, 2 Sep 2022 23:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MKDyb6VTjz3DtZ; Fri, 2 Sep 2022 23:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662162247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wXoUleq+p8rNYQIqawiqMSCO5+vBDkanqkmTOYfCqdY=; b=tYDNNc08Nk53sGP/KhGXpDqUyk6pc/FrakCNNQCAuji5Goks7Ky8PXfB0TPz2p8xBIume5 S6DegqyeOGSAGS9BvT0EiShXsC0DRJfgcpLjAh4Kb/r+QSCRyVFBLE53PwwNAqKlxeHhcI rQQI7+4XbrIXDk30wRqUFmt+8TxoV3Dh69zKwo/RZvehLNNbr6//BCSfi7GuNPm46CceXu LZdNtQW6p+8P7c7rKTkHfTo1SSZafq/s/LceiTVOrLgvYPgBBYsP2FjU/MQkW1EVnTfwtq wAtwyhtQ233iUWlZ+SR8Y3G+jSsK5Omqhko1I8AfEG/P6HRqRq6ujUMC6orl2g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MKDyb5YMkzxwL; Fri, 2 Sep 2022 23:44:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 282Ni7Gn077323; Fri, 2 Sep 2022 23:44:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 282Ni7rt077322; Fri, 2 Sep 2022 23:44:07 GMT (envelope-from git) Date: Fri, 2 Sep 2022 23:44:07 GMT Message-Id: <202209022344.282Ni7rt077322@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: b1a251040cd6 - main - audio/drumstick: Add/rearrange options List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1a251040cd6235bdcdd713797ee2c3f9ef16d79 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662162247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wXoUleq+p8rNYQIqawiqMSCO5+vBDkanqkmTOYfCqdY=; b=inyNLZvRJ+2+SO7pRbqjM/BcEmugoZJuyCJEYqrzZxLfkIjWh2Z8FrCuBJqPVCiNFJ1QH/ K6cqQ/Vn3k1hapMxzZKMNwiv2kx84LHX9HeFDl3+LQR1eSzm/M39PmrYtal/3295hwT5tH gzZZpoorQL0zBl8HzveOD1On3Xxotb5KB32ZVk/cnyOaw4WxT/Hj37RFA/wCrdlTsvfVe5 M6FE5Cxy0AyxlbkemvXe0tjMm7Wc+bkBpgk1IHCGE8f00tpBg6QTfAtOdA1zzYGTk4IUwg E2T3prFFFnAB38MCgdlRBrspQajMxIHk9mALnMX8gXcxqX5ITN91pdzMMaAyYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662162247; a=rsa-sha256; cv=none; b=TaYpo5vl62XzyNqnb9n7VOSefINT0QqhlokPN8AJvpwOT5cOmvXbctkeTNptojilpMkNQD XNS+WUQ5vhSSmeYklwWTbtlW+7LIFhrrFvlV+Ej/M8LWq+BpkV8ZTRchCrwYnyoajuL6fy oAomXsEzBX9YF76zyUkRwXePXUfpe9i4a6DJdohOLgMVbPJg+ti/4+/Z4y2XrjOGs2QEEa 1L+ZX+pAzkDJaheBSYGkujTL7yB76SCTqpm/XjR/LTJAj/uI51n1y3RFN6fWvO/4amHEkm njmaw6bRGz8ZY92nfMphJSoIzrj1f2lWKu0msXyU65R1rCzVELWEzWPwpFqkoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1a251040cd6235bdcdd713797ee2c3f9ef16d79 commit b1a251040cd6235bdcdd713797ee2c3f9ef16d79 Author: Yuri Victorovich AuthorDate: 2022-09-02 23:40:30 +0000 Commit: Yuri Victorovich CommitDate: 2022-09-02 23:44:05 +0000 audio/drumstick: Add/rearrange options This fixes build for some combination of options. Reported by: hps@selasky.org --- audio/drumstick/Makefile | 29 +++++++++++++++++++---------- audio/drumstick/pkg-plist | 8 ++++---- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/audio/drumstick/Makefile b/audio/drumstick/Makefile index d136f3f2e501..d9326b8ccd1b 100644 --- a/audio/drumstick/Makefile +++ b/audio/drumstick/Makefile @@ -1,6 +1,6 @@ PORTNAME= drumstick DISTVERSION= 2.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio multimedia MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ @@ -10,31 +10,40 @@ COMMENT= MIDI libraries for Qt/C++ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth \ - libsonivox.so:audio/sonivox -RUN_DEPENDS= ${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2:audio/fluid-soundfont - USES= compiler:c++11-lang cmake desktop-file-utils pkgconfig qt:6 shared-mime-info tar:bz2 USE_QT= base svg 5compat tools_build USE_LDCONFIG= yes CMAKE_ARGS= -DUSE_QT=6 +CMAKE_OFF= BUILD_TESTING -OPTIONS_DEFINE= ALSA PULSEAUDIO MANPAGES -OPTIONS_DEFAULT= ALSA PULSEAUDIO MANPAGES +OPTIONS_DEFINE= ALSA MANPAGES +OPTIONS_MULTI= RT_BACKEND +OPTIONS_MULTI_RT_BACKEND= FLUIDSYNTH NETWORK SONIVOX +OPTIONS_DEFAULT= ALSA MANPAGES ${OPTIONS_MULTI_RT_BACKEND} OPTIONS_SUB= yes ALSA_CMAKE_BOOL= BUILD_ALSA ALSA_USES= localbase ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -PULSEAUDIO_CMAKE_BOOL= USE_PULSEAUDIO -PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio - MANPAGES_CMAKE_BOOL= BUILD_DOCS MANPAGES_BUILD_DEPENDS= xsltproc:textproc/libxslt \ docbook-xsl>0:textproc/docbook-xsl +FLUIDSYNTH_DESC= Build FluidSynth RT backend +FLUIDSYNTH_CMAKE_BOOL= USE_FLUIDSYNTH +FLUIDSYNTH_RUN_DEPENDS= ${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2:audio/fluid-soundfont +FLUIDSYNTH_LIB_DEPENDS= libfluidsynth.so:audio/fluidsynth + +NETWORK_DESC= Build Network RT backend +NETWORK_CMAKE_BOOL= USE_NETWORK # QtNetwork is used + +SONIVOX_DESC= Build FluidSynth RT backend +SONIVOX_CMAKE_BOOL= USE_SONIVOX USE_PULSEAUDIO # these two options have to be always equal +SONIVOX_LIB_DEPENDS= libpulse.so:audio/pulseaudio \ + libsonivox.so:audio/sonivox + post-patch: # instead of default.sf2 use FluidR3_GM.sf2 installed by fluid-soundfont @${REINPLACE_CMD} -e 's|"default.sf2"|"${LOCALBASE}/share/sounds/sf2/FluidR3_GM.sf2"|' \ diff --git a/audio/drumstick/pkg-plist b/audio/drumstick/pkg-plist index 16683d1e6dda..24b248cb3cb4 100644 --- a/audio/drumstick/pkg-plist +++ b/audio/drumstick/pkg-plist @@ -48,10 +48,10 @@ lib/cmake/drumstick/drumstick-widgets-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/drumstick/drumstick-widgets-targets.cmake %%ALSA%%lib/drumstick2/libdrumstick-rt-alsa-in.so %%ALSA%%lib/drumstick2/libdrumstick-rt-alsa-out.so -%%PULSEAUDIO%%lib/drumstick2/libdrumstick-rt-eassynth.so -lib/drumstick2/libdrumstick-rt-fluidsynth.so -lib/drumstick2/libdrumstick-rt-net-in.so -lib/drumstick2/libdrumstick-rt-net-out.so +%%SONIVOX%%lib/drumstick2/libdrumstick-rt-eassynth.so +%%FLUIDSYNTH%%lib/drumstick2/libdrumstick-rt-fluidsynth.so +%%NETWORK%%lib/drumstick2/libdrumstick-rt-net-in.so +%%NETWORK%%lib/drumstick2/libdrumstick-rt-net-out.so lib/drumstick2/libdrumstick-rt-oss-in.so lib/drumstick2/libdrumstick-rt-oss-out.so %%ALSA%%lib/libdrumstick-alsa.so