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 cce6d2a..72b8e83 100644 (file)
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -4,7 +4,7 @@
 
 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"
+SANITY_REQUIRED_UTILITIES = "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio sshpass glib-mkenums"
 INHERIT += "buildhistory recipe_sanity"
 BUILDHISTORY_COMMIT = "1"
 
@@ -19,7 +19,7 @@ DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
 
 # extra packages needed if opkg is used
 DISTRO_FEED_PREFIX ?= "official"
-DISTRO_FEED_URI = "http://code.vuplus.com/packages/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
@@ -28,21 +28,18 @@ SYSVINIT_ENABLED_GETTYS = ""
 # meta/classes/image_types.bbclass
 IMAGE_FSTYPES =+ "tar.bz2"
 
-
 # package versions
-PREFERRED_VERSION_pango ?= "1.28.4"
+GST_VERSION = "1.0"
+
+PREFERRED_VERSION_freetype ?= "2.4.12"
 
-PREFERRED_VERSION_wpa-supplicant ?= "2.1"
+PREFERRED_VERSION_udev ?= "182"
 
-PREFERRED_VERSION_linux-libc-headers ?= "${LINUXLIBCVERSION}"
-PREFERRED_VERSION_linux-libc-headers-nativesdk ?= "${LINUXLIBCVERSION}"
-#PREFERRED_VERSION_linux-libc-headers = "3.1"
-#PREFERRED_VERSION_linux-libc-headers-nativesdk = "3.1"
-#PREFERRED_VERSION_linux-libc-headers = "3.1.1"
-#PREFERRED_VERSION_linux-libc-headers-nativesdk = "3.1.1"
+PREFERRED_VERSION_elfutils ?= "0.148"
 
-# chang : udev_182 is not working with linux-libc-headers_2.6.31.
-PREFERRED_VERSION_udev ?= "124"
+PREFERRED_VERSION_libmicrohttpd ?= "0.9.34"
+PREFERRED_VERSION_libdvdcss ?= "1.2.10"
+#PREFERRED_VERSION_taglib ?= "1.8"
 
 PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
@@ -53,9 +50,8 @@ 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"
-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"
+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}"
 # build some core libs with better compiler optimization for better performance
@@ -90,7 +86,6 @@ PR_append_pn-zlib = "-opt1"
 # Disable installing ldconfig
 USE_LDCONFIG = "0"
 
-TCLIBC = "eglibc"
 TCLIBCAPPEND = ""
 
 # Drop unused PACKAGE_EXTRA_ARCHS
@@ -99,27 +94,25 @@ PACKAGE_EXTRA_ARCHS = "${TUNE_PKGARCH}"
 QEMU_TARGETS ?= "mipsel"
 
 PREMIRRORS ?= "\
-bzr://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
-cvs://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
-git://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
-hg://.*/.*    http://archive.vuplus.com/openvuplus_mirror/ \n \
-osc://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
-p4://.*/.*    http://archive.vuplus.com/openvuplus_mirror/ \n \
-svk://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
-svn://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
+bzr://.*/.*   http://archive.vuplus.com/openvuplus_mirror_30/ \n \
+cvs://.*/.*   http://archive.vuplus.com/openvuplus_mirror_30/ \n \
+git://.*/.*   http://archive.vuplus.com/openvuplus_mirror_30/ \n \
+hg://.*/.*    http://archive.vuplus.com/openvuplus_mirror_30/ \n \
+osc://.*/.*   http://archive.vuplus.com/openvuplus_mirror_30/ \n \
+p4://.*/.*    http://archive.vuplus.com/openvuplus_mirror_30/ \n \
+svn://.*/.*   http://archive.vuplus.com/openvuplus_mirror_30/ \n \
 bzr://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 cvs://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 git://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 hg://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n \
 osc://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 p4://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n \
-svk://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 svn://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n"
 
 MIRRORS =+ "\
-ftp://.*/.*    http://archive.vuplus.com/openvuplus_mirror/ \n \
-http://.*/.*   http://archive.vuplus.com/openvuplus_mirror/ \n \
-https://.*/.*  http://archive.vuplus.com/openvuplus_mirror/ \n \
+ftp://.*/.*    http://archive.vuplus.com/openvuplus_mirror_30/ \n \
+http://.*/.*   http://archive.vuplus.com/openvuplus_mirror_30/ \n \
+https://.*/.*  http://archive.vuplus.com/openvuplus_mirror_30/ \n \
 ftp://.*/.*    http://autobuilder.yoctoproject.org/sources/ \n \
 http://.*/.*   http://autobuilder.yoctoproject.org/sources/ \n \
 https://.*/.*  http://autobuilder.yoctoproject.org/sources/ \n"