Send commitlog mailing list submissions to
[email protected]
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.openmoko.org/mailman/listinfo/commitlog
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of commitlog digest..."
Today's Topics:
1. r1683 - trunk/oe/packages/openmoko-apps ([EMAIL PROTECTED])
2. r1684 - in trunk/oe/packages: . libid3 ([EMAIL PROTECTED])
3. r1685 - trunk/oe/packages/openmoko-apps ([EMAIL PROTECTED])
4. r1686 -
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep
([EMAIL PROTECTED])
5. r1687 -
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep
([EMAIL PROTECTED])
6. r1688 -
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep
([EMAIL PROTECTED])
7. r1689 - trunk/oe/packages/tasks ([EMAIL PROTECTED])
8. r1690 -
trunk/src/target/OM-2007/applications/openmoko-rssreader/src
([EMAIL PROTECTED])
9. r1691 - trunk/oe/packages/tasks ([EMAIL PROTECTED])
10. r1692 -
trunk/src/target/OM-2007/applications/openmoko-calculator/data
([EMAIL PROTECTED])
11. r1693 - in trunk/oe/packages/openmoko-pim: . files
([EMAIL PROTECTED])
--- Begin Message ---
Author: mickey
Date: 2007-04-07 13:04:34 +0200 (Sat, 07 Apr 2007)
New Revision: 1683
Modified:
trunk/oe/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
Log:
oe: openmoko-simplemediaplayer needs libid3, not id3lib (yes, that's a
different library)
Modified: trunk/oe/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
2007-04-07 09:17:00 UTC (rev 1682)
+++ trunk/oe/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
2007-04-07 11:04:34 UTC (rev 1683)
@@ -1,7 +1,8 @@
DESCRIPTION = "The OpenMoko Media Player"
SECTION = "openmoko/applications"
-DEPENDS += "alsa-lib dbus-glib id3lib libvorbis"
+DEPENDS += "alsa-lib dbus-glib libid3 libvorbis"
PV = "0.0.1+svn${SRCDATE}"
+PR = "r1"
inherit openmoko
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 13:04:57 +0200 (Sat, 07 Apr 2007)
New Revision: 1684
Added:
trunk/oe/packages/libid3/
trunk/oe/packages/libid3/libid3_1.1.bb
Log:
oe: add libid3, a small library for reading id3 tags
Added: trunk/oe/packages/libid3/libid3_1.1.bb
===================================================================
--- trunk/oe/packages/libid3/libid3_1.1.bb 2007-04-07 11:04:34 UTC (rev
1683)
+++ trunk/oe/packages/libid3/libid3_1.1.bb 2007-04-07 11:04:57 UTC (rev
1684)
@@ -0,0 +1,13 @@
+DESCRIPTION = "libID3 is a small C library to parse ID3 tags. \
+It uses as little memory as possible, and has both DOM- and SAX-like models."
+SECTION = "libs/multimedia"
+LICENSE = "LGPL"
+
+SRC_URI = "http://download.tangent.org/libid3-${PV}.tar.gz";
+
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 13:14:02 +0200 (Sat, 07 Apr 2007)
New Revision: 1685
Modified:
trunk/oe/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
Log:
oe: revert last change
Modified: trunk/oe/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
2007-04-07 11:04:57 UTC (rev 1684)
+++ trunk/oe/packages/openmoko-apps/openmoko-simplemediaplayer_svn.bb
2007-04-07 11:14:02 UTC (rev 1685)
@@ -1,8 +1,8 @@
DESCRIPTION = "The OpenMoko Media Player"
SECTION = "openmoko/applications"
-DEPENDS += "alsa-lib dbus-glib libid3 libvorbis"
+DEPENDS += "alsa-lib dbus-glib id3lib libvorbis"
PV = "0.0.1+svn${SRCDATE}"
-PR = "r1"
+PR = "r2"
inherit openmoko
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 13:17:16 +0200 (Sat, 07 Apr 2007)
New Revision: 1686
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/bmp.desktop.in
Log:
openmoko-simplemediaplayer: canonize executable name
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
2007-04-07 11:14:02 UTC (rev 1685)
+++
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
2007-04-07 11:17:16 UTC (rev 1686)
@@ -3,7 +3,7 @@
beepincludedir = $(includedir)/bmp
bin_PROGRAMS = beep
-transform = s/beep/openmoko-simple-media-player/
+transform = s/beep/openmoko-simplemediaplayer/
beep_LDFLAGS = -export-dynamic
beep_LDADD = -lid3 \
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/bmp.desktop.in
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/bmp.desktop.in
2007-04-07 11:14:02 UTC (rev 1685)
+++
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/bmp.desktop.in
2007-04-07 11:17:16 UTC (rev 1686)
@@ -1,10 +1,11 @@
[Desktop Entry]
-Name=Openmoko Simple Media Player
+Name=Music
Comment=Play music
-Exec=openmoko-simple-media-player
-Icon=bmp.png
+Exec=openmoko-simplemediaplayer
+Icon=openmoko-simplemediaplayer
MimeType=audio/x-scpls;audio/x-mpegurl;audio/mpegurl;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/x-wav;application/x-ogg;
Categories=Application;GTK;AudioVideo;Player;
Terminal=false
Type=Application
Encoding=UTF-8
+SingleInstance=true
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 13:21:09 +0200 (Sat, 07 Apr 2007)
New Revision: 1687
Added:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/openmoko-simplemediaplayer.png
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
Log:
openmoko-simplemediaplayer: add .desktop icon
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
2007-04-07 11:17:16 UTC (rev 1686)
+++
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
2007-04-07 11:21:09 UTC (rev 1687)
@@ -83,9 +83,17 @@
beepinclude_HEADERS = plugin.h fullscreen.h
-desktop_DATA = bmp.desktop
+#
+# desktop integration: .desktop file
+#
desktopdir = $(datadir)/applications
+dist_desktop_DATA = bmp.desktop
+#
+# desktop integration: application icon
+#
+appicondir = $(datadir)/pixmaps
+dist_appicon_DATA = openmoko-simplemediaplayer.png
BUILT_SOURCES = pixmaps.h
Added:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/openmoko-simplemediaplayer.png
===================================================================
(Binary files differ)
Property changes on:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/openmoko-simplemediaplayer.png
___________________________________________________________________
Name: svn:mime-type
+ image/png
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 13:26:07 +0200 (Sat, 07 Apr 2007)
New Revision: 1688
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
Log:
openmoko-simplemediaplayer: properly ship png for .desktop file
Modified:
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
===================================================================
---
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
2007-04-07 11:21:09 UTC (rev 1687)
+++
trunk/src/target/OM-2007/applications/openmoko-simplemediaplayer/beep/Makefile.am
2007-04-07 11:26:07 UTC (rev 1688)
@@ -99,7 +99,7 @@
embedded_icons =
-EXTRA_DIST = \
+EXTRA_DIST = $(dist_appicon_DATA) \
$(embedded_icons) build.list
pixmaps.h: $(embedded_icons)
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 14:52:43 +0200 (Sat, 07 Apr 2007)
New Revision: 1689
Modified:
trunk/oe/packages/tasks/task-openmoko.bb
Log:
oe: add fbgrab into the default image (task-openmoko-debug)
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-04-07 11:26:07 UTC (rev
1688)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-04-07 12:52:43 UTC (rev
1689)
@@ -4,7 +4,7 @@
PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r34"
+PR = "r35"
PACKAGES = "\
task-openmoko-linux \
@@ -191,6 +191,7 @@
tcpdump \
tslib-calibrate \
tslib-tests \
+ fbgrab \
fstests \
lsof \
lrzsz \
--- End Message ---
--- Begin Message ---
Author: zecke
Date: 2007-04-07 18:27:13 +0200 (Sat, 07 Apr 2007)
New Revision: 1690
Modified:
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.h
Log:
openmoko-rssreader: Add a simple untested RFC822 scanner to be used by the
TreeModel
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
2007-04-07 12:52:43 UTC (rev 1689)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.c
2007-04-07 16:27:13 UTC (rev 1690)
@@ -26,8 +26,10 @@
*/
#include "rfcdate.h"
+#include <glib/gi18n.h>
#include <malloc.h>
+#include <stdio.h>
G_DEFINE_TYPE(RSSRFCDate, rss_rfc_date, G_TYPE_OBJECT)
@@ -41,9 +43,19 @@
static void
rss_rfc_date_finalize (GObject *object)
{
- if ( RSS_RFC_DATE_GET_PRIVATE(object)->string_cache )
- free (RSS_RFC_DATE_GET_PRIVATE(object)->string_cache);
+ RSSRFCDatePrivate *private = RSS_RFC_DATE_GET_PRIVATE (object);
+ RSSRFCDate *self = RSS_RFC_DATE (object);
+ if ( private->string_cache ) {
+ free (private->string_cache);
+ private->string_cache = NULL;
+ }
+
+ if ( self->date ) {
+ g_date_free (self->date);
+ self->date = NULL;
+ }
+
G_OBJECT_CLASS(rss_rfc_date_parent_class)->finalize (object);
}
@@ -58,11 +70,77 @@
G_OBJECT_CLASS(klass)->finalize = rss_rfc_date_finalize;
}
+/*
+ * options
+ * a) use strcmp
+ * b) swicth/case
+ */
+static GDateMonth
+rss_month_number( gchar *month_str )
+{
+ switch (month_str[0]) {
+ case 'J':
+ switch (month_str[1]) {
+ case 'a':
+ return G_DATE_JANUARY;
+ break;
+ case 'u':
+ switch (month_str[2] ) {
+ case 'n':
+ return G_DATE_JUNE;
+ break;
+ case 'l':
+ return G_DATE_JULY;
+ break;
+ }
+ }
+ break;
+ case 'F':
+ return G_DATE_FEBRUARY;
+ break;
+ case 'M':
+ switch ( month_str[2] ) {
+ case 'r':
+ return G_DATE_MARCH;
+ break;
+ case 'y':
+ return G_DATE_MAY;
+ break;
+ }
+ break;
+ case 'A':
+ switch (month_str[1]){
+ case 'p':
+ return G_DATE_APRIL;
+ break;
+ case 'u':
+ return G_DATE_AUGUST;
+ break;
+ }
+ break;
+ case 'O':
+ return G_DATE_OCTOBER;
+ break;
+ case 'S':
+ return G_DATE_SEPTEMBER;
+ break;
+ case 'N':
+ return G_DATE_NOVEMBER;
+ break;
+ case 'D':
+ return G_DATE_DECEMBER;
+ break;
+ }
+
+ return G_DATE_BAD_MONTH;
+}
+
static void
rss_rfc_date_init(RSSRFCDate *self)
{
/* I don't know if memset gets called */
RSS_RFC_DATE_GET_PRIVATE(self)->string_cache = NULL;
+ self->date = g_date_new ();
}
GObject*
@@ -71,30 +149,101 @@
return G_OBJECT(g_object_new(RSS_TYPE_RFC_DATE, NULL));
}
+/**
+ * Clear the internal string representation. This can be used
+ * on the day switch
+ */
void
-rss_rfc_date_set (RSSRFCDate *self, const gchar* rfc822date)
+rss_rfc_date_clear_cache (RSSRFCDate* self)
{
- if ( RSS_RFC_DATE_GET_PRIVATE(self)->string_cache ) {
- free ( RSS_RFC_DATE_GET_PRIVATE(self)->string_cache );
- RSS_RFC_DATE_GET_PRIVATE(self)->string_cache = NULL;
+ RSSRFCDatePrivate *private = RSS_RFC_DATE_GET_PRIVATE (self);
+
+ if ( private->string_cache ) {
+ free ( private->string_cache );
+ private->string_cache = NULL;
}
+}
+void
+rss_rfc_date_set (RSSRFCDate *self, const gchar* rfc822date)
+{
+ rss_rfc_date_clear_cache (self);
+
/*
- * XXX parse the date
+ * %a, %d %b %Y %H:%M:%S %z
+ *
+ * We try to parse this date representation. We can ignore
+ * %a but for the %b we need to look it up properly
*/
+ int day, year, hour, minute, second;
+ gchar month_name[4];
+ sscanf (rfc822date, "%*3s, %d %3s %d %d:%d:%d", &day, month_name, &year,
&hour, &minute, &second );
+
+ self->timeval.tv_sec = hour*60*60 + minute*60 + second;
+ self->timeval.tv_usec = 0;
+ g_date_set_dmy ( self->date, day, rss_month_number (month_name), year);
}
+/*
+ * Start by comparing the dates and only if they are equal compare
+ * the times.
+ */
gint
rss_rfc_date_compare (RSSRFCDate *left, RSSRFCDate *right)
{
- /* XXX, FIXME do the comparsion */
- return 0;
+ int date_result = g_date_compare( left->date, right->date );
+ if ( date_result != 0 )
+ return date_result;
+
+ return left->timeval.tv_sec - right->timeval.tv_sec;
}
gchar*
rss_rfc_date_as_string (RSSRFCDate *self)
{
- /* XXX, FIXME */
- return "";
+ RSSRFCDatePrivate *private = RSS_RFC_DATE_GET_PRIVATE(self);
+ if ( private->string_cache )
+ return private->string_cache;
+
+ /*
+ * format the date now
+ */
+ GString *date_string;
+ GTimeVal now;
+ g_get_current_time (&now);
+ GDate *date = g_date_new ();
+ g_date_set_time_val (date, &now);
+
+ if ( g_date_compare( date, self->date ) == 0 ) {
+ date_string = g_string_new (_("Today"));
+ goto exit;
+ }
+
+ g_date_subtract_days( date, 1 );
+ if ( g_date_compare( date, self->date ) == 0 ) {
+ date_string = g_string_new (_("Yesterday"));
+ goto exit;
+ }
+
+ /*
+ * copy the date using the current locale. And retry
+ * until the buffer is big enough
+ */
+ date_string = g_string_sized_new( 10 );
+ while ( g_date_strftime( date_string->str, date_string->allocated_len-1,
"%a, %d %b %Y", self->date ) == 0 ) {
+ g_string_set_size( date_string, date_string->allocated_len + 10 );
+ }
+
+exit:
+ /*
+ * append the time
+ */
+ g_string_append_printf ( date_string, ", %ld:%ld:%ld",
+ self->timeval.tv_sec/60/60,
+ self->timeval.tv_sec/60%60,
+ self->timeval.tv_sec%60);
+ g_date_free (date);
+ private->string_cache = g_string_free (date_string, FALSE);
+ return private->string_cache;
}
Modified: trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.h
2007-04-07 12:52:43 UTC (rev 1689)
+++ trunk/src/target/OM-2007/applications/openmoko-rssreader/src/rfcdate.h
2007-04-07 16:27:13 UTC (rev 1690)
@@ -2,6 +2,7 @@
#ifndef OPENMOKO_RSS_RFC_DATE_H
#define OPENMOKO_RSS_RFC_DATE_H
+#include <glib.h>
#include <glib-object.h>
G_BEGIN_DECLS
@@ -18,7 +19,9 @@
struct _RSSRFCDate {
GObject parent;
- gint64 date;
+
+ GDate *date;
+ GTimeVal timeval;
};
struct _RSSRFCDateClass {
@@ -30,6 +33,7 @@
void rss_rfc_date_set (RSSRFCDate* self, const gchar* rfc822_date);
gint rss_rfc_date_compare (RSSRFCDate* self, RSSRFCDate *other);
gchar* rss_rfc_date_as_string(RSSRFCDate* self);
+void rss_rfc_date_clear_cache (RSSRFCDate* self);
G_END_DECLS
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 19:08:32 +0200 (Sat, 07 Apr 2007)
New Revision: 1691
Modified:
trunk/oe/packages/tasks/task-openmoko.bb
Log:
oe: ship openmoko-appmanager in task-openmoko-base
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-04-07 16:27:13 UTC (rev
1690)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-04-07 17:08:32 UTC (rev
1691)
@@ -4,7 +4,7 @@
PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r35"
+PR = "r36"
PACKAGES = "\
task-openmoko-linux \
@@ -92,6 +92,7 @@
matchbox-panel-2-applets \
matchbox-applet-inputmanager \
matchbox-applet-startup-monitor \
+ openmoko-appmanager \
openmoko-keyboard \
openmoko-footer \
openmoko-taskmanager \
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 19:44:42 +0200 (Sat, 07 Apr 2007)
New Revision: 1692
Modified:
trunk/src/target/OM-2007/applications/openmoko-calculator/data/Makefile.am
Log:
openmoko-calculator: ship .desktop icon in correct directory
Modified:
trunk/src/target/OM-2007/applications/openmoko-calculator/data/Makefile.am
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-calculator/data/Makefile.am
2007-04-07 17:08:32 UTC (rev 1691)
+++ trunk/src/target/OM-2007/applications/openmoko-calculator/data/Makefile.am
2007-04-07 17:44:42 UTC (rev 1692)
@@ -13,5 +13,5 @@
#
# desktop integration: application icon
#
-appicondir = $(datadir)/icons
+appicondir = $(datadir)/pixmaps
dist_appicon_DATA = openmoko-calculator.png
--- End Message ---
--- Begin Message ---
Author: mickey
Date: 2007-04-07 19:49:23 +0200 (Sat, 07 Apr 2007)
New Revision: 1693
Modified:
trunk/oe/packages/openmoko-pim/files/openmoko-dates.desktop
trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb
Log:
oe: openmokify dates .desktop
Modified: trunk/oe/packages/openmoko-pim/files/openmoko-dates.desktop
===================================================================
--- trunk/oe/packages/openmoko-pim/files/openmoko-dates.desktop 2007-04-07
17:44:42 UTC (rev 1692)
+++ trunk/oe/packages/openmoko-pim/files/openmoko-dates.desktop 2007-04-07
17:49:23 UTC (rev 1693)
@@ -3,7 +3,7 @@
Name=Dates
Comment=Dates
Exec=dates
-Icon=Dates
+Icon=openmoko-dates
Terminal=false
Type=Application
Categories=GTK;Application;PIM;Office
Modified: trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb
===================================================================
--- trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb 2007-04-07
17:44:42 UTC (rev 1692)
+++ trunk/oe/packages/openmoko-pim/openmoko-dates_svn.bb 2007-04-07
17:49:23 UTC (rev 1693)
@@ -4,12 +4,12 @@
DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs"
RDEPENDS = "libedata-cal"
PV = "0.1+svn${SRCDATE}"
-PR = "r7"
+PR = "r8"
inherit gnome autotools pkgconfig gtk-icon-cache
SRC_URI =
"svn://svn.o-hand.com/repos/dates/branches/;module=openmoko;proto=http \
- file://Dates.png \
+ file://openmoko-dates.png \
file://openmoko-dates.desktop"
S = "${WORKDIR}/openmoko"
@@ -17,10 +17,10 @@
EXTRA_OECONF = "--enable-omoko"
do_install_append () {
+ rm -rf ${D}${datadir}/icons
+ rm -rf ${D}${datadir}/applications/dates.desktop
install -d ${D}/${datadir}/pixmaps
- install -m 0644 ${WORKDIR}/Dates.png ${D}/${datadir}/pixmaps/
- rm -rf ${D}${datadir}/icons
- rm -rf ${D}${datadir}/applications/dates.desktop
+ install -m 0644 ${WORKDIR}/openmoko-dates.png ${D}/${datadir}/pixmaps/
install -m 0644 ${WORKDIR}/openmoko-dates.desktop
${D}${datadir}/applications/
}
--- End Message ---
_______________________________________________
commitlog mailing list
[email protected]
http://lists.openmoko.org/mailman/listinfo/commitlog
