| Message ID | 20180311093358.20853-1-fontaine.fabrice@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/1] mpd: add support for libupnp18 | expand |
Hello, On Sun, 11 Mar 2018 10:33:58 +0100, Fabrice Fontaine wrote: > Instead of selecting BR2_PACKAGE_LIBUPNP, select BR2_PACKAGE_LIBUPNP18 > if BR2_PACKAGE_LIBUPNP is not enabled > > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> > --- > 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
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
Instead of selecting BR2_PACKAGE_LIBUPNP, select BR2_PACKAGE_LIBUPNP18 if BR2_PACKAGE_LIBUPNP is not enabled Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- 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(-)