Merge branch 'master' of code.vuplus.com:/opt/repository/openvuplus_3.0

[vuplus_openvuplus_3.0] / meta-openvuplus / conf / distro / vuplus.conf

diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf
index cdc358a..72b8e83 100644 (file)
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -37,9 +37,9 @@ PREFERRED_VERSION_udev ?= "182"
 
 PREFERRED_VERSION_elfutils ?= "0.148"
 
-PREFERRED_VERSION_libmicrohttpd ?= "0.4.6"
+PREFERRED_VERSION_libmicrohttpd ?= "0.9.34"
 PREFERRED_VERSION_libdvdcss ?= "1.2.10"
-PREFERRED_VERSION_taglib ?= "1.8"
+#PREFERRED_VERSION_taglib ?= "1.8"
 
 PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
@@ -50,7 +50,7 @@ PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-intermediate:gcc-cross-inter
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec commercial_libav"
+LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec commercial_libav commercial_minidlna"
 LICENSE_FLAGS_WHITELIST += "commercial_gstreamer1.0-plugins-ugly"
 
 FULL_OPTIMIZATION = "-Os -pipe ${DEBUG_FLAGS}"