Skip to contentSkip to conversation

mpd: add support for libupnp18

PATCH New Fabrice Fontaine 2 participants 2 messages Mar 11, 2018 – Apr 1, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH v2 1/1 mpd: add support for libupnp18

Instead of selecting BR2_PACKAGE_LIBUPNP, select BR2_PACKAGE_LIBUPNP18 if BR2_PACKAGE_LIBUPNP is not enabled

Signed-off-by Fabrice Fontaine <[email protected]>

---
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(-)
package/mpd/Config.in +1 -1
index 5991b6f4bb..bad32f8440 100644
@@ -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.
package/mpd/mpd.mk +3 -1
index 26e82af0a8..f50e3d90c7 100644
@@ -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
Signature · 1 line
2.14.1
Applied
#1 lore raw

PATCH v2 1/1 mpd: add support for libupnp18

Hello,

Quoted 8 lines · Fabrice Fontaine

Instead of selecting BR2_PACKAGE_LIBUPNP, select BR2_PACKAGE_LIBUPNP18 if BR2_PACKAGE_LIBUPNP is not enabled

Signed-off-by Fabrice Fontaine <[email protected]>

---
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

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com