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

[mickeyl commit]

merge of 'e6100a99008ef2edc3a6a765cfa14a1dad489cfb'
     and 'fd6c3104412672124350e987af3ff8736304f817'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: d1cdb61789b6a035fdaff06f37d6490c67bcccc0
ViewMTN: http://monotone.openembedded.org/revision/info/d1cdb61789b6a035fdaff06f37d6490c67bcccc0
Files:
1
packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch
packages/uboot/files/makefile-no-dirafter.patch
packages/meta/slugos-packages.bb
packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb
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 -re6100a99008ef2edc3a6a765cfa14a1dad489cfb -rd1cdb61789b6a035fdaff06f37d6490c67bcccc0
#
# 
# 
# rename "packages/uboot/u-boot-mkimage-openmoko-native/makefile-no-dirafter.patch"
#     to "packages/uboot/files/makefile-no-dirafter.patch"
# 
# patch "packages/meta/slugos-packages.bb"
#  from [f0c762b44a0bab705cdd75211c3ce4fe78b03a3c]
#    to [c7013eacc72de83c038d4af1c8c1b1d6b83413de]
# 
# patch "packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb"
#  from [d3999509e6f8e1b8cbcd12aafad259da103400de]
#    to [0c0171c90503926242288f89cf359ffc1a9f7b2c]
# 
============================================================
--- packages/meta/slugos-packages.bb	f0c762b44a0bab705cdd75211c3ce4fe78b03a3c
+++ packages/meta/slugos-packages.bb	c7013eacc72de83c038d4af1c8c1b1d6b83413de
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r39"
+PR = "r40"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -50,6 +50,8 @@ SLUGOS_PACKAGES = "\
 	cron \
 	ctorrent \
 	ctrlproxy \
+	cups \
+	curl \
 	cvs \
 	cyrus-imapd \
 	cyrus-sasl \
============================================================
--- packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb	d3999509e6f8e1b8cbcd12aafad259da103400de
+++ packages/uboot/uboot-openmoko_1.2.0+gitf34024d4a328e6edd906456da98d2c537155c4f7+svn2943.bb	0c0171c90503926242288f89cf359ffc1a9f7b2c
@@ -19,6 +19,7 @@ SRC_URI = "\
   svn://svn.openmoko.org/trunk/src/target/u-boot;module=patches;rev=${UBOOT_OPENMOKO_REV};proto=http \
   file://uboot-eabi-fix-HACK.patch \
   file://uboot-20070311-tools_makefile_ln_sf.patch;patch=1 \
+  file://makefile-no-dirafter.patch;patch=1 \
 "
 
 EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"


#
# mt diff -rfd6c3104412672124350e987af3ff8736304f817 -rd1cdb61789b6a035fdaff06f37d6490c67bcccc0
#
# 
# 
# patch "conf/distro/openmoko.conf"
#  from [9e093358b00d1965dc02e8efe6c6716c5e56fb80]
#    to [2ec30f54157022779b502f8ec721dfbf3505d89b]
# 
# 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]
# 
============================================================
--- 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"
 
============================================================
--- 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