gnome-mplayer: unbreak 0.5.3

* rearrange the SRC_URI situation and point to googlecode.com
* the patches don't apply to the released versions, but only to SVN

diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc
index d1d25b8..15808a1 100644 (file)
--- a/recipes/gnome-mplayer/gnome-mplayer.inc
+++ b/recipes/gnome-mplayer/gnome-mplayer.inc
@@ -8,7 +8,4 @@ RDEPENDS = "mplayer"
 
 inherit autotools pkgconfig gconf
 
-SRC_URI += "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"
+SRC_URI = "http://gnome-mplayer.googlecode.com/files/${P}.tar.gz"

diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
index 9112931..81031d0 100644 (file)
--- a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
@@ -1,4 +1,3 @@
 require gnome-mplayer.inc
 
-PR = "r4"
-SRC_URI += "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz"
+PR = "r5"

diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
index 0668699..fa270f6 100644 (file)
--- a/recipes/gnome-mplayer/gnome-mplayer_svn.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
@@ -1,11 +1,15 @@
 require gnome-mplayer.inc
 
 SRCDATE = "20080101"
-PV = "0.5.3+svn${SRCDATE}"
+PV = "0.9.5+svn${SRCDATE}"
 PR = "r6"
 S = "${WORKDIR}/trunk"
 
-SRC_URI += "svn://gnome-mplayer.googlecode.com/svn/;module=trunk;proto=http"
+SRC_URI = "svn://gnome-mplayer.googlecode.com/svn/;module=trunk;proto=http \
+    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"
 
 do_install_append() {
        sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop