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. r4392 - trunk/src/target/opkg/libbb ([EMAIL PROTECTED])
2. org.openmoko.dev: ee4a59c9179f95d58716b52d0dfea4d3528b4e7e
([EMAIL PROTECTED])
3. org.openmoko.dev: ee4a59c9179f95d58716b52d0dfea4d3528b4e7e
([EMAIL PROTECTED])
4. r4393 - trunk/src/target/audio/om-gta02
([EMAIL PROTECTED])
5. Holger's qtopia repo: Changes to 'master' ([EMAIL PROTECTED])
6. r4394 - trunk/src/target/opkg/libopkg ([EMAIL PROTECTED])
--- Begin Message ---Author: thomas Date: 2008-04-23 14:17:49 +0200 (Wed, 23 Apr 2008) New Revision: 4392 Modified: trunk/src/target/opkg/libbb/unarchive.c trunk/src/target/opkg/libbb/unzip.c Log: opkg: fix some initialisation and double free issues in libbb Modified: trunk/src/target/opkg/libbb/unarchive.c =================================================================== --- trunk/src/target/opkg/libbb/unarchive.c 2008-04-23 09:53:44 UTC (rev 4391) +++ trunk/src/target/opkg/libbb/unarchive.c 2008-04-23 12:17:49 UTC (rev 4392) @@ -715,7 +715,7 @@ char *output_buffer = NULL; char *ared_file = NULL; char ar_magic[8]; - int gunzip_pid; + int gunzip_pid = 0; if (filename != NULL) { file_list = xmalloc(sizeof(char *) * 2); Modified: trunk/src/target/opkg/libbb/unzip.c =================================================================== --- trunk/src/target/opkg/libbb/unzip.c 2008-04-23 09:53:44 UTC (rev 4391) +++ trunk/src/target/opkg/libbb/unzip.c 2008-04-23 12:17:49 UTC (rev 4392) @@ -71,7 +71,7 @@ /* these are freed by gz_close */ static unsigned char *window; -static unsigned long *crc_table; +static unsigned long *crc_table = NULL; static unsigned long crc; /* shift register contents */ @@ -1020,6 +1020,9 @@ free(window); free(crc_table); + window = NULL; + crc_table = NULL; + return exit_code; }
--- End Message ---
--- Begin Message ---revision: ee4a59c9179f95d58716b52d0dfea4d3528b4e7e date: 2008-04-23T13:22:57 author: [EMAIL PROTECTED] branch: org.openmoko.dev changelog: These files also have to modify to pass "opkg-cl install" when build meta-toolchain Add below lines and plus "0.01" to PR RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" manifest: format_version "1" new_manifest [b52e5e782fdfd633a14bbdc0b9e0e3ad2c44a222] old_revision [0a12911d208e234d792a9fb7bbe422af1645c2ba] patch "packages/xorg-lib/xtrans_1.0.3.bb" from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] to [6db159605b01b5d3ffbaa240a38231f022a46adc] patch "packages/xorg-lib/xtrans_1.0.4.bb" from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] to [6db159605b01b5d3ffbaa240a38231f022a46adc] patch "packages/xorg-lib/xtrans_1.1.bb" from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] to [6db159605b01b5d3ffbaa240a38231f022a46adc]# # # patch "packages/xorg-lib/xtrans_1.0.3.bb" # from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] # to [6db159605b01b5d3ffbaa240a38231f022a46adc] # # patch "packages/xorg-lib/xtrans_1.0.4.bb" # from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] # to [6db159605b01b5d3ffbaa240a38231f022a46adc] # # patch "packages/xorg-lib/xtrans_1.1.bb" # from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] # to [6db159605b01b5d3ffbaa240a38231f022a46adc] # ============================================================ --- packages/xorg-lib/xtrans_1.0.3.bb 5adfa3a5c753b71a9a61e266569ccbd26e940b09 +++ packages/xorg-lib/xtrans_1.0.3.bb 6db159605b01b5d3ffbaa240a38231f022a46adc @@ -1,7 +1,10 @@ -require xorg-lib-common.inc - DESCRIPTION = "network API translation layer to insulate X applications and \ libraries from OS network vageries." +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" PE = "1" +PR = "r0.01" SRC_URI += "file://fix-missing-includepath.patch;patch=1" + +require xorg-lib-common.inc ============================================================ --- packages/xorg-lib/xtrans_1.0.4.bb 5adfa3a5c753b71a9a61e266569ccbd26e940b09 +++ packages/xorg-lib/xtrans_1.0.4.bb 6db159605b01b5d3ffbaa240a38231f022a46adc @@ -1,7 +1,10 @@ -require xorg-lib-common.inc - DESCRIPTION = "network API translation layer to insulate X applications and \ libraries from OS network vageries." +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" PE = "1" +PR = "r0.01" SRC_URI += "file://fix-missing-includepath.patch;patch=1" + +require xorg-lib-common.inc ============================================================ --- packages/xorg-lib/xtrans_1.1.bb 5adfa3a5c753b71a9a61e266569ccbd26e940b09 +++ packages/xorg-lib/xtrans_1.1.bb 6db159605b01b5d3ffbaa240a38231f022a46adc @@ -1,7 +1,10 @@ -require xorg-lib-common.inc - DESCRIPTION = "network API translation layer to insulate X applications and \ libraries from OS network vageries." +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" PE = "1" +PR = "r0.01" SRC_URI += "file://fix-missing-includepath.patch;patch=1" + +require xorg-lib-common.inc
--- End Message ---
--- Begin Message ---revision: ee4a59c9179f95d58716b52d0dfea4d3528b4e7e date: 2008-04-23T13:22:57 author: [EMAIL PROTECTED] branch: org.openmoko.dev changelog: These files also have to modify to pass "opkg-cl install" when build meta-toolchain Add below lines and plus "0.01" to PR RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" manifest: format_version "1" new_manifest [b52e5e782fdfd633a14bbdc0b9e0e3ad2c44a222] old_revision [0a12911d208e234d792a9fb7bbe422af1645c2ba] patch "packages/xorg-lib/xtrans_1.0.3.bb" from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] to [6db159605b01b5d3ffbaa240a38231f022a46adc] patch "packages/xorg-lib/xtrans_1.0.4.bb" from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] to [6db159605b01b5d3ffbaa240a38231f022a46adc] patch "packages/xorg-lib/xtrans_1.1.bb" from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] to [6db159605b01b5d3ffbaa240a38231f022a46adc]# # # patch "packages/xorg-lib/xtrans_1.0.3.bb" # from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] # to [6db159605b01b5d3ffbaa240a38231f022a46adc] # # patch "packages/xorg-lib/xtrans_1.0.4.bb" # from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] # to [6db159605b01b5d3ffbaa240a38231f022a46adc] # # patch "packages/xorg-lib/xtrans_1.1.bb" # from [5adfa3a5c753b71a9a61e266569ccbd26e940b09] # to [6db159605b01b5d3ffbaa240a38231f022a46adc] # ============================================================ --- packages/xorg-lib/xtrans_1.0.3.bb 5adfa3a5c753b71a9a61e266569ccbd26e940b09 +++ packages/xorg-lib/xtrans_1.0.3.bb 6db159605b01b5d3ffbaa240a38231f022a46adc @@ -1,7 +1,10 @@ -require xorg-lib-common.inc - DESCRIPTION = "network API translation layer to insulate X applications and \ libraries from OS network vageries." +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" PE = "1" +PR = "r0.01" SRC_URI += "file://fix-missing-includepath.patch;patch=1" + +require xorg-lib-common.inc ============================================================ --- packages/xorg-lib/xtrans_1.0.4.bb 5adfa3a5c753b71a9a61e266569ccbd26e940b09 +++ packages/xorg-lib/xtrans_1.0.4.bb 6db159605b01b5d3ffbaa240a38231f022a46adc @@ -1,7 +1,10 @@ -require xorg-lib-common.inc - DESCRIPTION = "network API translation layer to insulate X applications and \ libraries from OS network vageries." +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" PE = "1" +PR = "r0.01" SRC_URI += "file://fix-missing-includepath.patch;patch=1" + +require xorg-lib-common.inc ============================================================ --- packages/xorg-lib/xtrans_1.1.bb 5adfa3a5c753b71a9a61e266569ccbd26e940b09 +++ packages/xorg-lib/xtrans_1.1.bb 6db159605b01b5d3ffbaa240a38231f022a46adc @@ -1,7 +1,10 @@ -require xorg-lib-common.inc - DESCRIPTION = "network API translation layer to insulate X applications and \ libraries from OS network vageries." +RDEPENDS_${PN}-dev = "" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})" PE = "1" +PR = "r0.01" SRC_URI += "file://fix-missing-includepath.patch;patch=1" + +require xorg-lib-common.inc
--- End Message ---
--- Begin Message ---Author: sean_chiang Date: 2008-04-23 15:41:33 +0200 (Wed, 23 Apr 2008) New Revision: 4393 Modified: trunk/src/target/audio/om-gta02/gsmhandset.state Log: loud the voulume of mic Modified: trunk/src/target/audio/om-gta02/gsmhandset.state =================================================================== --- trunk/src/target/audio/om-gta02/gsmhandset.state 2008-04-23 12:17:49 UTC (rev 4392) +++ trunk/src/target/audio/om-gta02/gsmhandset.state 2008-04-23 13:41:33 UTC (rev 4393) @@ -112,7 +112,7 @@ comment.range '0 - 7' iface MIXER name 'Mono Sidetone Playback Volume' - value 0 + value 2 } control.13 { comment.access 'read write'
--- End Message ---
--- Begin Message ---.../qtopiaprediction/qtopiaprediction.pro | 17 ++++ src/libraries/qtopiaprediction/wordprediction.cpp | 89 ++++++++++++++++++++ src/libraries/qtopiaprediction/wordprediction.h | 71 ++++++++++++++++ .../inputmethods/predictivekeyboard/pred.cpp | 2 +- 4 files changed, 178 insertions(+), 1 deletions(-) New commits: commit f39ac37db3b13d1c32c8166b986a6744c7d1b8ea Author: Holger Freyther <[EMAIL PROTECTED]> Date: Wed Apr 23 16:44:30 2008 +0200 [prediction] Fix a wtf. Converting is a char to string is not guaranteed to be null terminated the call converted char to char* and boxed that into QByteArray(char*) which will read anything until the first \0. The alternatives are QByteArray(char*, int) or QByteArray(int, char), I have settled for the later one. commit 3019cc28cb1c5bc33acc61c9433cb40a6f930963 Author: Holger Freyther <[EMAIL PROTECTED]> Date: Wed Apr 23 16:33:56 2008 +0200 [prediction] First implementation of the C Interface, untested commit 42ff2ca73828eaf31c0b9a8c74f69331ceed5a30 Author: Holger Freyther <[EMAIL PROTECTED]> Date: Wed Apr 23 15:09:20 2008 +0200 [prediction] Start with the header file commit 0ff5de564e253fad4d9779c2858a63a3c9423aa0 Author: Holger Freyther <[EMAIL PROTECTED]> Date: Wed Apr 23 13:44:04 2008 +0200 [prediction] Start extracting the prediction into a library used by other processes
--- End Message ---
--- Begin Message ---Author: thomas Date: 2008-04-23 17:40:38 +0200 (Wed, 23 Apr 2008) New Revision: 4394 Modified: trunk/src/target/opkg/libopkg/opkg.c trunk/src/target/opkg/libopkg/opkg_cmd.c trunk/src/target/opkg/libopkg/opkg_download.c trunk/src/target/opkg/libopkg/opkg_download.h Log: opkg: improve download callback handling and integrate into opkg_update_package_lists Modified: trunk/src/target/opkg/libopkg/opkg.c =================================================================== --- trunk/src/target/opkg/libopkg/opkg.c 2008-04-23 13:41:33 UTC (rev 4393) +++ trunk/src/target/opkg/libopkg/opkg.c 2008-04-23 15:40:38 UTC (rev 4394) @@ -87,8 +87,41 @@ return err; } +struct _curl_cb_data +{ + opkg_progress_callback_t cb; + opkg_t *opkg; + void *user_data; + int start_range; + int finish_range; +}; +int +curl_progress_cb (struct _curl_cb_data *cb_data, + double t, /* dltotal */ + double d, /* dlnow */ + double ultotal, + double ulnow) +{ + int p = (t) ? d*100/t : 0; + static int prev = -1; + /* prevent the same value being sent twice (can occur due to rounding) */ + if (p == prev) + return 0; + prev = p; + + if (t < 1) + return 0; + + (cb_data->cb) (cb_data->opkg, + cb_data->start_range + (d/t * ((cb_data->finish_range - cb_data->start_range))), + cb_data->user_data); + + return 0; +} + + /*** Public API ***/ opkg_t * @@ -456,12 +489,20 @@ { char *tmp_file_name; FILE *in, *out; + struct _curl_cb_data cb_data; sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name); /* XXX: Note: downloading url */ - err = opkg_download (opkg->conf, url, tmp_file_name); + cb_data.cb = progress_callback; + cb_data.opkg = opkg; + cb_data.user_data = user_data; + cb_data.start_range = 100 * sources_done / sources_list_count; + cb_data.finish_range = 100 * (sources_done + 1) / sources_list_count; + + err = opkg_download (opkg->conf, url, tmp_file_name, (curl_progress_func) curl_progress_cb, &cb_data); + if (err == 0) { /* XXX: Note: Inflating downloaded file */ @@ -479,7 +520,7 @@ } } else - err = opkg_download (opkg->conf, url, list_file_name); + err = opkg_download (opkg->conf, url, list_file_name, NULL, NULL); if (err) { @@ -501,7 +542,7 @@ sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig"); - err = opkg_download (opkg->conf, url, tmp_file_name); + err = opkg_download (opkg->conf, url, tmp_file_name, NULL, NULL); if (err) { /* XXX: Warning: Download failed */ Modified: trunk/src/target/opkg/libopkg/opkg_cmd.c =================================================================== --- trunk/src/target/opkg/libopkg/opkg_cmd.c 2008-04-23 13:41:33 UTC (rev 4393) +++ trunk/src/target/opkg/libopkg/opkg_cmd.c 2008-04-23 15:40:38 UTC (rev 4394) @@ -226,7 +226,7 @@ FILE *in, *out; sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name); - err = opkg_download(conf, url, tmp_file_name); + err = opkg_download(conf, url, tmp_file_name, NULL, NULL); if (err == 0) { opkg_message (conf, OPKG_NOTICE, "Inflating %s\n", url); in = fopen (tmp_file_name, "r"); @@ -242,7 +242,7 @@ unlink (tmp_file_name); } } else - err = opkg_download(conf, url, list_file_name); + err = opkg_download(conf, url, list_file_name, NULL, NULL); if (err) { failures++; } else { @@ -266,7 +266,7 @@ sprintf_alloc (&tmp_file_name, "%s/%s", tmp, "Packages.sig"); - err = opkg_download(conf, url, tmp_file_name); + err = opkg_download(conf, url, tmp_file_name, NULL, NULL); if (err) { failures++; opkg_message (conf, OPKG_NOTICE, "Signature check failed\n"); Modified: trunk/src/target/opkg/libopkg/opkg_download.c =================================================================== --- trunk/src/target/opkg/libopkg/opkg_download.c 2008-04-23 13:41:33 UTC (rev 4393) +++ trunk/src/target/opkg/libopkg/opkg_download.c 2008-04-23 15:40:38 UTC (rev 4394) @@ -33,35 +33,8 @@ #include "str_util.h" #include "opkg_defines.h" -opkg_download_progress_callback opkg_cb_download_progress = NULL; - -int -curl_progress_func (char* url, - double t, /* dltotal */ - double d, /* dlnow */ - double ultotal, - double ulnow) +int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name, curl_progress_func cb, void *data) { - int p = (t) ? d*100/t : 0; - - if (opkg_cb_download_progress) - { - static int prev = -1; - - /* don't report the same percentage multiple times - * (this can occur due to rounding) */ - if (prev == p) - return 0; - prev = p; - - opkg_cb_download_progress (p, url); - return 0; - } - return 0; -} - -int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name) -{ int err = 0; char *src_basec = strdup(src); @@ -110,9 +83,12 @@ { curl_easy_setopt (curl, CURLOPT_URL, src); curl_easy_setopt (curl, CURLOPT_WRITEDATA, file); - curl_easy_setopt (curl, CURLOPT_NOPROGRESS, 0); - curl_easy_setopt (curl, CURLOPT_PROGRESSDATA, src); - curl_easy_setopt (curl, CURLOPT_PROGRESSFUNCTION, curl_progress_func); + curl_easy_setopt (curl, CURLOPT_NOPROGRESS, (cb == NULL)); + if (cb) + { + curl_easy_setopt (curl, CURLOPT_PROGRESSDATA, data); + curl_easy_setopt (curl, CURLOPT_PROGRESSFUNCTION, cb); + } curl_easy_setopt (curl, CURLOPT_FAILONERROR, 1); if (conf->http_proxy || conf->ftp_proxy) { @@ -179,7 +155,7 @@ sprintf_alloc(&pkg->local_filename, "%s/%s", dir, stripped_filename); - err = opkg_download(conf, url, pkg->local_filename); + err = opkg_download(conf, url, pkg->local_filename, NULL, NULL); free(url); opkg_set_current_state (conf, OPKG_STATE_NONE, NULL); @@ -204,7 +180,7 @@ char *file_base = basename(file_basec); sprintf_alloc(&tmp_file, "%s/%s", conf->tmp_dir, file_base); - err = opkg_download(conf, url, tmp_file); + err = opkg_download(conf, url, tmp_file, NULL, NULL); if (err) return err; Modified: trunk/src/target/opkg/libopkg/opkg_download.h =================================================================== --- trunk/src/target/opkg/libopkg/opkg_download.h 2008-04-23 13:41:33 UTC (rev 4393) +++ trunk/src/target/opkg/libopkg/opkg_download.h 2008-04-23 15:40:38 UTC (rev 4394) @@ -21,8 +21,10 @@ #include "opkg_conf.h" typedef void (*opkg_download_progress_callback)(int percent, char *url); +typedef int (*curl_progress_func)(void *data, double t, double d, double ultotal, double ulnow); -int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name); + +int opkg_download(opkg_conf_t *conf, const char *src, const char *dest_file_name, curl_progress_func cb, void *data); int opkg_download_pkg(opkg_conf_t *conf, pkg_t *pkg, const char *dir); /* * Downloads file from url, installs in package database, return package name.
--- End Message ---
_______________________________________________ commitlog mailing list [email protected] http://lists.openmoko.org/mailman/listinfo/commitlog
