mpd: add support for libupnp18
PATCH 1/1 mpd: add support for libupnp18
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
--- package/mpd/Config.in | 5 ++++- package/mpd/mpd.mk | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)
package/mpd/Config.in +4 -1
@@ -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"
package/mpd/mpd.mk +3 -1
@@ -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
PATCH 1/1 mpd: add support for libupnp18
Hi Fabrice,
Quoted 15 lines · Fabrice Fontaine
Instead of selecting
BR2_PACKAGE_LIBUPNP, makes UPnP option depending onBR2_PACKAGE_LIBUPNPorBR2_PACKAGE_LIBUPNP18and let the user choose his preferred libupnp versionSigned-off-by Fabrice Fontaine <[email protected]>--- package/mpd/Config.in | 5 ++++- package/mpd/mpd.mk | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)package/mpd/Config.in +0
-0
package/mpd/Config.in config BR2_PACKAGE_MPD_TCP · line 312
Quoted 6 lines
package/mpd/Config.in +1
-1@@ -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
?
Quoted 14 lines
package/mpd/Config.in +3
-0help 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"package/mpd/mpd.mk +0
-0
package/mpd/mpd.mk MPD_CONF_OPTS += --disable-twolame-encoder · line 244
Quoted 10 lines
package/mpd/mpd.mk +3
-1@@ -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
Signature · 3 lines
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 -PATCH 1/1 mpd: add support for libupnp18
Dear Baruch,
2018-03-11 5:57 GMT+01:00 Baruch Siach <[email protected]>:
Quoted 27 lines
Hi Fabrice,
Quoted 15 lines · Fabrice Fontaine
Instead of selecting
BR2_PACKAGE_LIBUPNP, makes UPnP option depending onBR2_PACKAGE_LIBUPNPorBR2_PACKAGE_LIBUPNP18and let the user choose his preferred libupnp versionSigned-off-by Fabrice Fontaine <[email protected]>--- package/mpd/Config.in | 5 ++++- package/mpd/mpd.mk | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)package/mpd/Config.in +0
-0package/mpd/Config.in config BR2_PACKAGE_MPD_TCP · line 312
Quoted 6 lines
package/mpd/Config.in +1
-1@@ -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_LIBUPNPWhy not
Quoted 4 lines
select
BR2_PACKAGE_LIBUPNPif !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.
Quoted 28 lines
Quoted 15 lines
package/mpd/Config.in +3
-0help 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"package/mpd/mpd.mk +0
-0package/mpd/mpd.mk MPD_CONF_OPTS += --disable-twolame-encoder · line 244
Quoted 10 lines
package/mpd/mpd.mk +3
-1@@ -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-upnpbaruch
Quoted 7 lines
--
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>
PATCH 1/1 mpd: add support for libupnp18
Hi Fabrice,
Quoted 26 lines · Fabrice Fontaine
2018-03-11 5:57 GMT+01:00 Baruch Siach <[email protected]>:
Quoted 25 lines · Fabrice Fontaine
Quoted 15 lines
Instead of selecting
BR2_PACKAGE_LIBUPNP, makes UPnP option depending onBR2_PACKAGE_LIBUPNPorBR2_PACKAGE_LIBUPNP18and let the user choose his preferred libupnp versionSigned-off-by Fabrice Fontaine <[email protected]>--- package/mpd/Config.in | 5 ++++- package/mpd/mpd.mk | 4 +++- 2 files changed, 7 insertions(+), 2 deletions(-)package/mpd/Config.in +0
-0package/mpd/Config.in config BR2_PACKAGE_MPD_TCP · line 312
Quoted 6 lines
package/mpd/Config.in +1
-1@@ -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_LIBUPNPWhy not
Quoted 7 lines
Quoted 3 lines
select
BR2_PACKAGE_LIBUPNPif !BR2_PACKAGE_LIBUPNP18?
Because this creates a recursive dependency. Indeed,
BR2_PACKAGE_LIBUPNP18depends 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
Signature · 3 lines
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 -PATCH 1/1 mpd: add support for libupnp18
In reply to Fabrice FontaineFabrice, Baruch, All,
On 2018-03-11 10:04 +0100, Fabrice Fontaine spake thusly:
Quoted 29 lines
Dear Baruch,
2018-03-11 5:57 GMT+01:00 Baruch Siach < [1][email protected]>:Hi Fabrice,
Quoted 16 lines · Fabrice Fontaine
Instead of selecting
BR2_PACKAGE_LIBUPNP, makes UPnP option depending onBR2_PACKAGE_LIBUPNPorBR2_PACKAGE_LIBUPNP18and let the user choose his preferred libupnp versionSigned-off-by Fabrice Fontaine < [2][email protected]>---
? package/mpd/Config.in | 5 ++++-
? package/mpd/ [3]mpd.mk? ? | 4 +++-
? 2 files changed, 7 insertions(+), 2 deletions(-)package/mpd/Config.in +0
-0@@ -308,11 +308,14 @@ config BR2_PACKAGE_MPD_TCPQuoted 5 lines
? config
BR2_PACKAGE_MPD_UPNP
? ? ? ?bool "UPnP"
+? ? ?depends onBR2_PACKAGE_LIBUPNP||BR2_PACKAGE_LIBUPNP18? ? ? ?selectBR2_PACKAGE_EXPAT
-? ? ?selectBR2_PACKAGE_LIBUPNPWhy not
Quoted 6 lines
? select
BR2_PACKAGE_LIBUPNPif !BR2_PACKAGE_LIBUPNP18?
Because this creates a recursive dependency. Indeed,
BR2_PACKAGE_LIBUPNP18depends 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.
Quoted 54 lines
Quoted 21 lines
? ? ? ?help
? ? ? ? ?Enable MPD UPnP client support.package/mpd/Config.in +3
-0+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"
package/mpd/ [7]mpd.mk renamed from package/mpd/ [6]mpd.mk +0
-0@@ -236,7 +236,9 @@ MPD_CONF_OPTS += --disable-twolame-encoder? endif
? ifeq ($(BR2_PACKAGE_MPD_UPNP),y)
package/mpd/ [7]mpd.mk renamed from package/mpd/ [6]mpd.mk +3
-1-MPD_DEPENDENCIES += expat libupnp +MPD_DEPENDENCIES += \ +? ? ?expat \ +? ? ?$(if $(BR2_PACKAGE_LIBUPNP), libupnp,libupnp18)Quoted 3 lines
?
MPD_CONF_OPTS+= --enable-upnp
? else
?MPD_CONF_OPTS+= --disable-upnpbaruch
--
? ? ? [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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'