[Buildroot] [PATCH v2 03/11] package/mpd: reorder config items based on order in meson_options.txt

[Andreas Ziegler <br025@umbiko.net>]

MPD has 99 configurable options; of these, 44 are exposed in Buildroot's
Config.in. Sort order and grouping of these options are different within
the MPD project and Buildroot, which makes a comparison difficult.

Reorder entries in Config.in to reflect their order in meson_options.txt.
Also update at least some of the help texts to more closely resemble what
is published in the MPD manual.

Signed-off-by: Andreas Ziegler <br025@umbiko.net>
---
 package/mpd/Config.in | 345 +++++++++++++++++++++++-------------------
 1 file changed, 187 insertions(+), 158 deletions(-)

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index e0ee7fa533..9c3db26783 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -20,26 +20,148 @@ menuconfig BR2_PACKAGE_MPD
 
 if BR2_PACKAGE_MPD
 
-comment "Archive plugins"
+# linux kernel features
 
-config BR2_PACKAGE_MPD_BZIP2
-	bool "bzip2"
-	select BR2_PACKAGE_BZIP2
+config BR2_PACKAGE_MPD_IO_URING
+	bool "io_uring"
+	select BR2_PACKAGE_LIBURING
 	help
-	  Enable bzip2 archive support.
+	  Asynchronous I/O using kernel io_uring subsystem
 
-config BR2_PACKAGE_MPD_SQLITE
-	bool "sqlite"
-	select BR2_PACKAGE_SQLITE
+comment "Network support"
+
+config BR2_PACKAGE_MPD_TCP
+	bool "tcp sockets"
+	default y
 	help
-	  Enable sqlite database support.
-	  If you don't use sqlite it will use an ASCII database.
+	  Enable MPD to listen on tcp sockets.
 
-config BR2_PACKAGE_MPD_ZZIP
-	bool "zzip"
-	select BR2_PACKAGE_ZZIPLIB
+	  You want this on if MPD and the client(s) work
+	  on different machines (the usual scenario).
+
+comment "Audio formats"
+
+config BR2_PACKAGE_MPD_DSD
+	bool "dsd"
+	help
+	  Enable DSD audio support.
+
+comment "Database plugins"
+
+choice
+	prompt "UPnP"
+	default BR2_PACKAGE_MPD_UPNP_PUPNP if BR2_PACKAGE_MPD_UPNP # legacy
+	default BR2_PACKAGE_MPD_UPNP_DISABLED
+	help
+	  Enable MPD to access a UPnP based media server.
+
+	  For further information, see
+	  https://www.lesbonscomptes.com/upmpdcli/pages/upmpdcli-or-mpdupnp.html
+
+config BR2_PACKAGE_MPD_UPNP_PUPNP
+	bool "pupnp"
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_LIBUPNP
+	select BR2_PACKAGE_MPD_CURL
+	help
+	  Provides UPnP database access through libupnp
+	  (the legacy Portable SDK for UPnP devices).
+
+	  Introduces least additional dependencies.
+
+config BR2_PACKAGE_MPD_UPNP_NPUPNP
+	bool "npupnp"
+	select BR2_PACKAGE_EXPAT
+	select BR2_PACKAGE_LIBNPUPNP
+	select BR2_PACKAGE_MPD_CURL
+	help
+	  Provides UPnP database access through libnpupnp
+	  (a C++ reimplementation of the Portable UPnP library).
+
+	  This implementation is more modern, but also brings
+	  additional features not needed in this context, thus
+	  consuming more space.
+
+config BR2_PACKAGE_MPD_UPNP_DISABLED
+	bool "disabled"
+	help
+	  No UPnP client functionality.
+
+endchoice
+
+config BR2_PACKAGE_MPD_LIBMPDCLIENT
+	bool "libmpdclient"
+	select BR2_PACKAGE_MPD_TCP
+	select BR2_PACKAGE_LIBMPDCLIENT
+	help
+	  Enable support for the proxy database plugin. Provides
+	  access to the database of another MPD instance.
+
+if  BR2_PACKAGE_MPD_LIBSMBCLIENT || \
+	BR2_PACKAGE_MPD_UPNP_PUPNP || \
+	BR2_PACKAGE_MPD_UPNP_NPUPNP
+
+comment "Neighbour plugins"
+
+config BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT
+	bool "neighbor discovery support"
+	help
+	  Enable support for neighbor discovery.
+	  This option can be used in conjunction with the smbclient
+	  plugin to provide a list of SMB/CIFS servers or with the
+	  UPnP plugin to provide a list of UPnP servers on the local
+	  network. The neighbor plugin needs configuration in
+	  mpd.conf. For further information take a look at the MPD
+	  documentation.
+
+endif
+
+# Storage plugins not configurable, are disabled by default
+# Playlist plugins not configurable, are enabled by default
+
+comment "Input plugins"
+
+config BR2_PACKAGE_MPD_CDIO_PARANOIA
+	bool "cdio-paranoia"
+	select BR2_PACKAGE_LIBCDIO_PARANOIA
+	help
+	  Play audio CDs using cdio-paranoia.
+
+config BR2_PACKAGE_MPD_CURL
+	bool "curl"
+	select BR2_PACKAGE_MPD_TCP
+	select BR2_PACKAGE_LIBCURL
+	help
+	  Open remote files or streams over HTTP using libcurl.
+
+config BR2_PACKAGE_MPD_LIBMMS
+	bool "mms"
+	select BR2_PACKAGE_LIBMMS
 	help
-	  Enable ZIP archive support.
+	  Play streams with the MMS protocol using libmms.
+
+config BR2_PACKAGE_MPD_LIBNFS
+	bool "nfs"
+	select BR2_PACKAGE_LIBNFS
+	help
+	  Allow MPD to access files on NFS servers without actually
+	  mounting them (i.e. with libnfs in userspace, without help
+	  from the kernel's VFS layer).
+
+config BR2_PACKAGE_MPD_LIBSMBCLIENT
+	bool "samba"
+	depends on BR2_TOOLCHAIN_USES_GLIBC
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	depends on BR2_TOOLCHAIN_HAS_SYNC_4
+	select BR2_PACKAGE_SAMBA4
+	help
+	  Allows MPD to access files on SMB/CIFS servers
+	  (e.g. Samba or Microsoft Windows).
+
+comment "samba support needs a glibc toolchain w/ dynamic library, RPC"
+	depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \
+		!BR2_TOOLCHAIN_HAS_NATIVE_RPC
 
 comment "Commercial services"
 
@@ -52,30 +174,29 @@ config BR2_PACKAGE_MPD_QOBUZ
 	help
 	  Play songs from the commercial streaming service Qobuz.
 
-comment "Converter plugins"
+comment "Archive plugins"
 
-config BR2_PACKAGE_MPD_LIBSAMPLERATE
-	bool "libsamplerate"
-	select BR2_PACKAGE_LIBSAMPLERATE
+config BR2_PACKAGE_MPD_BZIP2
+	bool "bzip2"
+	select BR2_PACKAGE_BZIP2
 	help
-	  Enable libsamplerate input support.
-	  Select this for software sample rate conversion.
+	  Allows to load single bzip2 compressed files using libbz2.
 
-config BR2_PACKAGE_MPD_LIBSOXR
-	bool "libsoxr"
-	select BR2_PACKAGE_LIBSOXR
+config BR2_PACKAGE_MPD_ZZIP
+	bool "zzip"
+	select BR2_PACKAGE_ZZIPLIB
 	help
-	  Enable libsoxr resampler support.
-	  The SoX Resampler library performs software sample-rate
-	  conversion.
+	  Allows to load music files from ZIP archives using zziplib.
 
-comment "Decoder plugins"
+comment "Tag plugins"
 
-config BR2_PACKAGE_MPD_DSD
-	bool "dsd"
+config BR2_PACKAGE_MPD_ID3TAG
+	bool "id3tag"
+	select BR2_PACKAGE_LIBID3TAG
 	help
-	  Enable Digital Speech Decoder (DSD) support to play audio
-	  files encoded in a digital speech format.
+	  Enable ID3 support.
+
+comment "Decoder plugins"
 
 config BR2_PACKAGE_MPD_FAAD2
 	bool "faad2"
@@ -110,13 +231,6 @@ config BR2_PACKAGE_MPD_FLUIDSYNTH
 comment "fluidsynth support needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 
-config BR2_PACKAGE_MPD_LIBSNDFILE
-	bool "libsndfile"
-	select BR2_PACKAGE_LIBSNDFILE
-	help
-	  Enable libsndfile input/streaming support.
-	  Select this if you want to play back WAV files.
-
 config BR2_PACKAGE_MPD_MAD
 	bool "mad"
 	default y
@@ -154,6 +268,13 @@ config BR2_PACKAGE_MPD_SIDPLAY
 	help
 	  Enable C64 SID support.
 
+config BR2_PACKAGE_MPD_LIBSNDFILE
+	bool "sndfile"
+	select BR2_PACKAGE_LIBSNDFILE
+	help
+	  Enable libsndfile input/streaming support.
+	  Select this if you want to play back WAV files.
+
 config BR2_PACKAGE_MPD_TREMOR
 	bool "tremor"
 	depends on !BR2_PACKAGE_MPD_VORBIS
@@ -182,58 +303,39 @@ config BR2_PACKAGE_MPD_WAVPACK
 
 comment "Encoder plugins"
 
+comment "for ogg/vorbis encoding enable vorbis decoder"
+	depends on ! BR2_PACKAGE_MPD_VORBIS
+
 config BR2_PACKAGE_MPD_LAME
 	bool "lame"
 	select BR2_PACKAGE_LAME
 	help
-	  Enable lame (mp3) encoding support.
+	  Encodes into MP3 using the LAME library.
 
 config BR2_PACKAGE_MPD_TWOLAME
 	bool "twolame"
 	select BR2_PACKAGE_TWOLAME
 	help
-	  Enable TwoLAME mp2 encoding.
+	  Encodes into MP2 using the TwoLAME library.
 
-comment "Input plugins"
+comment "Filter plugins"
 
-config BR2_PACKAGE_MPD_CDIO_PARANOIA
-	bool "cdio-paranoia"
-	select BR2_PACKAGE_LIBCDIO_PARANOIA
-	help
-	  Enable cdio-paranoia support.
-
-config BR2_PACKAGE_MPD_CURL
-	bool "curl"
-	select BR2_PACKAGE_MPD_TCP
-	select BR2_PACKAGE_LIBCURL
+config BR2_PACKAGE_MPD_LIBSAMPLERATE
+	bool "libsamplerate"
+	select BR2_PACKAGE_LIBSAMPLERATE
 	help
-	  Enable curl streaming (http) support.
+	  libsamplerate (also known as Secret Rabbit Code) is a library
+	  for performing sample rate conversion of audio data.
 
-config BR2_PACKAGE_MPD_LIBMMS
-	bool "mms"
-	select BR2_PACKAGE_LIBMMS
-	help
-	  Enable MMS support.
+	  https://libsndfile.github.io/libsamplerate
 
-config BR2_PACKAGE_MPD_LIBNFS
-	bool "nfs"
-	select BR2_PACKAGE_LIBNFS
+config BR2_PACKAGE_MPD_LIBSOXR
+	bool "libsoxr"
+	select BR2_PACKAGE_LIBSOXR
 	help
-	  Enable Network File System (NFS) support.
-
-comment "samba support needs a glibc toolchain w/ dynamic library, RPC"
-	depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \
-		!BR2_TOOLCHAIN_HAS_NATIVE_RPC
+	  High quality, one-dimensional sample-rate conversion library.
 
-config BR2_PACKAGE_MPD_LIBSMBCLIENT
-	bool "samba"
-	depends on BR2_TOOLCHAIN_USES_GLIBC
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
-	depends on BR2_TOOLCHAIN_HAS_SYNC_4
-	select BR2_PACKAGE_SAMBA4
-	help
-	  Enable Samba support.
+	  https://sourceforge.net/p/soxr/wiki/Home
 
 comment "Output plugins"
 
@@ -305,7 +407,16 @@ config BR2_PACKAGE_MPD_SHOUTCAST
 	help
 	  Enable shoutcast streaming output support.
 
-comment "Miscellaneous plugins"
+comment "Miscellaneous libraries"
+
+config BR2_PACKAGE_MPD_SQLITE
+	bool "sqlite"
+	select BR2_PACKAGE_SQLITE
+	help
+	  Select this to enable the sticker database.
+
+	  Stickers are pieces of information attached to songs. Some
+	  clients use them to store ratings and other volatile data.
 
 config BR2_PACKAGE_MPD_AVAHI_SUPPORT
 	bool "avahi (zeroconf) support"
@@ -315,6 +426,7 @@ config BR2_PACKAGE_MPD_AVAHI_SUPPORT
 	select BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY
 	help
 	  Enable Avahi (zeroconf) support.
+
 	  Select this for multicast DNS/DNS-SD service discovery
 	  support. This allows MPD to publish service information on a
 	  local network.
@@ -322,89 +434,6 @@ config BR2_PACKAGE_MPD_AVAHI_SUPPORT
 comment "avahi support needs a toolchain w/ dynamic library"
 	depends on BR2_STATIC_LIBS
 
-config BR2_PACKAGE_MPD_IO_URING
-	bool "io_uring"
-	select BR2_PACKAGE_LIBURING
-	help
-	  Asynchronous I/O using kernel io_uring subsystem
-
-config BR2_PACKAGE_MPD_LIBMPDCLIENT
-	bool "libmpdclient"
-	select BR2_PACKAGE_MPD_TCP
-	select BR2_PACKAGE_LIBMPDCLIENT
-	help
-	  Enable libmpdclient support.
-
-config BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT
-	bool "neighbor discovery support"
-	depends on BR2_PACKAGE_MPD_LIBSMBCLIENT || !BR2_PACKAGE_MPD_UPNP_DISABLED
-	help
-	  Enable support for neighbor discovery.
-	  This option can be used in conjunction with the smbclient
-	  plugin to provide a list of SMB/CIFS servers or with the
-	  UPnP plugin to provide a list of UPnP servers on the local
-	  network. The neighbor plugin needs configuration in
-	  mpd.conf. For further information take a look at the MPD
-	  documentation.
-
-config BR2_PACKAGE_MPD_TCP
-	bool "tcp sockets"
-	default y
-	help
-	  Enable MPD to listen on tcp sockets.
-
-	  You want this on if MPD and the client(s) work
-	  on different machines (the usual scenario).
-
-choice
-	prompt "UPnP"
-	default BR2_PACKAGE_MPD_UPNP_PUPNP if BR2_PACKAGE_MPD_UPNP # legacy
-	default BR2_PACKAGE_MPD_UPNP_DISABLED
-	help
-	  Enable MPD to access a UPnP based media server.
-
-	  For further information, see
-	  https://www.lesbonscomptes.com/upmpdcli/pages/upmpdcli-or-mpdupnp.html
-
-config BR2_PACKAGE_MPD_UPNP_PUPNP
-	bool "pupnp"
-	select BR2_PACKAGE_EXPAT
-	select BR2_PACKAGE_LIBUPNP
-	select BR2_PACKAGE_MPD_CURL
-	help
-	  Provides UPnP database access through libupnp
-	  (the legacy Portable SDK for UPnP devices).
-
-	  Introduces least additional dependencies.
-
-config BR2_PACKAGE_MPD_UPNP_NPUPNP
-	bool "npupnp"
-	select BR2_PACKAGE_EXPAT
-	select BR2_PACKAGE_LIBNPUPNP
-	select BR2_PACKAGE_MPD_CURL
-	help
-	  Provides UPnP database access through libnpupnp
-	  (a C++ reimplementation of the Portable UPnP library).
-
-	  This implementation is more modern, but also brings
-	  additional features not needed in this context, thus
-	  consuming more space.
-
-config BR2_PACKAGE_MPD_UPNP_DISABLED
-	bool "disabled"
-	help
-	  No UPnP client functionality.
-
-endchoice
-
-comment "Tag plugins"
-
-config BR2_PACKAGE_MPD_ID3TAG
-	bool "id3tag"
-	select BR2_PACKAGE_LIBID3TAG
-	help
-	  Enable ID3 support.
-
 endif
 
 comment "mpd needs a toolchain w/ C++, threads, wchar, host-gcc 10, gcc 12, headers 5.6"
-- 
2.53.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot