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>
This commit is contained in:
Fabrice Fontaine 2017-12-18 22:52:06 +01:00 committed by Peter Korsgaard
parent a957d9a90a
commit 95d19955dd

View File

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