[oe-commits] org.oe.dev merge of '15b74f4a5710e603d60db9716cb6cb0619511ac7'
florian commit
openembedded-commits at lists.openembedded.org
Tue Jul 31 22:16:47 UTC 2007
merge of '15b74f4a5710e603d60db9716cb6cb0619511ac7'
and '8961e177cdb0b701e3bb0304ec24d5c4a3947254'
Author: florian at openembedded.org
Branch: org.openembedded.dev
Revision: 835bda37b996295e3fb4a19b2f3d71f25cd0abca
ViewMTN: http://monotone.openembedded.org/revision.psp?id=835bda37b996295e3fb4a19b2f3d71f25cd0abca
Files:
1
packages/gsm/files/alive-start-if-interpreter-ready.patch
packages/gsm/files/vendor-qc-v0.patch
packages/nonworking/minisip
packages/nonworking/minisip/minisip_1.0a.bb
packages/openmoko2/openmoko-session2/matchbox-session
packages/libmikey
packages/nonworking/libmikey
packages/libmikey/libmikey0_svn.bb
packages/minisip/libmikey_svn.bb
packages/libmnetutil
packages/nonworking/libmnetutil
packages/libmnetutil/libmnetutil0_svn.bb
packages/minisip/libmnetutil_svn.bb
packages/libmsip
packages/nonworking/libmsip
packages/libmsip/libmsip0_svn.bb
packages/minisip/libmsip_svn.bb
packages/libmutil/libmutil0_svn.bb
packages/minisip/libmutil0_svn.bb
packages/minisip
packages/minisip/minisip-video_svn.bb
packages/minisip/minisip_svn.bb
packages/nylon/simple-firewall.bb
packages/nonworking/nylon/simple-firewall.bb
packages/openmoko-apps/openmoko-rssreader_svn.bb
packages/openmoko2/openmoko-feedreader2_svn.bb
packages/redboot-utils/fis_1.0.bb
packages/nonworking/redboot-utils/fis_1.0.bb
packages/gnash
packages/nonworking/nylon
packages/nonworking/redboot-utils
conf/distro/include/openmoko-srcdate-now.inc
packages/gnash/gnash_0.8.0.bb
packages/gsm/files/libgsmd-tool-fix.patch
packages/gsm/files/mlbuf-in-gsmd-struct.patch
packages/gsm/files/sms-hacks.patch
classes/base.bbclass
classes/openmoko-panel-plugin.bbclass
conf/bitbake.conf
conf/distro/include/openmoko.inc
conf/distro/openmoko.conf
contrib/mtn2cl/mtn2cl.sh
packages/file/file-native_4.21.bb
packages/gsm/libgsmd_svn.bb
packages/images/openmoko-devel-image.bb
packages/images/openmoko-image.bb
packages/openmoko-base/openmoko-theme-standard_svn.bb
packages/openmoko2/openmoko-session2/etc/matchbox/session
packages/openmoko2/openmoko-session2.bb
packages/openmoko2/openmoko-theme-standard2_svn.bb
packages/tasks/task-openmoko.bb
packages/starling/starling_0.2.bb
packages/starling/starling_svn.bb
Diffs:
#
# mt diff -r15b74f4a5710e603d60db9716cb6cb0619511ac7 -r835bda37b996295e3fb4a19b2f3d71f25cd0abca
#
#
#
# delete "packages/gsm/files/alive-start-if-interpreter-ready.patch"
#
# delete "packages/gsm/files/vendor-qc-v0.patch"
#
# delete "packages/nonworking/minisip"
#
# delete "packages/nonworking/minisip/minisip_1.0a.bb"
#
# delete "packages/openmoko2/openmoko-session2/matchbox-session"
#
# rename "packages/libmikey"
# to "packages/nonworking/libmikey"
#
# rename "packages/libmikey/libmikey0_svn.bb"
# to "packages/minisip/libmikey_svn.bb"
#
# rename "packages/libmnetutil"
# to "packages/nonworking/libmnetutil"
#
# rename "packages/libmnetutil/libmnetutil0_svn.bb"
# to "packages/minisip/libmnetutil_svn.bb"
#
# rename "packages/libmsip"
# to "packages/nonworking/libmsip"
#
# rename "packages/libmsip/libmsip0_svn.bb"
# to "packages/minisip/libmsip_svn.bb"
#
# rename "packages/libmutil/libmutil0_svn.bb"
# to "packages/minisip/libmutil0_svn.bb"
#
# rename "packages/minisip"
# to "packages/nonworking/minisip"
#
# rename "packages/minisip/minisip-video_svn.bb"
# to "packages/minisip/minisip-video_svn.bb"
#
# rename "packages/minisip/minisip_svn.bb"
# to "packages/minisip/minisip_svn.bb"
#
# rename "packages/nylon/simple-firewall.bb"
# to "packages/nonworking/nylon/simple-firewall.bb"
#
# rename "packages/openmoko-apps/openmoko-rssreader_svn.bb"
# to "packages/openmoko2/openmoko-feedreader2_svn.bb"
#
# rename "packages/redboot-utils/fis_1.0.bb"
# to "packages/nonworking/redboot-utils/fis_1.0.bb"
#
# add_dir "packages/gnash"
#
# add_dir "packages/minisip"
#
# add_dir "packages/nonworking/nylon"
#
# add_dir "packages/nonworking/redboot-utils"
#
# add_file "conf/distro/include/openmoko-srcdate-now.inc"
# content [d0e4417eb9382e74f3b5e5f0c94920595baefda9]
#
# add_file "packages/gnash/gnash_0.8.0.bb"
# content [bc7ce0bb9d022a74c35eff388b180d174a1a2eef]
#
# add_file "packages/gsm/files/libgsmd-tool-fix.patch"
# content [e6e57fad53fa4e690e3cfa28074c95ba9f0b05dd]
#
# add_file "packages/gsm/files/mlbuf-in-gsmd-struct.patch"
# content [c792becbe959d694d9e19d4b3f5fe7d77d46de94]
#
# add_file "packages/gsm/files/sms-hacks.patch"
# content [e8e5cfc849a5bf268c17517dea0877eef02ccb74]
#
# patch "classes/base.bbclass"
# from [8ae82b899b740b9da403e698610bf6ca49f8e64c]
# to [26453f8831d23d5ae6400f403116c9272347807d]
#
# patch "classes/openmoko-panel-plugin.bbclass"
# from [012f38a2bf927dd13a92d1a76a02c43173db369f]
# to [55cfc79fba369b1c7c2ef58c00b1cec8af73670c]
#
# patch "conf/bitbake.conf"
# from [cb6550c833966af0deba898eb3e14cf54b4bd8c8]
# to [d7da259bfd8ea8f8052f4258ba7b9c6e58a864ef]
#
# patch "conf/distro/include/openmoko.inc"
# from [caacdb749b409053268f23e4ddaae432bd769d59]
# to [27a5d36dc0bcfacb3e5fde995bce62a5bfa53dfb]
#
# patch "conf/distro/openmoko.conf"
# from [fb009383a61be983899d01b4c7a8a16126bf43f9]
# to [3301ae1374b3e083a581693e45861ad90a73ea39]
#
# patch "contrib/mtn2cl/mtn2cl.sh"
# from [89788c2d8ed63aa5ab3469b7c152d93de8ec1af6]
# to [d4794a871ac74f519ca7da827b1a964c47882a62]
#
# patch "packages/file/file-native_4.21.bb"
# from [7f56042d15332b2149b6e86a6180dd1e4707ae80]
# to [29075960c23f8de964fe35362d349c591f2b870f]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [7b5788cdd0f3ccee90d8b989942ac21ab1ad4db3]
# to [bf003124acd3b23025d8484c94c45afc2363454c]
#
# patch "packages/images/openmoko-devel-image.bb"
# from [ecf5172ab77fb14261f7f1fb0d5855bfeb84255e]
# to [bb656d3436f7ee0e279febc18b64f72d1a329c5d]
#
# patch "packages/images/openmoko-image.bb"
# from [91d5d8ee618188f062f3fcf355123fda72b7ec6b]
# to [9ebccfa80e88143c38645f7f13c90a3a90e51288]
#
# patch "packages/minisip/libmikey_svn.bb"
# from [3f38f2dce5bc9a944ef323ab2263bed00b2a4453]
# to [a65e19f78f2cbfb5b75beca33f8ae626a33ea3da]
#
# patch "packages/minisip/libmnetutil_svn.bb"
# from [786a86b33f9f2d6515f7cf61d72c423c1937df8e]
# to [0b3c1266c0390434be8435998d21356da9f38162]
#
# patch "packages/minisip/libmsip_svn.bb"
# from [2ad3bdbdd693264322879c1d92bbea8551f356de]
# to [b6d456330d47fbbf3f605ecb7ea992f1ff8fc945]
#
# patch "packages/minisip/libmutil0_svn.bb"
# from [d631dd28173db0b1e57a3b7f459c7f593c8dc630]
# to [b306ca216c1ba5d7ffe9761dae2199837eca90b2]
#
# patch "packages/minisip/minisip-video_svn.bb"
# from [17768b692afbd5b4d96622114f55a6af420ab655]
# to [b242289b728aa9d6a738169fa3fda7ee45715ed9]
#
# patch "packages/minisip/minisip_svn.bb"
# from [bf6c1fdeb823b6b245daa2fb7c6a4ff9d69524f2]
# to [acac6fd6c5435c301c87aa3141a718c243941656]
#
# patch "packages/openmoko-base/openmoko-theme-standard_svn.bb"
# from [5943ed10b8995d9ed32c666193baa127c9f72b9a]
# to [ff0592bad5222f7d71a955c7e1708a1a5f1d9909]
#
# patch "packages/openmoko2/openmoko-feedreader2_svn.bb"
# from [cdd9a012395501606080a4fd591a4a3a39a0be4f]
# to [a5066ba7ccf9101b4635687704d2ecca47441fa2]
#
# patch "packages/openmoko2/openmoko-session2/etc/matchbox/session"
# from [26f95f7ca147900b49432aadc380a147c5b707f2]
# to [ba398de151a5bc2ea75292294c1b6fe604547529]
#
# patch "packages/openmoko2/openmoko-session2.bb"
# from [9ed94af158dd9e10cbd0e170cd1c96e0ba2fbf2c]
# to [96268eb00aea83baa6ac6f978f6a6725dd61f5c1]
#
# patch "packages/openmoko2/openmoko-theme-standard2_svn.bb"
# from [63e4490c76e470ecdf213580aa34e8a3c10d1da7]
# to [fe0910c4f9d4b2220369f293fdf57c3fcb0b1bf4]
#
# patch "packages/tasks/task-openmoko.bb"
# from [ec3fef5477399d4762dbd4338b3c5f44bafa2f96]
# to [a87ce3caddce4b12644a8550b43e5aaa8989d5d8]
#
============================================================
--- conf/distro/include/openmoko-srcdate-now.inc d0e4417eb9382e74f3b5e5f0c94920595baefda9
+++ conf/distro/include/openmoko-srcdate-now.inc d0e4417eb9382e74f3b5e5f0c94920595baefda9
@@ -0,0 +1,18 @@
+# Warning! Builds unupgradable packages!
+
+# OpenMoko
+SRCDATE_libgsmd ?= "now"
+SRCDATE_libmokogsmd2 ?= "now"
+SRCDATE_libmokoui2 ?= "now"
+SRCDATE_libmokojournal2 ?= "now"
+SRCDATE_libmokopanelui2 ?= "now"
+SRCDATE_openmoko-today2 ?= "now"
+SRCDATE_openmoko-dialer2 ?= "now"
+SRCDATE_openmoko-contacts2 ?= "now"
+
+SRCDATE_openmoko-panel-battery ?= "now"
+SRCDATE_openmoko-panel-clock ?= "now"
+SRCDATE_openmoko-panel-gsm ?= "now"
+SRCDATE_openmoko-panel-usb ?= "now"
+SRCDATE_openmoko-panel-bt ?= "now"
+SRCDATE_openmoko-panel-gps ?= "now"
============================================================
--- packages/gnash/gnash_0.8.0.bb bc7ce0bb9d022a74c35eff388b180d174a1a2eef
+++ packages/gnash/gnash_0.8.0.bb bc7ce0bb9d022a74c35eff388b180d174a1a2eef
@@ -0,0 +1,79 @@
+DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
+
+LICENSE = "GPL-2"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
+
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
+
+
+EXTRA_OECONF = "--enable-gui=gtk \
+ --enable-renderer=cairo \
+ --enable-media=none \
+ --disable-klash \
+ --enable-z \
+ --enable-jpeg \
+ --disable-glext \
+ --enable-Xft \
+ --enable-expat \
+ --enable-mad \
+ --enable-cairo \
+ --disable-plugin \
+ --disable-cygnal \
+ --with-boost-incl=${STAGING_INCDIR} \
+ --with-boost-lib=${STAGING_LIBDIR} \
+ --with-libxml-incl=${STAGING_INCDIR}/libxml2 \
+ --with-libxml-lib=${STAGING_LIBDIR} \
+ --with-glib-incl=${STAGING_INCDIR}/glib-2.0 \
+# --with-glib-lib=${STAGING_LIBDIR} \
+ --with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \
+ --with-pango-incl=${STAGING_INCDIR}/pango-1.0 \
+# --with-pango-lib=${STAGING_LIBDIR} \
+ --with-sdl-incl=${STAGING_INCDIR}/SDL \
+ --with-atk-incl=${STAGING_INCDIR}/atk-1.0 \
+ --with-Xft-incl=${STAGING_INCDIR}/X11 \
+ --with-expat-incl=${STAGING_INCDIR} \
+ --with-mad-incl=${STAGING_INCDIR} \
+ --with-cairo-incl=${STAGING_INCDIR}/cairo \
+ --with-curl-incl=${STAGING_INCDIR} \
+ --with-curl-lib=${STAGING_LIBDIR} \
+ "
+
+inherit autotools pkgconfig
+
+LDFLAGS += " -L${STAGING_LIBDIR} -lcurl -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt "
+CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ "
+
+do_configure_append() {
+ for i in `find . -name Makefile` ; do
+ sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i
+ done
+}
+
+
+PARALLEL_MAKE = ""
+
+do_compile() {
+ oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
+ 'ZLIB_INCLUDE=${STAGING_INCDIR}' \
+ 'ZLIB_LIBS=${STAGING_LIBDIR}' \
+ 'PNG_INCLUDE=${STAGING_INCDIR}' \
+ 'PNG_LIBS=${STAGING_LIBDIR}'
+}
+
+
+PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
+
+FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"
+FILES_libgnashbackend = "${libdir}/libgnashbackend-${PV}.so"
+FILES_libgnashbase = "${libdir}/libgnashbase-${PV}.so"
+FILES_libgnashgeo = "${libdir}/libgnashgeo-${PV}.so"
+FILES_libgnashgui = "${libdir}/libgnashgui-${PV}.so"
+FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
+FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
+
+do_stage() {
+ autotools_stage_all
+}
+
============================================================
--- packages/gsm/files/libgsmd-tool-fix.patch e6e57fad53fa4e690e3cfa28074c95ba9f0b05dd
+++ packages/gsm/files/libgsmd-tool-fix.patch e6e57fad53fa4e690e3cfa28074c95ba9f0b05dd
@@ -0,0 +1,19 @@
+Index: gsm/src/util/atcmd.c
+===================================================================
+--- gsm.orig/src/util/atcmd.c 2007-07-31 11:44:32.000000000 +0200
++++ gsm/src/util/atcmd.c 2007-07-31 11:46:44.000000000 +0200
+@@ -91,9 +91,11 @@
+ continue;
+ }
+ printf("STR=`%s'\n", buf);
++
++ /* this is a synchronous call for a passthrough
++ * command */
++ lgsm_passthrough(lgsmh, buf, rbuf, &rlen);
++ printf("RSTR=`%s'\n", rbuf);
+ }
+- /* this is a synchronous call for a passthrough command */
+- lgsm_passthrough(lgsmh, buf, rbuf, &rlen);
+- printf("RSTR=`%s'\n", rbuf);
+ }
+ }
============================================================
--- packages/gsm/files/mlbuf-in-gsmd-struct.patch c792becbe959d694d9e19d4b3f5fe7d77d46de94
+++ packages/gsm/files/mlbuf-in-gsmd-struct.patch c792becbe959d694d9e19d4b3f5fe7d77d46de94
@@ -0,0 +1,102 @@
+Index: gsm/include/gsmd/gsmd.h
+===================================================================
+--- gsm.orig/include/gsmd/gsmd.h 2007-07-31 14:07:47.000000000 +0200
++++ gsm/include/gsmd/gsmd.h 2007-07-31 14:09:02.000000000 +0200
+@@ -74,6 +74,8 @@
+ struct gsmd_device_state dev_state;
+
+ struct llist_head operators; /* cached list of operator names */
++ unsigned int mlbuf_len;
++ unsigned char *mlbuf; /* ml_parse buffer */
+ };
+
+ struct gsmd_user {
+Index: gsm/src/gsmd/atcmd.c
+===================================================================
+--- gsm.orig/src/gsmd/atcmd.c 2007-07-31 14:06:49.000000000 +0200
++++ gsm/src/gsmd/atcmd.c 2007-07-31 14:12:33.000000000 +0200
+@@ -175,9 +175,7 @@
+ {
+ struct gsmd *g = ctx;
+ struct gsmd_atcmd *cmd = NULL;
+- static char mlbuf[MLPARSE_BUF_SIZE];
+ int rc = 0, final = 0;
+- int mlbuf_len;
+
+ DEBUGP("buf=`%s'(%d)\n", buf, len);
+
+@@ -273,15 +271,15 @@
+
+ /* it might be a multiline response, so if there's a previous
+ response, send out mlbuf and start afresh with an empty buffer */
+- if (mlbuf[0] != 0) {
++ if (g->mlbuf[0] != 0) {
+ if (!cmd->cb) {
+ gsmd_log(GSMD_NOTICE, "command without cb!!!\n");
+ } else {
+ DEBUGP("Calling cmd->cb()\n");
+- cmd->resp = mlbuf;
++ cmd->resp = g->mlbuf;
+ rc = cmd->cb(cmd, cmd->ctx, cmd->resp);
+ DEBUGP("Clearing mlbuf\n");
+- mlbuf[0] = 0;
++ g->mlbuf[0] = 0;
+ }
+ }
+
+@@ -334,16 +332,16 @@
+ /* we reach here, if we are at an information response that needs to be
+ * passed on */
+
+- if (mlbuf[0] == 0) {
++ if (g->mlbuf[0] == 0) {
+ DEBUGP("Filling mlbuf\n");
+- strncat(mlbuf, buf, sizeof(mlbuf)-1);
++ strncat(g->mlbuf, buf, MLPARSE_BUF_SIZE-1);
+ } else {
+ DEBUGP("Appending buf to mlbuf\n");
+- mlbuf_len = strlen(mlbuf);
+- if (mlbuf_len+1 < sizeof(mlbuf)) {
+- mlbuf[mlbuf_len] = '\n';
+- mlbuf[mlbuf_len+1] = '\0';
+- strncat(mlbuf, buf, sizeof(mlbuf)-mlbuf_len-2);
++ g->mlbuf_len = strlen(g->mlbuf);
++ if (g->mlbuf_len+1 < MLPARSE_BUF_SIZE) {
++ g->mlbuf[g->mlbuf_len] = '\n';
++ g->mlbuf[g->mlbuf_len+1] = '\0';
++ strncat(g->mlbuf, buf, MLPARSE_BUF_SIZE-g->mlbuf_len-2);
+ } else {
+ DEBUGP("response too big for mlbuf!!!\n");
+ return -EFBIG;
+@@ -365,13 +363,13 @@
+ } else {
+ DEBUGP("Calling final cmd->cb()\n");
+ /* send final result code if there is no information response in mlbuf */
+- if (mlbuf[0] == 0)
++ if (g->mlbuf[0] == 0)
+ cmd->resp = buf;
+ else
+- cmd->resp = mlbuf;
++ cmd->resp = g->mlbuf;
+ rc = cmd->cb(cmd, cmd->ctx, cmd->resp);
+ DEBUGP("Clearing mlbuf\n");
+- mlbuf[0] = 0;
++ g->mlbuf[0] = 0;
+ }
+
+ /* remove from list of currently executing cmds */
+Index: gsm/src/gsmd/gsmd.c
+===================================================================
+--- gsm.orig/src/gsmd/gsmd.c 2007-07-31 14:06:47.000000000 +0200
++++ gsm/src/gsmd/gsmd.c 2007-07-31 14:06:50.000000000 +0200
+@@ -300,6 +300,10 @@
+ {
+ INIT_LLIST_HEAD(&g->users);
+
++ g->mlbuf = talloc_array(gsmd_tallocs, unsigned char, MLPARSE_BUF_SIZE);
++ if (!g->mlbuf)
++ return -ENOMEM;
++
+ return 0;
+ }
+
============================================================
--- packages/gsm/files/sms-hacks.patch e8e5cfc849a5bf268c17517dea0877eef02ccb74
+++ packages/gsm/files/sms-hacks.patch e8e5cfc849a5bf268c17517dea0877eef02ccb74
@@ -0,0 +1,820 @@
+From 3e5832569d3b29a90b29b5d5ac0ffad4765bcff3 Mon Sep 17 00:00:00 2001
+From: Andrzej Zaborowski <balrog at zabor.org>
+Date: Fri, 6 Jul 2007 06:55:12 +0200
+Subject: [PATCH] SMS hacks 2
+
+---
+ include/gsmd/gsmd.h | 8 ++-
+ include/gsmd/usock.h | 35 ++++++++-
+ include/gsmd/vendorplugin.h | 2 +-
+ include/libgsmd/sms.h | 2 +-
+ src/gsmd/atcmd.c | 130 +++++++++++++++++++-------------
+ src/gsmd/sms_cb.c | 19 ++++-
+ src/gsmd/usock.c | 175 +++++++++++++++++++++++++++++++++++++-----
+ src/gsmd/vendor_ti.c | 2 +-
+ src/libgsmd/libgsmd_sms.c | 26 +++++--
+ 11 files changed, 320 insertions(+), 91 deletions(-)
+
+Index: gsm/include/gsmd/gsmd.h
+===================================================================
+--- gsm.orig/include/gsmd/gsmd.h 2007-07-31 14:09:02.000000000 +0200
++++ gsm/include/gsmd/gsmd.h 2007-07-31 14:23:32.000000000 +0200
+@@ -27,6 +27,7 @@
+ u_int32_t buflen;
+ u_int16_t id;
+ u_int8_t flags;
++ char *cur;
+ char buf[];
+ };
+
+@@ -36,6 +37,8 @@
+ LLPARSE_STATE_IDLE_LF, /* LF before response (V1) */
+ LLPARSE_STATE_RESULT, /* within result payload */
+ LLPARSE_STATE_RESULT_CR, /* CR after result */
++ LLPARSE_STATE_PROMPT, /* within a "> " prompt */
++ LLPARSE_STATE_PROMPT_SPC, /* a complete "> " prompt */
+ LLPARSE_STATE_ERROR, /* something went wrong */
+ /* ... idle again */
+ };
+@@ -52,6 +55,7 @@
+ unsigned int flags;
+ void *ctx;
+ int (*cb)(const char *buf, int len, void *ctx);
++ int (*prompt_cb)(void *ctx);
+ char *cur;
+ char buf[LLPARSE_BUF_SIZE];
+ };
+@@ -59,6 +63,7 @@
+ struct gsmd;
+
+ #define GSMD_FLAG_V0 0x0001 /* V0 responses to be expected from TA */
++#define GSMD_FLAG_SMS_FMT 0x0002 /* Use TEXT rather than PDU mode */
+
+ struct gsmd {
+ unsigned int flags;
+@@ -94,7 +99,8 @@
+
+ extern int gsmdlog_init(const char *path);
+ /* write a message to the daemons' logfile */
+-void __gsmd_log(int level, const char *file, int line, const char *function, const char *message, ...);
++void __gsmd_log(int level, const char *file, int line, const char *function, const char *message, ...)
++ __attribute__ ((__format__ (__printf__, 5, 6)));
+ /* macro for logging including filename and line number */
+ #define gsmd_log(level, format, args ...) \
+ __gsmd_log(level, __FILE__, __LINE__, __FUNCTION__, format, ## args)
+Index: gsm/include/gsmd/usock.h
+===================================================================
+--- gsm.orig/include/gsmd/usock.h 2007-07-31 13:58:37.000000000 +0200
++++ gsm/include/gsmd/usock.h 2007-07-31 14:23:32.000000000 +0200
+@@ -139,7 +139,7 @@
+ /* for SMS-SUBMIT, SMS-DELIVER */
+ enum gsmd_sms_tp_u%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r8961e177cdb0b701e3bb0304ec24d5c4a3947254 -r835bda37b996295e3fb4a19b2f3d71f25cd0abca
#
#
#
# patch "packages/starling/starling_0.2.bb"
# from [1289158f34b79de9d3820f8c6022a7107c0cb99a]
# to [9d0522f1342ae339228f0a79a466835a9483cb9c]
#
# patch "packages/starling/starling_svn.bb"
# from [6486e2268453d17257250749dc505d0f9325d01e]
# to [41c225219a46f25d88d800d602cfc111847d3a8b]
#
============================================================
--- packages/starling/starling_0.2.bb 1289158f34b79de9d3820f8c6022a7107c0cb99a
+++ packages/starling/starling_0.2.bb 9d0522f1342ae339228f0a79a466835a9483cb9c
@@ -1,9 +1,10 @@ DEPENDS = "gtk+ libgpewidget gstreamer g
DESCRIPTION = "Starling audio player for GPE"
SECTION = "gpe/multimedia"
PRIORITY = "optional"
LICENSE = "GPL"
DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup"
-RDEPENDS = "pulseaudio-bin \
+
+RDEPENDS = "esd \
gst-plugin-audioconvert \
gst-plugin-esd \
gst-plugin-typefindfunctions \
============================================================
--- packages/starling/starling_svn.bb 6486e2268453d17257250749dc505d0f9325d01e
+++ packages/starling/starling_svn.bb 41c225219a46f25d88d800d602cfc111847d3a8b
@@ -14,9 +14,8 @@ RRECOMMENDS = "gst-plugin-mad \
gst-plugin-ivorbis \
gst-plugin-tcp"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.2+svn${SRCDATE}"
-
inherit gpe autotools
SRC_URI = "${GPE_EXTRA_SVN}"
More information about the Openembedded-commits
mailing list