[pkgsrc/trunk]: pkgsrc/audio/musicpd musicpd: Further simplify and clean up o...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5e61aa9c83db
branches:  trunk
changeset: 425176:5e61aa9c83db
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Mar 20 10:43:35 2020 +0000

description:
musicpd: Further simplify and clean up options.

id3 and sndfile provide fairly basic, nearly-always-expected functionality,
so remove those from the hydra.

diffstat:

 audio/musicpd/Makefile   |   5 ++++-
 audio/musicpd/options.mk |  32 +++++++++++++++++---------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diffs (79 lines):

diff -r f4b5da8ffd80 -r 5e61aa9c83db audio/musicpd/Makefile
--- a/audio/musicpd/Makefile    Fri Mar 20 10:25:15 2020 +0000
+++ b/audio/musicpd/Makefile    Fri Mar 20 10:43:35 2020 +0000
@@ -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 @@
 .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"
diff -r f4b5da8ffd80 -r 5e61aa9c83db audio/musicpd/options.mk
--- a/audio/musicpd/options.mk  Fri Mar 20 10:25:15 2020 +0000
+++ b/audio/musicpd/options.mk  Fri Mar 20 10:43:35 2020 +0000
@@ -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+=   -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+=   -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