vlc: set back upnp support

PATCH New Fabrice Fontaine 2 participants 2 messages Dec 18, 2017 – Dec 19, 2017

Share & tools

Fabrice Fontaine

author

2017-12-18 21:52 UTC #0 lore raw

PATCH v2 1/1 vlc: set back upnp support

Commit cb7aa25df8c3c4531354fd0f7d69208f89360c7b has disabled upnp support as --disable-upnp and --enable-upnp are both set if libupnp or libupnp18 is enabled

Signed-off-by Fabrice Fontaine <[email protected]>

---
Changes v1 -> v2:
- Fix patch number in title

 package/vlc/vlc.mk | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

package/vlc/vlc.mk +2 -9

index febd9e0319..56bfdced53 100644
@@ -281,16 +281,9 @@ else
 VLC_CONF_OPTS += --disable-theora
 endif
 
-ifeq ($(BR2_PACKAGE_LIBUPNP),y)
+ifeq ($(BR2_PACKAGE_LIBUPNP)$(BR2_PACKAGE_LIBUPNP18),y)
 VLC_CONF_OPTS += --enable-upnp
-VLC_DEPENDENCIES += libupnp
-else
-VLC_CONF_OPTS += --disable-upnp
-endif
-
-ifeq ($(BR2_PACKAGE_LIBUPNP18),y)
-VLC_CONF_OPTS += --enable-upnp
-VLC_DEPENDENCIES += libupnp18
+VLC_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBUPNP),libupnp,libupnp18)
 else
 VLC_CONF_OPTS += --disable-upnp
 endif

Signature · 1 line

2.14.1

Peter Korsgaard

2017-12-19 08:54 UTC #1 lore raw

PATCH v2 1/1 vlc: set back upnp support

Quoted 7 lines

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Fabrice" == Fabrice Fontaine <[email protected]> writes:
Commit cb7aa25df8c3c4531354fd0f7d69208f89360c7b has disabled upnp support as --disable-upnp and --enable-upnp are both set if libupnp or libupnp18 is enabled
Signed-off-by Fabrice Fontaine <[email protected]>

Committed, thanks.

Signature · 1 line

Bye, Peter Korsgaard