From patchwork Wed Oct 5 09:10:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Ziegler X-Patchwork-Id: 1686272 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 4Mj8314BjVz1yqn for ; Wed, 5 Oct 2022 20:11:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id CA8D940CD0; Wed, 5 Oct 2022 09:11:55 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org CA8D940CD0 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 YVbXuHLpoLJa; Wed, 5 Oct 2022 09:11:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id E40F740CD9; Wed, 5 Oct 2022 09:11:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E40F740CD9 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 09AFC1BF95D for ; Wed, 5 Oct 2022 09:11:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id BF8A740C58 for ; Wed, 5 Oct 2022 09:11:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org BF8A740C58 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 n5WRLiZHT0Aw 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 smtp2.osuosl.org BC58740C7B Received: from serv15.avernis.de (serv15.avernis.de [176.9.89.163]) by smtp2.osuosl.org (Postfix) with ESMTPS id BC58740C7B for ; Wed, 5 Oct 2022 09:11:14 +0000 (UTC) Received: from iago.. (unknown [151.19.224.153]) by serv15.avernis.de (Postfix) with ESMTPSA id 5462EBDE2FB0; Wed, 5 Oct 2022 11:11:11 +0200 (CEST) From: Andreas Ziegler To: buildroot@buildroot.org Date: Wed, 5 Oct 2022 11:10:29 +0200 Message-Id: <20221005091032.3014-2-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 1/4] package/mpd: fix reversed logic in tcp disable 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" Signed-off-by: Andreas Ziegler --- Changes v1 -> v2: - make this a separate patch package/mpd/mpd.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 5c15953984..4d73e6de03 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -285,8 +285,9 @@ else MPD_CONF_OPTS += -Dsqlite=disabled endif +# default setting is 'true' ifneq ($(BR2_PACKAGE_MPD_TCP),y) -MPD_CONF_OPTS += -Dtcp=true +MPD_CONF_OPTS += -Dtcp=false endif ifeq ($(BR2_PACKAGE_MPD_TREMOR),y) 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 From patchwork Wed Oct 5 09:10:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Ziegler X-Patchwork-Id: 1686274 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=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.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 4Mj83W08m4z1yqn for ; Wed, 5 Oct 2022 20:12:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 428D040C3D; Wed, 5 Oct 2022 09:12:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 428D040C3D 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 EciTokchuL2s; Wed, 5 Oct 2022 09:12:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 7529740C47; Wed, 5 Oct 2022 09:12:19 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 7529740C47 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 39B921BF95D for ; Wed, 5 Oct 2022 09:11:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 14C6360FE1 for ; Wed, 5 Oct 2022 09:11:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 14C6360FE1 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id T1FWawU57mZH for ; Wed, 5 Oct 2022 09:11:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 014CC60FCC Received: from serv15.avernis.de (serv15.avernis.de [176.9.89.163]) by smtp3.osuosl.org (Postfix) with ESMTPS id 014CC60FCC for ; Wed, 5 Oct 2022 09:11:27 +0000 (UTC) Received: from iago.. (unknown [151.19.224.153]) by serv15.avernis.de (Postfix) with ESMTPSA id AF69DBDE2DFE; Wed, 5 Oct 2022 11:11:24 +0200 (CEST) From: Andreas Ziegler To: buildroot@buildroot.org Date: Wed, 5 Oct 2022 11:10:31 +0200 Message-Id: <20221005091032.3014-4-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 3/4] package/mpd: introduce id3tag feature dependency 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" id3tag is a sub-feature that is needed to extract information from mp3 files. It selects the corresponding library and handles config settings. Two other features need this sub-feature, but handle all library selections themselves and omit enabling the id3tag feature. In consequence, users have to remember to select both mp3 library and id3tag, otherwise the mpd executable will not process mp3 files. Reflect feature dependency in mpd Config.in to make id3tag selection automatic. Signed-off-by: Andreas Ziegler --- Changes v1 -> v2: - make this a separate patch package/mpd/Config.in | 4 ++-- package/mpd/mpd.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 2606008e90..daf1469cae 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -127,7 +127,7 @@ config BR2_PACKAGE_MPD_LIBSNDFILE config BR2_PACKAGE_MPD_MAD bool "mad" default y - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_LIBMAD help Enable mad input support. @@ -141,7 +141,7 @@ config BR2_PACKAGE_MPD_MODPLUG config BR2_PACKAGE_MPD_MPG123 bool "mpg123" - select BR2_PACKAGE_LIBID3TAG + select BR2_PACKAGE_MPD_ID3TAG select BR2_PACKAGE_MPG123 help Enable mpg123 input support. diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index feab894f0f..1269b90661 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -190,7 +190,7 @@ MPD_CONF_OPTS += -Dsoxr=disabled endif ifeq ($(BR2_PACKAGE_MPD_MAD),y) -MPD_DEPENDENCIES += libid3tag libmad +MPD_DEPENDENCIES += libmad MPD_CONF_OPTS += -Dmad=enabled else MPD_CONF_OPTS += -Dmad=disabled @@ -204,7 +204,7 @@ MPD_CONF_OPTS += -Dmodplug=disabled endif ifeq ($(BR2_PACKAGE_MPD_MPG123),y) -MPD_DEPENDENCIES += libid3tag mpg123 +MPD_DEPENDENCIES += mpg123 MPD_CONF_OPTS += -Dmpg123=enabled else MPD_CONF_OPTS += -Dmpg123=disabled From patchwork Wed Oct 5 09:10:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Ziegler X-Patchwork-Id: 1686273 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4Mj83G3Dp6z1yqn for ; Wed, 5 Oct 2022 20:12:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id ADC9260FD2; Wed, 5 Oct 2022 09:12:08 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org ADC9260FD2 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qdlMDeDwx6NS; Wed, 5 Oct 2022 09:12:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 874FD60DF0; Wed, 5 Oct 2022 09:12:06 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 874FD60DF0 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 4D1511C11A0 for ; Wed, 5 Oct 2022 09:11:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id C33BA40CA4 for ; Wed, 5 Oct 2022 09:11:31 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org C33BA40CA4 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 lhTmeDL3Ep-w for ; Wed, 5 Oct 2022 09:11:30 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org A4C3A40C22 Received: from serv15.avernis.de (serv15.avernis.de [176.9.89.163]) by smtp2.osuosl.org (Postfix) with ESMTPS id A4C3A40C22 for ; Wed, 5 Oct 2022 09:11:29 +0000 (UTC) Received: from iago.. (unknown [151.19.224.153]) by serv15.avernis.de (Postfix) with ESMTPSA id 861FABDE0C02; Wed, 5 Oct 2022 11:11:26 +0200 (CEST) From: Andreas Ziegler To: buildroot@buildroot.org Date: Wed, 5 Oct 2022 11:10:32 +0200 Message-Id: <20221005091032.3014-5-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 4/4] package/mpd: introduce sub-options for expat and yajl 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" Make inclusion of expat and yajl libraries in the mpd build dependent on user selection, not presence of the libraries in the target filesystem. Signed-off-by: Andreas Ziegler --- Changes v1 -> v2: - based on a discussion w/ Arnout Vandecapelle, Yann Morin package/mpd/Config.in | 17 ++++++++++++++--- package/mpd/mpd.mk | 24 +++++++++++++++++------- 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index daf1469cae..fe4f22201a 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -20,6 +20,16 @@ menuconfig BR2_PACKAGE_MPD if BR2_PACKAGE_MPD +# mpd internal feature dependencies + +config BR2_PACKAGE_MPD_EXPAT + bool + select BR2_PACKAGE_EXPAT + +config BR2_PACKAGE_MPD_YAJL + bool + select BR2_PACKAGE_YAJL + comment "Archive plugins" config BR2_PACKAGE_MPD_BZIP2 @@ -48,14 +58,14 @@ config BR2_PACKAGE_MPD_QOBUZ depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS select BR2_PACKAGE_MPD_CURL select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_YAJL + select BR2_PACKAGE_MPD_YAJL help Play songs from the commercial streaming service Qobuz. config BR2_PACKAGE_MPD_SOUNDCLOUD bool "soundcloud" select BR2_PACKAGE_MPD_CURL - select BR2_PACKAGE_YAJL + select BR2_PACKAGE_MPD_YAJL help Enable soundcloud.com playlist support. @@ -399,9 +409,9 @@ choice config BR2_PACKAGE_MPD_UPNP_PUPNP bool "pupnp" - select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBUPNP select BR2_PACKAGE_MPD_CURL + select BR2_PACKAGE_MPD_EXPAT help Provides UPnP database access through libupnp (the legacy Portable SDK for UPnP devices). @@ -412,6 +422,7 @@ config BR2_PACKAGE_MPD_UPNP_NPUPNP bool "npupnp" select BR2_PACKAGE_LIBNPUPNP select BR2_PACKAGE_MPD_CURL + select BR2_PACKAGE_MPD_EXPAT help Provides UPnP database access through libnpupnp (a C++ reimplementation of the Portable UPnP library). diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 1269b90661..1c3b659220 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -78,6 +78,13 @@ else MPD_CONF_OPTS += -Ddsd=false endif +ifeq ($(BR2_PACKAGE_MPD_EXPAT),y) +MPD_DEPENDENCIES += expat +MPD_CONF_OPTS += -Dexpat=enabled +else +MPD_CONF_OPTS += -Dexpat=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_FAAD2),y) MPD_DEPENDENCIES += faad2 MPD_CONF_OPTS += -Dfaad=enabled @@ -252,7 +259,7 @@ MPD_CONF_OPTS += -Dpulse=disabled endif ifeq ($(BR2_PACKAGE_MPD_QOBUZ),y) -MPD_DEPENDENCIES += libgcrypt yajl +MPD_DEPENDENCIES += libgcrypt MPD_CONF_OPTS += -Dqobuz=enabled else MPD_CONF_OPTS += -Dqobuz=disabled @@ -273,7 +280,6 @@ MPD_CONF_OPTS += -Dsidplay=disabled endif ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) -MPD_DEPENDENCIES += yajl MPD_CONF_OPTS += -Dsoundcloud=enabled else MPD_CONF_OPTS += -Dsoundcloud=disabled @@ -306,13 +312,10 @@ MPD_CONF_OPTS += -Dtwolame=disabled endif ifeq ($(BR2_PACKAGE_MPD_UPNP_PUPNP),y) -MPD_DEPENDENCIES += \ - expat \ - libupnp +MPD_DEPENDENCIES += libupnp MPD_CONF_OPTS += -Dupnp=pupnp else ifeq ($(BR2_PACKAGE_MPD_UPNP_NPUPNP),y) -MPD_DEPENDENCIES += \ - libnpupnp +MPD_DEPENDENCIES += libnpupnp MPD_CONF_OPTS += -Dupnp=npupnp else ifeq ($(BR2_PACKAGE_MPD_UPNP_DISABLED),y) MPD_CONF_OPTS += -Dupnp=disabled @@ -333,6 +336,13 @@ else MPD_CONF_OPTS += -Dwavpack=disabled endif +ifeq ($(BR2_PACKAGE_MPD_YAJL),y) +MPD_DEPENDENCIES += yajl +MPD_CONF_OPTS += -Dyajl=enabled +else +MPD_CONF_OPTS += -Dyajl=disabled +endif + ifeq ($(BR2_PACKAGE_MPD_ZZIP),y) MPD_DEPENDENCIES += zziplib MPD_CONF_OPTS += -Dzzip=enabled