From patchwork Sun Mar 11 09:33:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 884230 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Rnwc7ofH"; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zzbY43rB6zB3BF for ; Sun, 11 Mar 2018 20:34:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EC19C87D86; Sun, 11 Mar 2018 09:34:11 +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 ijDSvGG4ZW5d; Sun, 11 Mar 2018 09:34:11 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 441E18879E; Sun, 11 Mar 2018 09:34:11 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1F02F1C2C11 for ; Sun, 11 Mar 2018 09:34:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1B59C85EC2 for ; Sun, 11 Mar 2018 09:34:10 +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 7jR3ERHlfXQE for ; Sun, 11 Mar 2018 09:34:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E4D3385ECA for ; Sun, 11 Mar 2018 09:34:07 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id 188so10818111wme.1 for ; Sun, 11 Mar 2018 01:34:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=SanfKpgRyJTyZT9sEgfQ4y8MFb0FH5d+CxGSRjNNK8U=; b=Rnwc7ofHbh9jPx6Qwhc2XcicYSHm2aiLiv4jpQZI0BgZhlwHFzCXF7XTatNGMX3dLX QdmJcDqTWs7Q9ZYw58plLMElOkby/ew1/2rO2GM8jYjXSUfVXtmqLedMvDjHgfuFE8Rr 8Gs7CuZKKcYkjWboEvBdQUJFFF/6oLqa5QxgAref7e/z9BBOA0HrS+I2T/j1WLdGaEu5 FFveJeK0YazCSqZZ+dLe31rIXEukWztDrmbpQ78WCqjQrRszhCmBaRI2exXpHW2OONYK oNjBmVC4BlkiG5p/aQ4CGYk9mHpnhS9ObAXek/VGhjnDPMRwi7x0bKZKEf9kP7W9ZmLX c2yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=SanfKpgRyJTyZT9sEgfQ4y8MFb0FH5d+CxGSRjNNK8U=; b=HCia2vw/09ecR1SpHPdQE50uxz9XKUrfogyewu/VDu+ZXieC02d/9vmzE3+oU9S/O0 wQhk+pEEC0oq120o2RhDsLg0ChtSlqmgOvn+IyxY56qSt7vkZiHWdHmHycng3ENjVHNw GU0eZZltENdqtU7PlBHRnSQB1JV4dr7HBhJPoxt4tI1YuyCYV7YbeNBFsgEDdNqD4c+Z tIhzZJzycn0Kg6iyu4VqQnk1DChcAqTiZdNJYXBsT09FA+9JQjlkCyRFe2ESJfC0VMPo 2RIXBZuxF15Xy6Vm834rfkyFfcM3YFeCz/is/htc6FigOyMwceVWCe7lWWPO1tDulwpv FD+A== X-Gm-Message-State: AElRT7FSolvhGzy8BCCljr2+vHdqNQPx9+Y1LecEPv1jH2p5571zDH2h vYvUFHwget9rvP4Pq0LwyKUuSg== X-Google-Smtp-Source: AG47ELvT3Me6BlLPIMkEkP+rN4HXGdcHcg9Cd3Q+/xphN7Cx5kofhCCBNoUWxQQqq8+41jvdN2ho2g== X-Received: by 10.28.181.134 with SMTP id e128mr2934667wmf.57.1520760846244; Sun, 11 Mar 2018 01:34:06 -0800 (PST) Received: from fabrice-VirtualBox.home (ARennes-656-1-366-78.w2-11.abo.wanadoo.fr. [2.11.242.78]) by smtp.gmail.com with ESMTPSA id 8sm3694251wmf.13.2018.03.11.01.34.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 01:34:05 -0800 (PST) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 11 Mar 2018 10:33:58 +0100 Message-Id: <20180311093358.20853-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 Subject: [Buildroot] [PATCH v2,1/1] mpd: add support for libupnp18 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Instead of selecting BR2_PACKAGE_LIBUPNP, select BR2_PACKAGE_LIBUPNP18 if BR2_PACKAGE_LIBUPNP is not enabled Signed-off-by: Fabrice Fontaine --- Changes v1->v2 (after review of Baruch Siach and Yann E. Morin): - select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP instead of using depends on BR2_PACKAGE_LIBUPNP || BR2_PACKAGE_LIBUPNP18 package/mpd/Config.in | 2 +- package/mpd/mpd.mk | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/package/mpd/Config.in b/package/mpd/Config.in index 5991b6f4bb..bad32f8440 100644 --- a/package/mpd/Config.in +++ b/package/mpd/Config.in @@ -309,7 +309,7 @@ config BR2_PACKAGE_MPD_TCP config BR2_PACKAGE_MPD_UPNP bool "UPnP" select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_LIBUPNP + select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP help Enable MPD UPnP client support. diff --git a/package/mpd/mpd.mk b/package/mpd/mpd.mk index 26e82af0a8..f50e3d90c7 100644 --- a/package/mpd/mpd.mk +++ b/package/mpd/mpd.mk @@ -236,7 +236,9 @@ MPD_CONF_OPTS += --disable-twolame-encoder endif ifeq ($(BR2_PACKAGE_MPD_UPNP),y) -MPD_DEPENDENCIES += expat libupnp +MPD_DEPENDENCIES += \ + expat \ + $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18) MPD_CONF_OPTS += --enable-upnp else MPD_CONF_OPTS += --disable-upnp