[oe-commits] org.oe.dev merge of 'ae6ce280f42d7c00188fa2fe1ff67bb12aacd5e5'

[mickeyl commit]

merge of 'ae6ce280f42d7c00188fa2fe1ff67bb12aacd5e5'
     and 'd63819fa685c3d0474a7e11368d9dafdbcb3404f'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e6100a99008ef2edc3a6a765cfa14a1dad489cfb
ViewMTN: http://monotone.openembedded.org/revision/info/e6100a99008ef2edc3a6a765cfa14a1dad489cfb
Files:
1
conf/distro/openmoko.conf
packages/openmoko2/openmoko-mediaplayer2_svn.bb
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
Diffs:

#
# mt diff -rae6ce280f42d7c00188fa2fe1ff67bb12aacd5e5 -re6100a99008ef2edc3a6a765cfa14a1dad489cfb
#
# 
# 
# patch "conf/distro/openmoko.conf"
#  from [9e093358b00d1965dc02e8efe6c6716c5e56fb80]
#    to [2ec30f54157022779b502f8ec721dfbf3505d89b]
# 
============================================================
--- conf/distro/openmoko.conf	9e093358b00d1965dc02e8efe6c6716c5e56fb80
+++ conf/distro/openmoko.conf	2ec30f54157022779b502f8ec721dfbf3505d89b
@@ -11,7 +11,7 @@ DISTRO_NAME = "OpenMoko"
 #
 DISTRO = "openmoko"
 DISTRO_NAME = "OpenMoko"
-DISTRO_VERSION = "P1-September-Snapshot-${DATE}"
+DISTRO_VERSION = "P1-Snapshot-${DATE}"
 #DISTRO_TYPE = "release"
 DISTRO_TYPE = "debug"
 


#
# mt diff -rd63819fa685c3d0474a7e11368d9dafdbcb3404f -re6100a99008ef2edc3a6a765cfa14a1dad489cfb
#
# 
# 
# patch "packages/openmoko2/openmoko-mediaplayer2_svn.bb"
#  from [29fd85f99770056b454fc50a90c40754d1527c46]
#    to [f1a317c77ce26420320e222ad2769fba13caf7e4]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [496842695053a5e4f7cd66d4e569a3903302e8ae]
#    to [1c897158060ef7883a4ea320c60d6475025ff4ef]
# 
# patch "packages/openmoko2/openmoko-sound-system2_0.1.0.bb"
#  from [6882dc76c7e1f498b428a3669944461e1b16a822]
#    to [b87498bde36aceaf3befb0207750a942452d5865]
# 
============================================================
--- packages/openmoko2/openmoko-mediaplayer2_svn.bb	29fd85f99770056b454fc50a90c40754d1527c46
+++ packages/openmoko2/openmoko-mediaplayer2_svn.bb	f1a317c77ce26420320e222ad2769fba13caf7e4
@@ -1,9 +1,9 @@ SECTION = "openmoko/tools"
 DESCRIPTION = "A media player for OpenMoko"
 SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2 expat gstreamer libspiff"
+DEPENDS = "libmokoui2 expat gstreamer libspiff curl"
 RDEPENDS = "gst-meta-audio"
 PV = "0.1.0+svn${SVNREV}"
-PR = "r1"
+PR = "r2"
 
 inherit openmoko2
 
============================================================
--- packages/openmoko2/openmoko-session2.bb	496842695053a5e4f7cd66d4e569a3903302e8ae
+++ packages/openmoko2/openmoko-session2.bb	1c897158060ef7883a4ea320c60d6475025ff4ef
@@ -1,10 +1,10 @@ RCONFLICTS = "openmoko-session"
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r33"
+PR = "r34"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
@@ -29,6 +29,9 @@ gconftool-2 --config-source=xml::$D${sys
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/poky/peripherals/mouse/drag_threshold 8
 gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type int --set /desktop/openmoko/neod/power_management 2
 
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosink pulsesink
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct -t string --set /system/gstreamer/0.10/default/audiosrc pulsesrc
+
 }
 
 PACKAGE_ARCH = "all"
============================================================
--- packages/openmoko2/openmoko-sound-system2_0.1.0.bb	6882dc76c7e1f498b428a3669944461e1b16a822
+++ packages/openmoko2/openmoko-sound-system2_0.1.0.bb	b87498bde36aceaf3befb0207750a942452d5865
@@ -9,10 +9,11 @@ RDEPENDS = "\
   pulseaudio-module-simple-protocol-tcp \
   pulseaudio-module-native-protocol-unix \
   pulseaudio-module-cli-protocol-unix \
+  gst-plugin-pulse \
 "
 RREPLACES = "openmoko-sound-system"
 RPROVIDES = "openmoko-sound-system"
-PR = "r2"
+PR = "r3"
 
 inherit openmoko-base update-rc.d