summaryrefslogtreecommitdiff
path: root/packages/openmoko2
diff options
context:
space:
mode:
Diffstat (limited to 'packages/openmoko2')
-rw-r--r--packages/openmoko2/libmokopanelui2_svn.bb7
-rw-r--r--packages/openmoko2/openmoko-common2_svn.bb2
-rw-r--r--packages/openmoko2/openmoko-mediaplayer2_svn.bb4
-rw-r--r--packages/openmoko2/openmoko-session2.bb2
-rwxr-xr-xpackages/openmoko2/openmoko-session2/etc/matchbox/session2
5 files changed, 8 insertions, 9 deletions
diff --git a/packages/openmoko2/libmokopanelui2_svn.bb b/packages/openmoko2/libmokopanelui2_svn.bb
index bfeb22fd7b..03159cc864 100644
--- a/packages/openmoko2/libmokopanelui2_svn.bb
+++ b/packages/openmoko2/libmokopanelui2_svn.bb
@@ -1,11 +1,10 @@
SECTION = "openmoko/libs"
-DEPENDS = "gtk+"
-PV = "0.1.0+svn${SVNREV}"
-PR = "r1"
+DEPENDS = "gtk+ matchbox-panel-2"
+PV = "0.3.0+svn${SVNREV}"
+PR = "r0"
inherit openmoko2
do_stage() {
autotools_stage_all
}
-
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index f54a23de18..0cf7f763cb 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Common files for the OpenMoko distribution"
SECTION = "openmoko/base"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
PR = "r3"
inherit openmoko2
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index 871416c066..e353bcbaa7 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -1,10 +1,10 @@
DESCRIPTION = "A media player for OpenMoko"
SECTION = "openmoko/tools"
DEPENDS = "libmokoui2 expat gstreamer libspiff"
+RDEPENDS = "gst-meta-audio"
PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
inherit openmoko2
FILES_${PN} += "${datadir}/openmoko-mediaplayer"
-
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 31d38382df..de2d7cdff6 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 = "r30"
+PR = "r31"
SRC_URI = "file://etc"
S = ${WORKDIR}
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index dee3e58051..4f2f8ae110 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -9,6 +9,6 @@ openmoko-dialer &
matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
matchbox-panel-2 --start-applets systray,startup \
- --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar &
+ --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar &
exec neod