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

[xora commit]

merge of 'b266d00fc6fbbe7f1b67452f019bc173da3eb49d'
     and 'd1cdb61789b6a035fdaff06f37d6490c67bcccc0'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 375a27e2a1e696f0e3ebd6e8faf905bae63a016c
ViewMTN: http://monotone.openembedded.org/revision/info/375a27e2a1e696f0e3ebd6e8faf905bae63a016c
Files:
1
packages/openmoko2/openmoko-mediaplayer2_svn.bb
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-sound-system2_0.1.0.bb
packages/uicmoc/uicmoc4-native_4.3.1.bb
Diffs:

#
# mt diff -rb266d00fc6fbbe7f1b67452f019bc173da3eb49d -r375a27e2a1e696f0e3ebd6e8faf905bae63a016c
#
# 
# 
# 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
 


#
# mt diff -rd1cdb61789b6a035fdaff06f37d6490c67bcccc0 -r375a27e2a1e696f0e3ebd6e8faf905bae63a016c
#
# 
# 
# patch "packages/uicmoc/uicmoc4-native_4.3.1.bb"
#  from [7ac42702123875fa07b391881bfde6f56531dd93]
#    to [83b84a6976c32c4c094913143c9ed28a2b37c610]
# 
============================================================
--- packages/uicmoc/uicmoc4-native_4.3.1.bb	7ac42702123875fa07b391881bfde6f56531dd93
+++ packages/uicmoc/uicmoc4-native_4.3.1.bb	83b84a6976c32c4c094913143c9ed28a2b37c610
@@ -26,6 +26,7 @@ do_configure() {
 EXTRA_OEMAKE = " "
 
 do_configure() {
+	sed -i 's:^QT += xml qt3support$:QT += xml qt3support network:' "${S}"/src/tools/uic3/uic3.pro
 	echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}"
 }