propagate from branch 'org.openembedded.dev' (head ee7b95f6c953bb2d20113107fd5d39678af21d2c)

            to branch 'org.openembedded.dev.avr32' (head 12542c98fecf0c701796bd9520a06020986725f8)

2 files changed, 28 insertions, 22 deletions

diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index bc4a4ff967..f11f322e39 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -24,9 +24,13 @@ RDEPENDS_task-openmoko-feed = "\
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
   python python-pygtk python-pyserial \
   ruby \
+  libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
   synergy \
   tzdata \
+  timezones \
   tor \
   vnc \
+  wxwidgets \
+  x11vnc \
 "
 
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 2583416617..3b48b674c7 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
 PROVIDES = "task-openmoko-everything"
-PR = "r62"
+PR = "r65"
 
 inherit task
 
@@ -52,63 +52,65 @@ RDEPENDS_task-openmoko-ui = "\
   pango-module-basic-x \
   pango-module-basic-fc \
   gtk+ \
-  libgtkstylus \
-  libgtkinput \
   matchbox-common \
   matchbox-wm \
   xserver-kdrive-fbdev \
   xserver-kdrive-common \
   xserver-nodm-init \
-#  x11-c-locale \
   ttf-bitstream-vera \
   xauth \
   xhost \
   xset \
   xrandr \
+  \
   settings-daemon \
+  notification-daemon \
+  neod \
+  libnotify \
   \
   openmoko-session2 \
-  openmoko-sound-system \
+  openmoko-sound-system2 \
   openmoko-sound-theme-standard2 \
-  neod \
+  \
   gpe-scap \
 "
 
-# handle theming. FIXME: properly use machine database in a smart way,
+# Handle theming. FIXME: properly use machine database in a smart way,
 # taking into account not only size but also PPI! Ultimately this might
 # need recomputing some theme files and images on-the-fly :/ SVG and logical
 # theme description anyone? Or simply Edje to the rescue! :D
-THEMES        = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
-THEMES_a780   = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_e680   = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_a1200  = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokre2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokre6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_magician = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES          = "openmoko-icon-theme-standard2      openmoko-theme-standard2"
+THEMES_a780     = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_e680     = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_a1200    = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_rokre2   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_rokre6   = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
 
 RDEPENDS_task-openmoko-ui += "${THEMES}"
+PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
 
 #
 # task-openmoko-base
 #
-DESCRIPTION_task-openmoko-base = "OpenMoko: Main-Menu Launcher, Top Panel, and Footer"
+DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager"
 RDEPENDS_task-openmoko-base = "\
   matchbox-panel-2 \
   matchbox-panel-2-applets \
-  matchbox-applet-inputmanager \
-#  openmoko-appmanager \
   matchbox-keyboard-inputmethod \
   matchbox-keyboard-im \
   matchbox-keyboard-applet \
   matchbox-stroke \
   openmoko-terminal2 \
-  openmoko-keyboard \
-#  openmoko-panel-mainmenu \
+#  openmoko-keyboard \
   openmoko-panel-battery \
   openmoko-panel-bt \
   openmoko-panel-clock \
   openmoko-panel-usb \
-  openmoko-panel-gps \
+  ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
+  \
+  openmoko-today2 \
+#  openmoko-appmanager \
 "
 
 #
@@ -126,7 +128,7 @@ RDEPENDS_task-openmoko-phone = "\
 #
 # task-openmoko-pim
 #
-DESCRIPTION_task-openmoko-pim = "OpenMoko: PIM Applications"
+DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite"
 RDEPENDS_task-openmoko-pim = "\
   eds-dbus \
   openmoko-calculator2 \
@@ -134,7 +136,7 @@ RDEPENDS_task-openmoko-pim = "\
   openmoko-dates2 \
   openmoko-feedreader2 \
   openmoko-tasks2 \
-  openmoko-today2 \
+  openmoko-mediaplayer2 \
 #  openmoko-messages \
 "