[oe-commits] org.oe.dev merge of '0186939e5675c48f3e8ee1c853bd816dcc4a15a8'

[oe commit]

merge of '0186939e5675c48f3e8ee1c853bd816dcc4a15a8'
     and '8c39fbcad580dce7b65af91c3db4a99f9d0ba40b'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 58e565350ad0d12fcbf3066de5c104035165c4c5
ViewMTN: http://monotone.openembedded.org/revision/info/58e565350ad0d12fcbf3066de5c104035165c4c5
Files:
1
packages/gstreamer/gst-meta-base_0.10.bb
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-2007-preferred-versions.inc
Diffs:

#
# mt diff -r0186939e5675c48f3e8ee1c853bd816dcc4a15a8 -r58e565350ad0d12fcbf3066de5c104035165c4c5
#
# 
# 
# patch "packages/gstreamer/gst-meta-base_0.10.bb"
#  from [48b37c86c01f0e9c728ce5b6e448e32185e1bbc6]
#    to [f7556e526303b21566c49eb45960b865ca58944b]
# 
============================================================
--- packages/gstreamer/gst-meta-base_0.10.bb	48b37c86c01f0e9c728ce5b6e448e32185e1bbc6
+++ packages/gstreamer/gst-meta-base_0.10.bb	f7556e526303b21566c49eb45960b865ca58944b
@@ -1,8 +1,8 @@ DEPENDS = "gstreamer gst-plugins-base gs
 # Based on its sibling on Poky which is copyright (C) 2006,2007  OpenedHand LTD
 
 DESCRIPTION = "Gstreamer package groups"
 DEPENDS = "gstreamer gst-plugins-base gst-plugins-bad gst-plugins-good gst-plugins-ugly"
-PR = "r8"
+PR = "r9"
 
 PACKAGES = "\
     gst-meta-base \
@@ -12,7 +12,7 @@ ALLOW_EMPTY = "1"
 
 ALLOW_EMPTY = "1"
 
-REPENDS_gst-meta-base = "\
+RDEPENDS_gst-meta-base = "\
     gstreamer \
     gst-plugin-playbin \
     gst-plugin-decodebin \
@@ -32,7 +32,6 @@ RRECOMMENDS_gst-meta-base = "\
     gst-plugin-ffmpegcolorspace \
     gst-plugin-autodetect"
 
-
 RDEPENDS_gst-meta-audio = "\
     gst-meta-base \
     gst-plugin-ivorbis \
@@ -40,14 +39,12 @@ RDEPENDS_gst-meta-audio = "\
     gst-plugin-mad \
     gst-plugin-id3demux"
 
-
 RDEPENDS_gst-meta-debug = "\
     gst-meta-base \
     gst-plugin-debug \
     gst-plugin-audiotestsrc \
     gst-plugin-videotestsrc"
 
-
 RDEPENDS_gst-meta-video = "\
     gst-meta-base \
     gst-plugin-avi \


#
# mt diff -r8c39fbcad580dce7b65af91c3db4a99f9d0ba40b -r58e565350ad0d12fcbf3066de5c104035165c4c5
#
# 
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [006f8f5cbd25e8273224656f55efb910d6ad231f]
#    to [99f9b8aefa171947ca0486164ce4bbc39d40e700]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [e988fd56275670ced98bb3525354ad475661f9c7]
#    to [d9c00306d838f99be9901f0e5b1361b703f3c653]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [5f41a35120e7ff29258edeee4606234a3248565f]
#    to [d48553ca2c8834d9a31b70bac2f131105e409961]
# 
============================================================
--- conf/distro/angstrom-2007.1.conf	006f8f5cbd25e8273224656f55efb910d6ad231f
+++ conf/distro/angstrom-2007.1.conf	99f9b8aefa171947ca0486164ce4bbc39d40e700
@@ -151,9 +151,6 @@ PREFERRED_VERSION_dbus-glib ?= "0.74"
 PREFERRED_VERSION_dbus ?= "1.0.2"
 PREFERRED_VERSION_dbus-glib ?= "0.74"
 
-PREFERRED_VERSION_wpa-supplicant = "0.5.5"
-
-
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
============================================================
--- conf/distro/angstrom-2008.1.conf	e988fd56275670ced98bb3525354ad475661f9c7
+++ conf/distro/angstrom-2008.1.conf	d9c00306d838f99be9901f0e5b1361b703f3c653
@@ -88,9 +88,13 @@ PREFERRED_PROVIDER_xserver          ?= "
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
-# Use Xorg R7.3 release
+#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
+require conf/distro/include/preferred-gpe-versions-2.8.inc
+require conf/distro/include/preferred-e-versions.inc
 require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
+require conf/distro/include/preferred-openmoko-versions.inc
 
+
 # Virtuals:
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	5f41a35120e7ff29258edeee4606234a3248565f
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	d48553ca2c8834d9a31b70bac2f131105e409961
@@ -2203,7 +2203,7 @@ PREFERRED_VERSION_wpa-gui ?= "0.4.8"
 PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
 PREFERRED_VERSION_wmctrl ?= "1.07"
 PREFERRED_VERSION_wpa-gui ?= "0.4.8"
-PREFERRED_VERSION_wpa-supplicant ?= "0.4.9"
+PREFERRED_VERSION_wpa-supplicant ?= "0.5.5"
 PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
 PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
 PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"