diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-10-16 15:40:26 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-10-16 15:40:26 +0000 |
| commit | d4a39a9491b84814286f0816819bc048ba9d7e68 (patch) | |
| tree | 0f4873cf20beeb815246d9ddc52f353c1e2909ab /packages | |
| parent | 66f40895c0fc3eac08d951efb5aca128564129a6 (diff) | |
| parent | b3ba903379bf59e915d425b1fb4a238b735e0b67 (diff) | |
merge of 'b266d00fc6fbbe7f1b67452f019bc173da3eb49d'
and 'd1cdb61789b6a035fdaff06f37d6490c67bcccc0'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/openmoko2/openmoko-mediaplayer2_svn.bb | 4 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 5 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-sound-system2_0.1.0.bb | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb index e353bcbaa7..42a71b1472 100644 --- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb +++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb @@ -1,9 +1,9 @@ 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 diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index b1f9dae38d..65cb7f1ca6 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -4,7 +4,7 @@ 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${sysconfdir}/gconf/gconf.xml.defaults --dire 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" diff --git a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb index 57b72af4b6..e77561c3a1 100644 --- a/packages/openmoko2/openmoko-sound-system2_0.1.0.bb +++ b/packages/openmoko2/openmoko-sound-system2_0.1.0.bb @@ -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 |