[Buildroot] [PATCH 1/1] mpd: add support for libupnp18

Baruch Siach baruch at tkos.co.il
Sun Mar 11 04:57:53 UTC 2018


Hi Fabrice,

On Sat, Mar 10, 2018 at 11:40:56PM +0100, Fabrice Fontaine wrote:
> Instead of selecting BR2_PACKAGE_LIBUPNP, makes UPnP option depending on
> BR2_PACKAGE_LIBUPNP or BR2_PACKAGE_LIBUPNP18 and let the user choose his
> preferred libupnp version
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice at gmail.com>
> ---
>  package/mpd/Config.in | 5 ++++-
>  package/mpd/mpd.mk    | 4 +++-
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/package/mpd/Config.in b/package/mpd/Config.in
> index 5991b6f4bb..eee25c4c07 100644
> --- a/package/mpd/Config.in
> +++ b/package/mpd/Config.in
> @@ -308,11 +308,14 @@ config BR2_PACKAGE_MPD_TCP
>  
>  config BR2_PACKAGE_MPD_UPNP
>  	bool "UPnP"
> +	depends on BR2_PACKAGE_LIBUPNP || BR2_PACKAGE_LIBUPNP18
>  	select BR2_PACKAGE_EXPAT
> -	select BR2_PACKAGE_LIBUPNP

Why not

  select BR2_PACKAGE_LIBUPNP if !BR2_PACKAGE_LIBUPNP18

?

>  	help
>  	  Enable MPD UPnP client support.
>  
> +comment "UPnP client support needs libupnp or libupnp18"
> +	depends on !BR2_PACKAGE_LIBUPNP && !BR2_PACKAGE_LIBUPNP18
> +
>  endif
>  
>  comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9"
> 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

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -


More information about the buildroot mailing list