From: Rolf Leggewie <oe-devel@rolf.leggewie.biz>
Date: Tue, 19 May 2009 14:15:42 +0000 (+0200)
Subject: gnome-mplayer: unify
X-Git-Tag: Release-2010-05/1~3478^2~9
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02cc40c6ed09c3bb715391d07be2626f7ef88160;p=openembedded.git

gnome-mplayer: unify
* add AUTHOR and SECTION (partly closes #4575)
* fix HOMEPAGE
* both recipes were unbuildable before this commit and are still unbuildable
  Unbreaking the recipes will be done in separate commits.
---

diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc
new file mode 100644
index 0000000000..d1d25b8927
--- /dev/null
+++ b/recipes/gnome-mplayer/gnome-mplayer.inc
@@ -0,0 +1,14 @@
+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 += "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"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
index c01152cfb8..91129310a3 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.5.3.bb
@@ -1,14 +1,4 @@
-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 = "r4"
+SRC_URI += "http://dekorte.homeip.net/download/${PN}/${P}.tar.gz"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb b/recipes/gnome-mplayer/gnome-mplayer_cvs.bb
index 5b0cb41707..57c6673d68 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_cvs.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_cvs.bb
@@ -1,21 +1,12 @@
-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"
+require gnome-mplayer.inc
+
 SRCDATE = "20080101"
 PV = "0.5.3+cvs${SRCDATE}"
-PR = "r5"
-
-inherit autotools pkgconfig gconf
+PR = "r6"
 
 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"
+SRC_URI += "cvs://anonymous@dekorte.homeip.net/data/cvs;module=${PN}"
 
 do_install_append() {
 	sed -i "s/OnlyShowIn=GNOME;//" ${D}${datadir}/applications/gnome-mplayer.desktop