<div dir="ltr">Dear Baruch,<br><div class="gmail_extra"><br><div class="gmail_quote">2018-03-11 5:57 GMT+01:00 Baruch Siach <span dir="ltr"><<a href="mailto:baruch@tkos.co.il" target="_blank">baruch@tkos.co.il</a>></span>:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi Fabrice,<br>
<span class="gmail-"><br>
On Sat, Mar 10, 2018 at 11:40:56PM +0100, Fabrice Fontaine wrote:<br>
> Instead of selecting BR2_PACKAGE_LIBUPNP, makes UPnP option depending on<br>
> BR2_PACKAGE_LIBUPNP or BR2_PACKAGE_LIBUPNP18 and let the user choose his<br>
> preferred libupnp version<br>
><br>
> Signed-off-by: Fabrice Fontaine <<a href="mailto:fontaine.fabrice@gmail.com">fontaine.fabrice@gmail.com</a>><br>
> ---<br>
>  package/mpd/Config.in | 5 ++++-<br>
>  package/mpd/<a href="http://mpd.mk" rel="noreferrer" target="_blank">mpd.mk</a>    | 4 +++-<br>
>  2 files changed, 7 insertions(+), 2 deletions(-)<br>
><br>
> diff --git a/package/mpd/Config.in b/package/mpd/Config.in<br>
> index 5991b6f4bb..eee25c4c07 100644<br>
> --- a/package/mpd/Config.in<br>
> +++ b/package/mpd/Config.in<br>
> @@ -308,11 +308,14 @@ config BR2_PACKAGE_MPD_TCP<br>
><br>
>  config BR2_PACKAGE_MPD_UPNP<br>
>       bool "UPnP"<br>
> +     depends on BR2_PACKAGE_LIBUPNP || BR2_PACKAGE_LIBUPNP18<br>
>       select BR2_PACKAGE_EXPAT<br>
> -     select BR2_PACKAGE_LIBUPNP<br>
<br>
</span>Why not<br>
<br>
  select BR2_PACKAGE_LIBUPNP if !BR2_PACKAGE_LIBUPNP18<br>
<br>
?<br></blockquote><div>Because this creates a recursive dependency. Indeed, BR2_PACKAGE_LIBUPNP18 depends on !BR2_PACKAGE_LIBUPNP as both libraries can't be enabled at the same time. <br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
<div class="gmail-HOEnZb"><div class="gmail-h5"><br>
>       help<br>
>         Enable MPD UPnP client support.<br>
><br>
> +comment "UPnP client support needs libupnp or libupnp18"<br>
> +     depends on !BR2_PACKAGE_LIBUPNP && !BR2_PACKAGE_LIBUPNP18<br>
> +<br>
>  endif<br>
><br>
>  comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9"<br>
> diff --git a/package/mpd/<a href="http://mpd.mk" rel="noreferrer" target="_blank">mpd.mk</a> b/package/mpd/<a href="http://mpd.mk" rel="noreferrer" target="_blank">mpd.mk</a><br>
> index 26e82af0a8..f50e3d90c7 100644<br>
> --- a/package/mpd/<a href="http://mpd.mk" rel="noreferrer" target="_blank">mpd.mk</a><br>
> +++ b/package/mpd/<a href="http://mpd.mk" rel="noreferrer" target="_blank">mpd.mk</a><br>
> @@ -236,7 +236,9 @@ MPD_CONF_OPTS += --disable-twolame-encoder<br>
>  endif<br>
><br>
>  ifeq ($(BR2_PACKAGE_MPD_UPNP),y)<br>
> -MPD_DEPENDENCIES += expat libupnp<br>
> +MPD_DEPENDENCIES += \<br>
> +     expat \<br>
> +     $(if $(BR2_PACKAGE_LIBUPNP),<wbr>libupnp,libupnp18)<br>
>  MPD_CONF_OPTS += --enable-upnp<br>
>  else<br>
>  MPD_CONF_OPTS += --disable-upnp<br>
<br>
</div></div><span class="gmail-HOEnZb"><font color="#888888">baruch<br>
<br>
--<br>
     <a href="http://baruch.siach.name/blog/" rel="noreferrer" target="_blank">http://baruch.siach.name/blog/</a>                  ~. .~   Tk Open Systems<br>
=}----------------------------<wbr>--------------------ooO--U--<wbr>Ooo------------{=<br>
   - <a href="mailto:baruch@tkos.co.il">baruch@tkos.co.il</a> - tel: <a href="tel:%2B972.2.679.5364" value="+97226795364">+972.2.679.5364</a>, <a href="http://www.tkos.co.il" rel="noreferrer" target="_blank">http://www.tkos.co.il</a> -<br>
</font></span></blockquote></div>Best Regards,<br><br></div><div class="gmail_extra">Fabrice<br></div></div>