X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus_3.0;a=blobdiff_plain;f=meta-openvuplus%2Fconf%2Fdistro%2Fvuplus.conf;h=cc96317534985df8d9c38966a86d96afe88285ff;hp=a9fa2bc330ddc7135ea46cb0e0d104981a029c96;hb=44a03bcd91c13fdb31e1a20423d2dd01247a955d;hpb=ace0665511bd0f288a33f4aa1b6ab44c9a766c5c

diff --git a/meta-openvuplus/conf/distro/vuplus.conf b/meta-openvuplus/conf/distro/vuplus.conf
index a9fa2bc..cc96317 100644
--- a/meta-openvuplus/conf/distro/vuplus.conf
+++ b/meta-openvuplus/conf/distro/vuplus.conf
@@ -19,7 +19,8 @@ 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"
+DISTRO_FEED_URI = "http://192.168.102.71/feeds/oe30"
 EXTRAOPKGCONFIG = "distro-feed-configs"
 
 # meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -28,24 +29,17 @@ SYSVINIT_ENABLED_GETTYS = ""
 # meta/classes/image_types.bbclass
 IMAGE_FSTYPES =+ "tar.bz2"
 
-
 # package versions
+GST_VERSION = "1.0"
 PREFERRED_VERSION_pango ?= "1.28.4"
 
 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_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_VERSION_udev ?= "124"
 
 PREFERRED_PROVIDER_jpeg = "jpeg"
 PREFERRED_PROVIDER_jpeg-native = "jpeg-native"
@@ -60,6 +54,10 @@ LICENSE_FLAGS_WHITELIST = "commercial_gst-plugins-ugly commercial_lame commercia
 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_gstreamer1.0-plugins-ugly"
+COMMERCIAL_AUDIO_PLUGINS += "gstreamer1.0-plugins-ugly-mad gstreamer1.0-plugins-ugly-mpegaudioparse"
+COMMERCIAL_VIDEO_PLUGINS += "gstreamer1.0-plugins-ugly-mpeg2dec gstreamer1.0-plugins-ugly-mpegstream gstreamer1.0-plugins-bad-mpegvideoparse"
+
 FULL_OPTIMIZATION = "-Os -pipe ${DEBUG_FLAGS}"
 # build some core libs with better compiler optimization for better performance
 O3_OPT = "-O3 -pipe ${DEBUG_FLAGS}"