[oe-commits] org.oe.angstrom-2007.12-stable merge of '6072825d5411f0c2cb06fa4ba8a77427ad3d61aa'

[pfalcon commit]

merge of '6072825d5411f0c2cb06fa4ba8a77427ad3d61aa'
     and 'a6cd843eeaef2d9dabedbd4c51a709ee49b12724'

Author: pfalcon at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 1f90c197df52b782015e37da423a2e0711ba51d1
ViewMTN: http://monotone.openembedded.org/revision/info/1f90c197df52b782015e37da423a2e0711ba51d1
Files:
1
packages/gnome-mplayer/files/non-utf8-id3-fallback.patch
packages/gnome-mplayer/files/uchar-for-utf8-check.patch
packages/gnome-mplayer/gnome-mplayer_cvs.bb
contrib/angstrom/build-feeds.sh
Diffs:

#
# mt diff -r6072825d5411f0c2cb06fa4ba8a77427ad3d61aa -r1f90c197df52b782015e37da423a2e0711ba51d1
#
# 
# 
# 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]
# 
# patch "packages/gnome-mplayer/gnome-mplayer_cvs.bb"
#  from [c34de96207774639cc00196181f1fb56aadbf586]
#    to [8364ceed9a6f7763168e7bd6b5d97884a56b4015]
# 
============================================================
--- 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/gnome-mplayer/gnome-mplayer_cvs.bb	c34de96207774639cc00196181f1fb56aadbf586
+++ packages/gnome-mplayer/gnome-mplayer_cvs.bb	8364ceed9a6f7763168e7bd6b5d97884a56b4015
@@ -5,7 +5,7 @@ PV = "0.5.3+cvs${SRCDATE}"
 RDEPENDS = "mplayer"
 SRCDATE = "20080101"
 PV = "0.5.3+cvs${SRCDATE}"
-PR = "r3"
+PR = "r4"
 
 inherit autotools pkgconfig gconf
 


#
# mt diff -ra6cd843eeaef2d9dabedbd4c51a709ee49b12724 -r1f90c197df52b782015e37da423a2e0711ba51d1
#
# 
# 
# patch "contrib/angstrom/build-feeds.sh"
#  from [79d2ac57a06b5b717fddbfc285bb0465fdae310d]
#    to [ae63a17c3ffb1fc4cc20e3e21da58ff560af67c1]
# 
============================================================
--- contrib/angstrom/build-feeds.sh	79d2ac57a06b5b717fddbfc285bb0465fdae310d
+++ contrib/angstrom/build-feeds.sh	ae63a17c3ffb1fc4cc20e3e21da58ff560af67c1
@@ -36,8 +36,9 @@ do
 do
         BUILD_MACHINE=$machine
 	BUILD_CLEAN="libtool-cross qmake-native qmake2-native"
-        BUILD_TARGETS="texinfo flex bison gperf gcc binutils automake autoconf m4 pkgconfig \
-	               task-proper-tools mc screen \
+        BUILD_TARGETS="texinfo flex bison gperf gcc binutils make automake autoconf m4 pkgconfig \
+                       usbutils pciutils mtd-utils usbview hal \
+                       task-proper-tools mc screen findutils \
 	               mono perl python ruby \
 		       gtk+ qt-x11-free qt4-x11-free \
 		       gpe-mini-browser midori minimo openmoko-browser2 webkit-gtklauncher \
@@ -46,17 +47,22 @@ do
 		       gpe-gallery gpe-scap notecase \
 		       pidgin irssi \
 		       roadmap-gtk2 gpsdrive navit \
-		       xmms mplayer quasar gmome-mplayer \
+		       xmms mplayer quasar vlc-gpe gnome-mplayer \
 		       wpa-gui wifi-radar kismet aircrack-ng dsniff \
-		       iptables iperf \
+		       nmap iptables iperf \
+		       gpe-login ipaq-sleep \
 		       gpe-bluetooth bluez-gnome python-pybluez \
 		       abiword gnumeric evince epdfview gimp \
+		       scummvm \
 		       flite \
 		       ctorrent \
 		       asterisk \
-		       gnuplot mpfr gmp fftw fftwf fftwl \
+		       gnuradio gnuplot mpfr gmp fftw fftwf fftwl \
 		       gphoto2 gqview imagemagick ufraw \
 		       tzdata \
+		       xserver-kdrive xserver-xorg \
+		       xf86-video-fbdev xf86-video-ati xf86-video-vesa \
+		       xf86-input-evdev xf86-input-keyboard xf86-input-mouse \
 		      "
 	do_build
 done