[Buildroot] [git commit] vlc: set back upnp support
Peter Korsgaard
peter at korsgaard.com
Tue Dec 19 08:53:34 UTC 2017
commit: https://git.buildroot.net/buildroot/commit/?id=95d19955dddfb6c446a4eb9cce5813fe838f0b65
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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 at gmail.com>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
package/vlc/vlc.mk | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index febd9e0..56bfdce 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
More information about the buildroot
mailing list