[oe-commits] org.oe.angstrom-2007.12-stable Merged from .dev:

[pfalcon commit]

Merged from .dev:

b342639828f6049e03634372396237442063157a gnome-mplayer: Of course, we need MPlayer itself.
153dd9902a8fbbcd4a4140f991a8e938f1af29f5 gnome-mplayer: Fix segfaults decoding non-utf8 tags in media.

Author: pfalcon at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 33e35a6ae22ab2b4a1f15f737db5f013748e3c46
ViewMTN: http://monotone.openembedded.org/revision/info/33e35a6ae22ab2b4a1f15f737db5f013748e3c46
Files:
1
packages/gnome-mplayer/gnome-mplayer_0.5.3.bb
packages/gnome-mplayer/gnome-mplayer_cvs.bb
Diffs:

#
# mt diff -ra8f4ecaf51900e2841447e8e6ea7d89966853b49 -r33e35a6ae22ab2b4a1f15f737db5f013748e3c46
#
# 
# 
# patch "packages/gnome-mplayer/gnome-mplayer_0.5.3.bb"
#  from [dc61dd1c6a05ba82814135c247fd7e63ab1211fa]
#    to [39e57ed5f730fc922e3312502b843219942d12cf]
# 
# patch "packages/gnome-mplayer/gnome-mplayer_cvs.bb"
#  from [ed0554f6c2a18456399fd04659d92057d216eda9]
#    to [c34de96207774639cc00196181f1fb56aadbf586]
# 
============================================================
--- packages/gnome-mplayer/gnome-mplayer_0.5.3.bb	dc61dd1c6a05ba82814135c247fd7e63ab1211fa
+++ packages/gnome-mplayer/gnome-mplayer_0.5.3.bb	39e57ed5f730fc922e3312502b843219942d12cf
@@ -1,11 +1,14 @@ DEPENDS = "gtk+ gconf dbus-glib"
 DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
 HOMEPAGE = "http://dekorte.homeip.net/download/gnome-mplayer/"
 LICENSE = "GPL"
 DEPENDS = "gtk+ gconf dbus-glib"
-PR = "r1"
+RDEPENDS = "mplayer"
+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	ed0554f6c2a18456399fd04659d92057d216eda9
+++ packages/gnome-mplayer/gnome-mplayer_cvs.bb	c34de96207774639cc00196181f1fb56aadbf586
@@ -1,10 +1,11 @@ DEPENDS = "gtk+ gconf dbus-glib"
 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"
 SRCDATE = "20080101"
 PV = "0.5.3+cvs${SRCDATE}"
-PR = "r1"
+PR = "r3"
 
 inherit autotools pkgconfig gconf
 
@@ -12,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"