From 18628c966d73e03d0bcf85e310df8a4c8c33afd3 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sat, 15 Sep 2007 01:48:22 +0000 Subject: task-openmoko[-feed]: add some packages, move some others around --- packages/tasks/task-openmoko-feed.bb | 4 ++++ packages/tasks/task-openmoko.bb | 25 +++++++++++++------------ 2 files changed, 17 insertions(+), 12 deletions(-) (limited to 'packages/tasks') 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 4c605dc11d..cc9b67f8d7 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,25 +52,26 @@ 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-theme-standard \ - neod \ + \ gpe-scap \ " @@ -91,24 +92,24 @@ RDEPENDS_task-openmoko-ui += "${THEMES}" # # 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 \ + \ + openmoko-today2 \ +# openmoko-appmanager \ " # @@ -126,7 +127,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 +135,7 @@ RDEPENDS_task-openmoko-pim = "\ openmoko-dates2 \ openmoko-feedreader2 \ openmoko-tasks2 \ - openmoko-today2 \ + openmoko-mediaplayer2 \ # openmoko-messages \ " -- cgit v1.2.3 From 76cba2b1b9c4917b25f9c34b5d8c42c9ffd00e01 Mon Sep 17 00:00:00 2001 From: Daniel Willmann Date: Sat, 15 Sep 2007 21:58:46 +0000 Subject: openmoko-sound-theme-standard2: inherit openmoko2 so sources get fetched from the correct location --- packages/tasks/task-openmoko.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/tasks') diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 4c605dc11d..2583416617 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -69,7 +69,7 @@ RDEPENDS_task-openmoko-ui = "\ \ openmoko-session2 \ openmoko-sound-system \ - openmoko-sound-theme-standard \ + openmoko-sound-theme-standard2 \ neod \ gpe-scap \ " -- cgit v1.2.3 From 067a8c1ade29c0c659f86ec35328ed5c320bbbdd Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 16 Sep 2007 09:50:36 +0000 Subject: task-openmoko: only include the gps panel applet for devices that have gps --- packages/tasks/task-openmoko.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/tasks') diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 2583416617..f9c44a307b 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -108,7 +108,7 @@ RDEPENDS_task-openmoko-base = "\ openmoko-panel-bt \ openmoko-panel-clock \ openmoko-panel-usb \ - openmoko-panel-gps \ + ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \ " # -- cgit v1.2.3 From add1e04a869cabd6f44029d49cf1c877f3146f27 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 16 Sep 2007 09:51:30 +0000 Subject: task-openmoko: let magician use the qvga icon theme --- packages/tasks/task-openmoko.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/tasks') diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index f9c44a307b..e32253ec84 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -84,7 +84,7 @@ 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_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga" RDEPENDS_task-openmoko-ui += "${THEMES}" -- cgit v1.2.3 From ec65f5749a714321ebd0280255f358da1eb83dcb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 16 Sep 2007 10:19:07 +0000 Subject: task-openmoko: use qvga icon theme for qvga machines and make the ui task machine specific --- packages/tasks/task-openmoko.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'packages/tasks') diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index e32253ec84..62d980b92c 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 = "r63" inherit task @@ -79,14 +79,15 @@ RDEPENDS_task-openmoko-ui = "\ # 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_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 -- cgit v1.2.3 From fb6e3edbda09c9057ca184c55077a46e20f75cd0 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Sun, 16 Sep 2007 11:38:08 +0000 Subject: add openmoko-sound-system2 --- packages/tasks/task-openmoko.bb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'packages/tasks') diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 62d980b92c..dd3b13e206 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 = "r63" +PR = "r64" inherit task @@ -68,22 +68,22 @@ RDEPENDS_task-openmoko-ui = "\ settings-daemon \ \ 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-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 = "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}" -- cgit v1.2.3 From d5d7f49877fc2ed217488bf2c637d30f244bb337 Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Sun, 16 Sep 2007 13:23:46 +0000 Subject: task-openmoko-feed: added bootchart --- packages/tasks/task-openmoko-feed.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages/tasks') diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb index f11f322e39..84a37afe1d 100644 --- a/packages/tasks/task-openmoko-feed.bb +++ b/packages/tasks/task-openmoko-feed.bb @@ -1,13 +1,14 @@ DESCRIPTION = "OpenMoko: Misc. Feed Items" SECTION = "openmoko/base" LICENSE = "MIT" -PR = "r13" +PR = "r14" inherit task RDEPENDS_task-openmoko-feed = "\ aspell enchant \ bluez-hcidump \ + bootchart \ eet evas ecore embryo epsilon edje efreet emotion epdf \ exhibit edje-viewer \ free42-vga \ -- cgit v1.2.3