diff options
| author | Fabrice Fontaine <fontaine.fabrice@gmail.com> | 2017-12-18 22:52:06 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2017-12-19 09:53:34 +0100 |
| commit | 95d19955dddfb6c446a4eb9cce5813fe838f0b65 (patch) | |
| tree | b0b74e154001af781d84e25152e917c78c3e3c73 | |
| parent | a957d9a90ade4194dffe3eb2fc0136bc5d077c28 (diff) | |
| download | buildroot-95d19955dddfb6c446a4eb9cce5813fe838f0b65.tar.gz buildroot-95d19955dddfb6c446a4eb9cce5813fe838f0b65.zip | |
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>
| -rw-r--r-- | package/vlc/vlc.mk | 11 |
1 files changed, 2 insertions, 9 deletions
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 |
