From patchwork Wed Oct 5 09:10:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Ziegler X-Patchwork-Id: 1686271 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Mj82n1fTJz1yqn for ; Wed, 5 Oct 2022 20:11:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id DBB0240CDA; Wed, 5 Oct 2022 09:11:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org DBB0240CDA X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RvQLz8hCESSw; Wed, 5 Oct 2022 09:11:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id D5F0D40CB4; Wed, 5 Oct 2022 09:11:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D5F0D40CB4 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 7F1071BF95D for ; Wed, 5 Oct 2022 09:11:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 43FAD4182D for ; Wed, 5 Oct 2022 09:11:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 43FAD4182D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n9yPFdTv3unt for ; Wed, 5 Oct 2022 09:11:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 78E4F41835 Received: from serv15.avernis.de (serv15.avernis.de [176.9.89.163]) by smtp4.osuosl.org (Postfix) with ESMTPS id 78E4F41835 for ; Wed, 5 Oct 2022 09:11:16 +0000 (UTC) Received: from iago.. (unknown [151.19.224.153]) by serv15.avernis.de (Postfix) with ESMTPSA id F3BDDBDE2F83; Wed, 5 Oct 2022 11:11:12 +0200 (CEST) From: Andreas Ziegler To: buildroot@buildroot.org Date: Wed, 5 Oct 2022 11:10:30 +0200 Message-Id: <20221005091032.3014-3-br015@umbiko.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220409160921.GA3547512@scaer> References: <20220409160921.GA3547512@scaer> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.7 at serv15.avernis.de X-Virus-Status: Clean Subject: [Buildroot] [PATCH v2 2/4] package/mpd: add/enhance (kconfig + code) comments X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andreas Ziegler , YANN E MORIN , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Align kconfig comments with descriptions in the mpd manual. Add a kconfig comment to highlight the impact of ogg/vorbis selection. Add comments to makefile to explain remaining multiple dependency creation. Signed-off-by: Andreas Ziegler --- Changes v1 -> v2: - make this a separate patch package/mpd/Config.in | 9 ++++++--- package/mpd/mpd.mk | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 8f0af7b2d3..2606008e90 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -33,7 +33,7 @@ config BR2_PACKAGE_MPD_SQLITE select BR2_PACKAGE_SQLITE help Enable sqlite database support. - If you don't use sqlite it will use an ASCII database. + This is mandatory for the sticker database. config BR2_PACKAGE_MPD_ZZIP bool "zzip" @@ -81,8 +81,8 @@ comment "Decoder plugins" config BR2_PACKAGE_MPD_DSD bool "dsd" help - Enable Digital Speech Decoder (DSD) support to play audio - files encoded in a digital speech format. + Direct Stream Digital (DSD) support to play audio + files encoded in single bit format. config BR2_PACKAGE_MPD_FAAD2 bool "faad2" @@ -210,6 +210,9 @@ config BR2_PACKAGE_MPD_TWOLAME help Enable TwoLAME mp2 encoding. +comment "for ogg/vorbis encoding enable vorbis decoder" + depends on !BR2_PACKAGE_MPD_VORBIS + comment "Input plugins" config BR2_PACKAGE_MPD_CDIO_PARANOIA diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 4d73e6de03..feab894f0f 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -230,6 +230,7 @@ else MPD_CONF_OPTS += -Dopenal=disabled endif +# opus needs to be encapsulated in a container format, here ogg ifeq ($(BR2_PACKAGE_MPD_OPUS),y) MPD_DEPENDENCIES += opus libogg MPD_CONF_OPTS += -Dopus=enabled @@ -317,6 +318,7 @@ else ifeq ($(BR2_PACKAGE_MPD_UPNP_DISABLED),y) MPD_CONF_OPTS += -Dupnp=disabled endif +# handle decoder and encoder simultaneously ifeq ($(BR2_PACKAGE_MPD_VORBIS),y) MPD_DEPENDENCIES += libvorbis MPD_CONF_OPTS += -Dvorbis=enabled -Dvorbisenc=enabled