5 files changed, 33 insertions, 36 deletions
diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc
new file mode 100644
index 0000000000..15808a11b4
--- /dev/null
+++ b/recipes/gnome-mplayer/gnome-mplayer.inc
@@ -0,0 +1,11 @@
+DESCRIPTION = "Simple MPlayer frontend with lite Gnome integration"
+AUTHOR = "Kevin DeKorte <kdekorte@gmail.com>"
+HOMEPAGE = "http://code.google.com/p/gnome-mplayer/"
+SECTION = "x11/multimedia"
+LICENSE = "GPL"
+DEPENDS = "gtk+ gconf dbus-glib"
+RDEPENDS = "mplayer"
+
+inherit autotools pkgconfig gconf
+
+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 c01152cfb8..81031d0ba2 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
@@ -1,14 +1,3 @@
-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 = "r3"
+require gnome-mplayer.inc
 
-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"
+PR = "r5"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb
new file mode 100644
index 0000000000..81031d0ba2
--- /dev/null
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.5.bb
@@ -0,0 +1,3 @@
+require gnome-mplayer.inc
+
+PR = "r5"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb b/recipes/gnome-mplayer/gnome-mplayer_cvs.bb
deleted file mode 100644
index 5b0cb41707..0000000000
--- a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-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 = "r5"
-
-inherit autotools pkgconfig gconf
-
-S = "${WORKDIR}/${PN}"
-
-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"
-
-do_install_append() {
-	sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop
-}
-
diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
new file mode 100644
index 0000000000..fa270f674e
--- /dev/null
+++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb
@@ -0,0 +1,17 @@
+require gnome-mplayer.inc
+
+SRCDATE = "20080101"
+PV = "0.9.5+svn${SRCDATE}"
+PR = "r6"
+S = "${WORKDIR}/trunk"
+
+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
+}
+