[oe-commits] org.oe.dev merge of '32cafe5ca6724aa6333ef32aa6a5604b86123925'
coredump2 commit
openembedded-commits at lists.openembedded.org
Sat Jan 5 14:05:51 UTC 2008
merge of '32cafe5ca6724aa6333ef32aa6a5604b86123925'
and '8efc63b43d352dc8bc16998f5461a0649ac0a66d'
Author: coredump2 at openembedded.org
Branch: org.openembedded.dev
Revision: c149e7a8f7b6648318f7044910e02df9c05543d8
ViewMTN: http://monotone.openembedded.org/revision/info/c149e7a8f7b6648318f7044910e02df9c05543d8
Files:
1
packages/linux/linux-omap2-git/defconfig
packages/linux/linux-omap2-git/omap2430sdp/defconfig
packages/linux/linux-omap2-git/defconfig.eabi
packages/linux/linux-omap2-git/omap2430sdp/defconfig.eabi
packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1
packages/xcursor-transparent-theme/files
packages/linux/linux-omap2-git/omap2430sdp
packages/gnome-mplayer/files/non-utf8-id3-fallback.patch
packages/gnome-mplayer/files/uchar-for-utf8-check.patch
packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb
contrib/angstrom/build-release.sh
packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
packages/gnome-mplayer/gnome-mplayer_cvs.bb
packages/openmoko-apps/files/openmoko-gps.desktop
packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb
packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb
Diffs:
#
# mt diff -r32cafe5ca6724aa6333ef32aa6a5604b86123925 -rc149e7a8f7b6648318f7044910e02df9c05543d8
#
#
#
# rename "packages/linux/linux-omap2-git/defconfig"
# to "packages/linux/linux-omap2-git/omap2430sdp/defconfig"
#
# rename "packages/linux/linux-omap2-git/defconfig.eabi"
# to "packages/linux/linux-omap2-git/omap2430sdp/defconfig.eabi"
#
# rename "packages/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1"
# to "packages/xcursor-transparent-theme/files"
#
# add_dir "packages/linux/linux-omap2-git/omap2430sdp"
#
# add_file "packages/gnome-mplayer/files/non-utf8-id3-fallback.patch"
# content [be331e8a429578785b64fac01b7c17b2d423d0ad]
#
# add_file "packages/gnome-mplayer/files/uchar-for-utf8-check.patch"
# content [dd50b5684926b93e6f64361f6b3a9a63a3ee7d30]
#
# add_file "packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb"
# content [96f40a33b74048e73d3054500e402469dc47f737]
#
# patch "contrib/angstrom/build-release.sh"
# from [4b487748d08b4825735633a40285fee332e77b98]
# to [b708ec70fd4e4e0c2756d122aa95b1d653019a9e]
#
# patch "packages/gnome-mplayer/gnome-mplayer_0.5.3.bb"
# from [b00f87db280275a3091590e1be9b6b2521f36643]
# to [39e57ed5f730fc922e3312502b843219942d12cf]
#
# patch "packages/gnome-mplayer/gnome-mplayer_cvs.bb"
# from [f29e0cf247b2a273218db171e5ce4b72187cc304]
# to [c34de96207774639cc00196181f1fb56aadbf586]
#
============================================================
--- packages/gnome-mplayer/files/non-utf8-id3-fallback.patch be331e8a429578785b64fac01b7c17b2d423d0ad
+++ packages/gnome-mplayer/files/non-utf8-id3-fallback.patch be331e8a429578785b64fac01b7c17b2d423d0ad
@@ -0,0 +1,22 @@
+I found that on ARM/glibc 2.5/glib 2.12.something test in strip_unicode() doesn't
+really catch invalid utf-8 chars. Also, let's tell user where problem lies straight.
+
+Paul Sokolovsky <pmiscml at gmail.com>
+--- a/src/thread.c.org 2007-12-24 00:10:15.000000000 +0200
++++ a/src/thread.c 2008-01-04 22:04:30.000000000 +0200
+@@ -349,13 +349,11 @@
+ //g_idle_add(set_media_info, idledata);
+ utf8name = g_locale_to_utf8(parse[name],-1, NULL, NULL,NULL);
+ if (utf8name == NULL) {
+- strip_unicode(parse[name],strlen(parse[name]));
+- utf8name = g_strdup(parse[name]);
++ utf8name = g_strdup("<cannot convert to utf-8>");
+ }
+ utf8artist = g_locale_to_utf8(parse[artist],-1, NULL, NULL,NULL);
+ if (utf8artist == NULL) {
+- strip_unicode(parse[artist],strlen(parse[artist]));
+- utf8artist = g_strdup(parse[artist]);
++ utf8artist = g_strdup("<cannot convert to utf-8>");
+ }
+
+ message = g_markup_printf_escaped(_("<small>\n<b>Title:</b>\t%s\n<b>Artist:</b>\t%s\n<b>File:</b>\t%s\n</small>"),utf8name,utf8artist,idledata->info);
============================================================
--- packages/gnome-mplayer/files/uchar-for-utf8-check.patch dd50b5684926b93e6f64361f6b3a9a63a3ee7d30
+++ packages/gnome-mplayer/files/uchar-for-utf8-check.patch dd50b5684926b93e6f64361f6b3a9a63a3ee7d30
@@ -0,0 +1,22 @@
+--- a/src/support.c.org 2007-12-18 20:39:09.000000000 +0200
++++ a/src/support.c 2008-01-04 22:12:32.000000000 +0200
+@@ -24,7 +24,7 @@
+
+ #include "support.h"
+
+-void strip_unicode(gchar * data, gsize len)
++void strip_unicode(guchar * data, gsize len)
+ {
+ gsize i = 0;
+
+--- a/src/support.h.org 2007-12-17 18:21:46.000000000 +0200
++++ a/src/support.h 2008-01-04 22:24:15.000000000 +0200
+@@ -31,7 +31,7 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+
+-void strip_unicode(gchar * data, gsize len);
++void strip_unicode(guchar * data, gsize len);
+ gint play_file(gchar * filename, gint playlist);
+ gint detect_playlist(gchar * filename);
+ gint parse_playlist(gchar * filename);
============================================================
--- packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb 96f40a33b74048e73d3054500e402469dc47f737
+++ packages/xcursor-transparent-theme/xcursor-watchonly-theme_0.1.1.bb 96f40a33b74048e73d3054500e402469dc47f737
@@ -0,0 +1,15 @@
+LICENSE = "GPL"
+DESCRIPTION = "Transparent xcursor theme for handheld systems with visible watch cursor"
+SECTION = "x11/base"
+RREPLACES = "xcursor-transparent-theme"
+RPROVIDES = "xcursor-transparent-theme"
+PR="r2"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/utils/xcursor-transparent-theme-${PV}.tar.gz \
+ file://use-relative-symlinks.patch;patch=1 \
+ file://skip_watch_cursor.patch;patch=1"
+S = "${WORKDIR}/xcursor-transparent-theme-${PV}"
+
+FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*"
+
+inherit autotools
============================================================
--- contrib/angstrom/build-release.sh 4b487748d08b4825735633a40285fee332e77b98
+++ contrib/angstrom/build-release.sh b708ec70fd4e4e0c2756d122aa95b1d653019a9e
@@ -1,6 +1,6 @@
#!/bin/bash
-DO_UCLIBC=0
+DO_UCLIBC=1
do_build() {
echo "MACHINE = \"$BUILD_MACHINE\"" > conf/auto.conf
@@ -20,6 +20,12 @@ do_build() {
then
BUILD_MODE="uclibc"
echo 'ANGSTROM_MODE = "uclibc"' >> conf/auto.conf
+
+ if [ "$BUILD_CLEAN" != "" ]
+ then
+ bitbake -c clean $BUILD_CLEAN
+ fi
+
for target in $BUILD_TARGETS
do
bitbake $target && do_report_success
@@ -43,7 +49,7 @@ do_report_success() {
# No graphics
-for machine in ep93xx gumstix-connex gumstix-verdex efika omap5912osk
+for machine in ep93xx gumstix-connex gumstix-verdex efika dht-walnut omap5912osk
do
BUILD_MACHINE=$machine
BUILD_CLEAN="libtool-cross base-files"
============================================================
--- packages/gnome-mplayer/gnome-mplayer_0.5.3.bb b00f87db280275a3091590e1be9b6b2521f36643
+++ packages/gnome-mplayer/gnome-mplayer_0.5.3.bb 39e57ed5f730fc922e3312502b843219942d12cf
@@ -1,12 +1,14 @@ RDEPENDS = "mplayer"
DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
LICENSE = "GPL"
DEPENDS = "gtk+ gconf dbus-glib"
RDEPENDS = "mplayer"
-PR = "r2"
+PR = "r3"
inherit autotools pkgconfig gconf
SRC_URI = "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz \
file://ac-gthread.patch;patch=1 \
+ file://1.patch;patch=1 \
+ file://uchar-for-utf8-check.patch;patch=1 \
+ file://non-utf8-id3-fallback.patch;patch=1"
- file://1.patch;patch=1"
============================================================
--- packages/gnome-mplayer/gnome-mplayer_cvs.bb f29e0cf247b2a273218db171e5ce4b72187cc304
+++ packages/gnome-mplayer/gnome-mplayer_cvs.bb c34de96207774639cc00196181f1fb56aadbf586
@@ -5,7 +5,7 @@ PV = "0.5.3+cvs${SRCDATE}"
RDEPENDS = "mplayer"
SRCDATE = "20080101"
PV = "0.5.3+cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
inherit autotools pkgconfig gconf
@@ -13,4 +13,6 @@ SRC_URI = "cvs://anonymous@dekorte.homei
SRC_URI = "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN} \
file://ac-gthread.patch;patch=1 \
+ file://1.patch;patch=1 \
+ file://uchar-for-utf8-check.patch;patch=1 \
+ file://non-utf8-id3-fallback.patch;patch=1"
- file://1.patch;patch=1"
#
# mt diff -r8efc63b43d352dc8bc16998f5461a0649ac0a66d -rc149e7a8f7b6648318f7044910e02df9c05543d8
#
#
#
# delete "packages/openmoko-apps/files/openmoko-gps.desktop"
#
# rename "packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb"
# to "packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb"
#
# patch "packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb"
# from [4274e6a3673edc5493b4f3227e02987d79cb0426]
# to [e4035dc1718202321026ab8029c97d31352cb70c]
#
============================================================
--- packages/openmoko-apps/openmoko-gps_0.0.1+svnr6.bb 4274e6a3673edc5493b4f3227e02987d79cb0426
+++ packages/openmoko-apps/openmoko-gps_0.0.1+svnr9.bb e4035dc1718202321026ab8029c97d31352cb70c
@@ -14,12 +14,11 @@ RDEPENDS = "python-pygtk"
RDEPENDS = "python-pygtk"
-PR = "r1"
+PR = "r0"
######################################################################################
-SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=6 \
- file://openmoko-gps.desktop"
+SRC_URI = "svn://forge.bearstech.com/bearforge/openmoko;module=gps;rev=9"
S = "${WORKDIR}/gps"
@@ -29,6 +28,6 @@ do_install() {
install -d ${D}/usr/share/pixmaps/
install -m 0755 ${S}/gps_reader.py ${D}/usr/bin
- install -m 0644 ${WORKDIR}/openmoko-gps.desktop ${D}/usr/share/applications/
- install -m 0644 ${S}/icon.png ${D}/usr/share/pixmaps/openmoko-gps2.png
+ install -m 0644 ${S}/openmoko-gps.desktop ${D}/usr/share/applications/
+ install -m 0644 ${S}/*.png ${D}/usr/share/pixmaps/
}
More information about the Openembedded-commits
mailing list