X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Fconf%2Fdistro%2Fvuplus.conf;h=3d11c6648aac31c851035368b13ea10b5908df23;hp=9404814fcdeccfd74562ec05fd9855d3907b68ad;hb=38875c9b5c043e066ed208f4d2ac79c1bd5b4c83;hpb=3b586a2368e25fae033d81e0a713ec9eaa242b9e

diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf
index 9404814..3d11c66 100644
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -2,15 +2,15 @@
 #@NAME: OpenVuplus
 #@DESCRIPTION: Distribution configuration for OpenVuplus
 
-QA_LOG = "1"
+QA_LOGFILE = "${TMPDIR}/qa.log"
 #USER_CLASSES += "image-prelink"
 SANITY_REQUIRED_UTILITIES = "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio sshpass"
-INHERIT += "buildhistory recipe_sanity testlab"
+INHERIT += "buildhistory recipe_sanity"
 BUILDHISTORY_COMMIT = "1"
 
 DISTRO = "vuplus"
 DISTRO_NAME = "vuplus"
-DISTRO_VERSION = "2.1.0"
+DISTRO_VERSION = "3.0.0"
 DISTRO_PR ?= ""
 
 # meta/conf/distro/include/default-distrovars.inc
@@ -19,7 +19,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 # extra packages needed if opkg is used
 DISTRO_FEED_PREFIX ?= "official"
-DISTRO_FEED_URI = "http://archive.vuplus.com/openvuplus/${DISTRO_VERSION}/vuplus/feeds/stable"
+DISTRO_FEED_URI = "http://code.vuplus.com/packages/openvuplus/${DISTRO_VERSION}/vuplus/feeds/stable"
 EXTRAOPKGCONFIG = "distro-feed-configs"
 
 # meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -32,7 +32,7 @@ IMAGE_FSTYPES =+ "tar.bz2"
 # package versions
 PREFERRED_VERSION_pango ?= "1.28.4"
 
-PREFERRED_VERSION_wpa-supplicant ?= "0.7.3"
+PREFERRED_VERSION_wpa-supplicant ?= "2.1"
 
 PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
 PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
@@ -41,9 +41,14 @@ PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
 #PREFERRED_VERSION_linux-libc-headers = "3.1.1"
 #PREFERRED_VERSION_linux-libc-headers-nativesdk = "3.1.1"
 
+PREFERRED_VERSION_orc ?= "0.4.14"
+PREFERRED_VERSION_freetype ?= "2.4.12"
+
 # chang : udev_182 is not working with linux-libc-headers_2.6.31.
 PREFERRED_VERSION_udev ?= "124"
 
+PREFERRED_VERSION_libpng ?= "1.6.8"
+
 PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
 PREFERRED_PROVIDER_libfribidi = "libfribidi"
@@ -53,7 +58,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"
+LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercial_libmad commercial_mpeg2dec commercial_libav"
 COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
 COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"