From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 18 Dec 2017 21:52:06 +0000 (+0100)
Subject: vlc: set back upnp support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=95d19955dddfb6c446a4eb9cce5813fe838f0b65;p=buildroot.git

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index febd9e0319..56bfdced53 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -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