From patchwork Thu Oct 16 22:28:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?J=C3=B6rg_Krause?= X-Patchwork-Id: 400389 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 368DC1400D6 for ; Fri, 17 Oct 2014 09:29:12 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 0984995AA0; Thu, 16 Oct 2014 22:29:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Yu1HWITiPwSw; Thu, 16 Oct 2014 22:29:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A889495AA5; Thu, 16 Oct 2014 22:29:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3B4D21C235D for ; Thu, 16 Oct 2014 22:29:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3B6BFA24C4 for ; Thu, 16 Oct 2014 22:29:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DlvTsSUpc_ZE for ; Thu, 16 Oct 2014 22:29:02 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx02.posteo.de (mx02.posteo.de [89.146.194.165]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 463B7A251E for ; Thu, 16 Oct 2014 22:29:02 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by mx02.posteo.de (Postfix) with ESMTP id D1CFF9DADE2 for ; Fri, 17 Oct 2014 00:29:00 +0200 (CEST) X-Virus-Scanned: amavisd-new at posteo.de Received: from posteo.de ([10.125.125.178]) (using TLS) by localhost (amavis1.posteo.de [10.125.125.165]) (amavisd-new, port 10026) with ESMTPS id x1vDOa1fjlGn; Fri, 17 Oct 2014 00:28:54 +0200 (CEST) Received: from mail.posteo.de (localhost [127.0.0.1]) by mail.posteo.de (Postfix) with ESMTPSA id 976432C011D; Fri, 17 Oct 2014 00:28:54 +0200 (CEST) From: =?UTF-8?q?J=C3=B6rg=20Krause?= To: buildroot@buildroot.org Date: Fri, 17 Oct 2014 00:28:58 +0200 Message-Id: <1413498543-643-3-git-send-email-jkrause@posteo.de> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1413498543-643-1-git-send-email-jkrause@posteo.de> References: <1413498543-643-1-git-send-email-jkrause@posteo.de> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 3/8] package/mpd: sort plugins alphabetically in mpd.mk X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Jörg Krause --- Changes v2 -> v3: - none Changes v1 -> v2: - none --- package/mpd/mpd.mk | 70 +++++++++++++++++++++++++++--------------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 1542338..b10a60a 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -48,13 +48,6 @@ else MPD_CONF_OPTS += --disable-audiofile endif -ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y) -MPD_DEPENDENCIES += pulseaudio -MPD_CONF_OPTS += --enable-pulse -else -MPD_CONF_OPTS += --disable-pulse -endif - ifeq ($(BR2_PACKAGE_MPD_BZIP2),y) MPD_DEPENDENCIES += bzip2 MPD_CONF_OPTS += --enable-bzip2 @@ -62,6 +55,13 @@ else MPD_CONF_OPTS += --disable-bzip2 endif +ifeq ($(BR2_PACKAGE_MPD_CURL),y) +MPD_DEPENDENCIES += libcurl +MPD_CONF_OPTS += --enable-curl +else +MPD_CONF_OPTS += --disable-curl +endif + ifeq ($(BR2_PACKAGE_MPD_FAAD2),y) MPD_DEPENDENCIES += faad2 MPD_CONF_OPTS += --enable-aac @@ -69,6 +69,13 @@ else MPD_CONF_OPTS += --disable-aac endif +ifeq ($(BR2_PACKAGE_MPD_FFMPEG),y) +MPD_DEPENDENCIES += ffmpeg +MPD_CONF_OPTS += --enable-ffmpeg +else +MPD_CONF_OPTS += --disable-ffmpeg +endif + ifeq ($(BR2_PACKAGE_MPD_FLAC),y) MPD_DEPENDENCIES += flac MPD_CONF_OPTS += --enable-flac @@ -76,13 +83,6 @@ else MPD_CONF_OPTS += --disable-flac endif -ifeq ($(BR2_PACKAGE_MPD_CURL),y) -MPD_DEPENDENCIES += libcurl -MPD_CONF_OPTS += --enable-curl -else -MPD_CONF_OPTS += --disable-curl -endif - ifeq ($(BR2_PACKAGE_MPD_LAME),y) MPD_DEPENDENCIES += lame MPD_CONF_OPTS += --enable-lame-encoder @@ -104,20 +104,6 @@ else MPD_CONF_OPTS += --disable-sndfile endif -ifeq ($(BR2_PACKAGE_MPD_OPUS),y) -MPD_DEPENDENCIES += opus libogg -MPD_CONF_OPTS += --enable-opus -else -MPD_CONF_OPTS += --disable-opus -endif - -ifeq ($(BR2_PACKAGE_MPD_VORBIS),y) -MPD_DEPENDENCIES += libvorbis -MPD_CONF_OPTS += --enable-vorbis --enable-vorbis-encoder -else -MPD_CONF_OPTS += --disable-vorbis --disable-vorbis-encoder -endif - ifeq ($(BR2_PACKAGE_MPD_MAD),y) MPD_DEPENDENCIES += libid3tag libmad MPD_CONF_OPTS += --enable-mad @@ -139,6 +125,20 @@ else MPD_CONF_OPTS += --disable-mpc endif +ifeq ($(BR2_PACKAGE_MPD_OPUS),y) +MPD_DEPENDENCIES += opus libogg +MPD_CONF_OPTS += --enable-opus +else +MPD_CONF_OPTS += --disable-opus +endif + +ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y) +MPD_DEPENDENCIES += pulseaudio +MPD_CONF_OPTS += --enable-pulse +else +MPD_CONF_OPTS += --disable-pulse +endif + ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) MPD_DEPENDENCIES += yajl MPD_CONF_OPTS += --enable-soundcloud @@ -169,6 +169,13 @@ else MPD_CONF_OPTS += --disable-twolame-encoder endif +ifeq ($(BR2_PACKAGE_MPD_VORBIS),y) +MPD_DEPENDENCIES += libvorbis +MPD_CONF_OPTS += --enable-vorbis --enable-vorbis-encoder +else +MPD_CONF_OPTS += --disable-vorbis --disable-vorbis-encoder +endif + ifeq ($(BR2_PACKAGE_MPD_WAVPACK),y) MPD_DEPENDENCIES += wavpack MPD_CONF_OPTS += --enable-wavpack @@ -176,13 +183,6 @@ else MPD_CONF_OPTS += --disable-wavpack endif -ifeq ($(BR2_PACKAGE_MPD_FFMPEG),y) -MPD_DEPENDENCIES += ffmpeg -MPD_CONF_OPTS += --enable-ffmpeg -else -MPD_CONF_OPTS += --disable-ffmpeg -endif - define MPD_INSTALL_EXTRA_FILES @if [ ! -f $(TARGET_DIR)/etc/mpd.conf ]; then \ $(INSTALL) -D package/mpd/mpd.conf \