Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] mpd: add support for libupnp18
@ 2018-03-10 22:40 Fabrice Fontaine
  2018-03-11  4:57 ` Baruch Siach
  0 siblings, 1 reply; 5+ messages in thread
From: Fabrice Fontaine @ 2018-03-10 22:40 UTC (permalink / raw)
  To: buildroot

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

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] mpd: add support for libupnp18
  2018-03-10 22:40 [Buildroot] [PATCH 1/1] mpd: add support for libupnp18 Fabrice Fontaine
@ 2018-03-11  4:57 ` Baruch Siach
  2018-03-11  9:04   ` Fabrice Fontaine
  0 siblings, 1 reply; 5+ messages in thread
From: Baruch Siach @ 2018-03-11  4:57 UTC (permalink / raw)
  To: buildroot

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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] mpd: add support for libupnp18
  2018-03-11  4:57 ` Baruch Siach
@ 2018-03-11  9:04   ` Fabrice Fontaine
  2018-03-11  9:13     ` Baruch Siach
  2018-03-11  9:15     ` Yann E. MORIN
  0 siblings, 2 replies; 5+ messages in thread
From: Fabrice Fontaine @ 2018-03-11  9:04 UTC (permalink / raw)
  To: buildroot

Dear Baruch,

2018-03-11 5:57 GMT+01:00 Baruch Siach <baruch@tkos.co.il>:

> 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@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
>
> ?
>
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.

>
> >       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 -
>
Best Regards,

Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180311/7a83d827/attachment-0001.html>

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] mpd: add support for libupnp18
  2018-03-11  9:04   ` Fabrice Fontaine
@ 2018-03-11  9:13     ` Baruch Siach
  2018-03-11  9:15     ` Yann E. MORIN
  1 sibling, 0 replies; 5+ messages in thread
From: Baruch Siach @ 2018-03-11  9:13 UTC (permalink / raw)
  To: buildroot

Hi Fabrice,

On Sun, Mar 11, 2018 at 10:04:14AM +0100, Fabrice Fontaine wrote:
> 2018-03-11 5:57 GMT+01:00 Baruch Siach <baruch@tkos.co.il>:
> > 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@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
> >
> > ?
>
> 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.

So maybe

  select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP

Only BR2_PACKAGE_LIBUPNP18 depends on !BR2_PACKAGE_LIBUPNP, not the other way 
around. Using 'select' makes life easier for users for not so obvious 
dependencies.

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 -

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] mpd: add support for libupnp18
  2018-03-11  9:04   ` Fabrice Fontaine
  2018-03-11  9:13     ` Baruch Siach
@ 2018-03-11  9:15     ` Yann E. MORIN
  1 sibling, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2018-03-11  9:15 UTC (permalink / raw)
  To: buildroot

Fabrice, Baruch, All,

On 2018-03-11 10:04 +0100, Fabrice Fontaine spake thusly:
> Dear Baruch,
> 2018-03-11 5:57 GMT+01:00 Baruch Siach < [1]baruch@tkos.co.il>:
> 
>   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 < [2]fontaine.fabrice@gmail.com>
>   > ---
>   >? package/mpd/Config.in | 5 ++++-
>   >? package/mpd/ [3]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
> 
>   ?
> 
> 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.

Then: select BR2_PACKAGE_LIBUPNP18 if !BR2_PACKAGE_LIBUPNP
which seems to work for me here...

Regards,
Yann E. MORIN.

>   >? ? ? ?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/ [4]mpd.mk b/package/mpd/ [5]mpd.mk
>   > index 26e82af0a8..f50e3d90c7 100644
>   > --- a/package/mpd/ [6]mpd.mk
>   > +++ b/package/mpd/ [7]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
> 
>   --
>   ? ? ? [8]http://baruch.siach.name/blog/? ? ? ? ? ? ? ? ? ~. .~?
>   ?Tk Open Systems
>   =}------------------------------------------------ooO--U-- Ooo------------{=
>   ? ?- [9]baruch at tkos.co.il - tel: [10]+972.2.679.5364, [11]http://www.tkos.co.il -
> 
> Best Regards,
> 
> Fabrice
> 
> Links:
> 1. mailto:baruch at tkos.co.il
> 2. mailto:fontaine.fabrice at gmail.com
> 3. http://mpd.mk
> 4. http://mpd.mk
> 5. http://mpd.mk
> 6. http://mpd.mk
> 7. http://mpd.mk
> 8. http://baruch.siach.name/blog/
> 9. mailto:baruch at tkos.co.il
> 10. tel:%2B972.2.679.5364
> 11. http://www.tkos.co.il

> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot


-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-03-11  9:15 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-10 22:40 [Buildroot] [PATCH 1/1] mpd: add support for libupnp18 Fabrice Fontaine
2018-03-11  4:57 ` Baruch Siach
2018-03-11  9:04   ` Fabrice Fontaine
2018-03-11  9:13     ` Baruch Siach
2018-03-11  9:15     ` Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox