Received: by mail.netbsd.org (Postfix, from userid 605) id 410D984E57; Fri, 20 Mar 2020 10:43:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BB5CE84D6B for ; Fri, 20 Mar 2020 10:43:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id IyUM0i5icyZM for ; Fri, 20 Mar 2020 10:43:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 29BA884D3C for ; Fri, 20 Mar 2020 10:43:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1CB7AFB27; Fri, 20 Mar 2020 10:43:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1584701016138680" MIME-Version: 1.0 Date: Fri, 20 Mar 2020 10:43:36 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/audio/musicpd To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200320104336.1CB7AFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1584701016138680 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Fri Mar 20 10:43:36 UTC 2020 Modified Files: pkgsrc/audio/musicpd: Makefile options.mk Log Message: musicpd: Further simplify and clean up options. id3 and sndfile provide fairly basic, nearly-always-expected functionality, so remove those from the hydra. To generate a diff of this commit: cvs rdiff -u -r1.211 -r1.212 pkgsrc/audio/musicpd/Makefile cvs rdiff -u -r1.34 -r1.35 pkgsrc/audio/musicpd/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1584701016138680 Content-Disposition: inline Content-Length: 3259 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/audio/musicpd/Makefile diff -u pkgsrc/audio/musicpd/Makefile:1.211 pkgsrc/audio/musicpd/Makefile:1.212 --- pkgsrc/audio/musicpd/Makefile:1.211 Fri Mar 20 10:23:03 2020 +++ pkgsrc/audio/musicpd/Makefile Fri Mar 20 10:43:35 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.211 2020/03/20 10:23:03 nia Exp $ +# $NetBSD: Makefile,v 1.212 2020/03/20 10:43:35 nia Exp $ DISTNAME= mpd-0.21.21 PKGNAME= ${DISTNAME:S/mpd/musicpd/} @@ -113,11 +113,14 @@ post-install: .include "../../devel/meson/build.mk" BUILDLINK_ABI_DEPENDS.flac+= flac>=1.2 .include "../../audio/flac/buildlink3.mk" +.include "../../audio/libid3tag/buildlink3.mk" .include "../../audio/libopus/buildlink3.mk" +.include "../../audio/libsndfile/buildlink3.mk" .include "../../audio/mpg123/buildlink3.mk" .include "../../databases/sqlite3/buildlink3.mk" .include "../../devel/boost-libs/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" +.include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../lang/python/versioned_dependencies.mk" .include "../../security/libgcrypt/buildlink3.mk" Index: pkgsrc/audio/musicpd/options.mk diff -u pkgsrc/audio/musicpd/options.mk:1.34 pkgsrc/audio/musicpd/options.mk:1.35 --- pkgsrc/audio/musicpd/options.mk:1.34 Mon Jul 15 13:47:14 2019 +++ pkgsrc/audio/musicpd/options.mk Fri Mar 20 10:43:35 2020 @@ -1,8 +1,22 @@ -# $NetBSD: options.mk,v 1.34 2019/07/15 13:47:14 nia Exp $ +# $NetBSD: options.mk,v 1.35 2020/03/20 10:43:35 nia Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd -PKG_SUPPORTED_OPTIONS= adplug avahi bzip2 cdparanoia chromaprint curl dbus faad ffmpeg fluidsynth id3 libao libgme lame jack libmms libmpdclient libsoxr libwildmidi mikmod modplug musepack musicpd-soundcloud openal pulseaudio samba samplerate sidplay shine shout sndfile tremor twolame upnp wavpack zziplib -PKG_SUGGESTED_OPTIONS= curl faad ffmpeg id3 libao musepack samplerate shout sndfile vorbis + +# audio outputs +PKG_SUPPORTED_OPTIONS+= jack openal libao pulseaudio +# codecs +PKG_SUPPORTED_OPTIONS+= adplug faad ffmpeg fluidsynth libgme libwildmidi +PKG_SUPPORTED_OPTIONS+= mikmod modplug musepack sidplay wavpack +# codecs (encoding only) +PKG_SUPPORTED_OPTIONS+= lame shine twolame +# archive formats +PKG_SUPPORTED_OPTIONS+= bzip2 zziplib +# networking/comms +PKG_SUPPORTED_OPTIONS+= avahi curl dbus libmms samba shout upnp +# misc +PKG_SUPPORTED_OPTIONS+= cdparanoia chromaprint musicpd-soundcloud libmpdclient + +PKG_SUGGESTED_OPTIONS= curl faad ffmpeg libao musepack samplerate shout vorbis PKG_OPTIONS_LEGACY_OPTS+= game-music-emu:libgme @@ -79,12 +93,6 @@ MESON_ARGS+= -Dfluidsynth=disabled MESON_ARGS+= -Dgme=disabled .endif -.if !empty(PKG_OPTIONS:Mid3) -. include "../../audio/libid3tag/buildlink3.mk" -.else -MESON_ARGS+= -Did3tag=disabled -.endif - .if !empty(PKG_OPTIONS:Mjack) . include "../../audio/jack/buildlink3.mk" .else @@ -195,12 +203,6 @@ MESON_ARGS+= -Dsidplay=disabled MESON_ARGS+= -Dshout=disabled .endif -.if !empty(PKG_OPTIONS:Msndfile) -. include "../../audio/libsndfile/buildlink3.mk" -.else -MESON_ARGS+= -Dsndfile=disabled -.endif - .if !empty(PKG_OPTIONS:Mtremor) . include "../../audio/tremor/buildlink3.mk" .else --_----------=_1584701016138680--