extra info in xmms's xosd output

8 files changed, 124 insertions, 54 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index e19d786eb6ab..1a3b37a5011b 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.20 2003/09/10 04:08:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.21 2003/09/15 09:16:57 seemant Exp $
+
+*xosd-2.2.4-r2 (15 Sep 2003)
+
+  15 Sep 2003; Seemant Kulleen <seemant@gentoo.org> xosd-2.1.0.ebuild,
+  xosd-2.2.2.ebuild, xosd-2.2.4-r2.ebuild,
+  files/xosd-2.2.4-xmms-trackpos.patch:
+  Patch which makes xmms's xosd output display the track number/total # of
+  tracks in the output. Patch courtesy of: CBke <cb@linux.be> in bug #28523
 
 *xosd-2.2.4-r1 (10 Sep 2003)
 
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index e3263088616f..9d378f9d4eca 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,12 +1,8 @@
-MD5 e4a882a5036bc137990beb929feb741e xosd-2.1.0.ebuild 880
 MD5 66bc6c07a7f8415d8fe2823aab4f1e12 xosd-2.2.4-r1.ebuild 979
-MD5 0c40cf9d95918e886dade168e5427465 xosd-2.2.2.ebuild 855
-MD5 f09e4e46a4f916c1e03de7e8966c72c7 xosd-2.2.4-r2.ebuild 1048
-MD5 368aac236ca16add293bb944fa05ee3e ChangeLog 2682
+MD5 507ce1a12c57e9c6bc9b105f7e4c7d05 xosd-2.2.4-r2.ebuild 1049
+MD5 86cfb23e2ebe4c5c31016b29568f82b6 ChangeLog 3019
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 3c380aec54baadc4ae387d9cbba2d714 files/2.2.4-font-align.patch 640
 MD5 99aa8e6851c4a85fcbbcaef42f00ce81 files/xosd-2.2.4-xmms-trackpos.patch 4317
-MD5 871af9ed44d16b6e7117c1c7e8c719a4 files/digest-xosd-2.1.0 62
-MD5 e814c22dfad0c632dd6f372094d043ec files/digest-xosd-2.2.2 62
 MD5 3ba5b9b17b7da4ce0b658cd8ba33a4bd files/digest-xosd-2.2.4-r1 67
 MD5 3ba5b9b17b7da4ce0b658cd8ba33a4bd files/digest-xosd-2.2.4-r2 67
diff --git a/x11-libs/xosd/files/digest-xosd-2.1.0 b/x11-libs/xosd/files/digest-xosd-2.1.0
deleted file mode 100644
index f522bad17410..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2586f11cf1c4a13f36793ed45f2929c4 xosd-2.1.0.tar.gz 250916
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.2 b/x11-libs/xosd/files/digest-xosd-2.2.2
deleted file mode 100644
index b61a1f41bbad..000000000000
--- a/x11-libs/xosd/files/digest-xosd-2.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b385858fb4ddeff0875fa5b4dc372e42 xosd-2.2.2.tar.gz 295184
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.4-r2 b/x11-libs/xosd/files/digest-xosd-2.2.4-r2
new file mode 100644
index 000000000000..18a537058d72
--- /dev/null
+++ b/x11-libs/xosd/files/digest-xosd-2.2.4-r2
@@ -0,0 +1 @@
+MD5 0b5669d2758470cbf717632b5d16dae8 xosd_2.2.4.orig.tar.gz 295886
diff --git a/x11-libs/xosd/files/xosd-2.2.4-xmms-trackpos.patch b/x11-libs/xosd/files/xosd-2.2.4-xmms-trackpos.patch
new file mode 100644
index 000000000000..995858392fe4
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-2.2.4-xmms-trackpos.patch
@@ -0,0 +1,97 @@
+diff -u -r xosd-2.2.4/src/xmms_plugin/dlg_config.c xosd-2.2.4.org/src/xmms_plugin/dlg_config.c
+--- xosd-2.2.4/src/xmms_plugin/dlg_config.c	2003-09-12 15:31:17.802118056 +0200
++++ xosd-2.2.4.org/src/xmms_plugin/dlg_config.c	2003-09-12 15:31:58.468935760 +0200
+@@ -28,7 +28,7 @@
+ 	*vol_on, *bal_on,
+ 	*pause_on,  *trackname_on,
+ 	*stop_on,  *repeat_on,
+-	*shuffle_on;
++	*shuffle_on,  *listpos_on;
+ static GtkWidget *configure_win;
+ static GtkObject *timeout_obj, *offset_obj, *h_offset_obj, *shadow_obj, *outline_obj;
+ static GtkWidget *timeout_spin,*offset_spin, *h_offset_spin, *shadow_spin, *outline_spin;
+@@ -58,7 +58,7 @@
+ 	show.stop = isactive (stop_on);
+ 	show.repeat = isactive (repeat_on);
+ 	show.shuffle = isactive (shuffle_on);
+-
++	show.listpos = isactive (listpos_on);
+ 
+ 	if (colour)
+ 		g_free (colour);
+@@ -530,11 +530,12 @@
+ 	show_item (vbox2, "Balance", show.balance, &bal_on);
+ 	show_item (vbox2, "Pause", show.pause, &pause_on);
+ 	show_item (vbox2, "Track Name", show.trackname, &trackname_on);
+-	vbox2 = gtk_vbox_new (FALSE, 5);
++	vbox2 = gtk_vbox_new (FALSE, 4);
+ 	gtk_box_pack_start (GTK_BOX (hbox2), vbox2, FALSE, FALSE, 0);
+ 	show_item (vbox2, "Stop", show.stop, &stop_on);
+ 	show_item (vbox2, "Repeat", show.repeat, &repeat_on);
+ 	show_item (vbox2, "Shuffle", show.shuffle, &shuffle_on);
++	show_item (vbox2, "Playlist Position", show.listpos, &listpos_on);
+ 
+ 	sep = gtk_hseparator_new ();
+ 	gtk_box_pack_start (GTK_BOX (vbox), sep, FALSE, FALSE, 0);
+diff -u -r xosd-2.2.4/src/xmms_plugin/xmms_osd.c xosd-2.2.4.org/src/xmms_plugin/xmms_osd.c
+--- xosd-2.2.4/src/xmms_plugin/xmms_osd.c	2003-09-12 15:31:17.802118056 +0200
++++ xosd-2.2.4.org/src/xmms_plugin/xmms_osd.c	2003-09-12 15:30:37.301275120 +0200
+@@ -175,6 +175,7 @@
+ 	show.stop = 1;
+ 	show.repeat = 1;
+ 	show.shuffle = 1;
++	show.listpos = 1;
+ 
+ 	g_free (colour);
+ 	g_free (font);
+@@ -206,6 +207,7 @@
+ 		xmms_cfg_read_int (cfgfile, "osd", "show_stop", &show.stop );
+ 		xmms_cfg_read_int (cfgfile, "osd", "show_repeat", &show.repeat );
+ 		xmms_cfg_read_int (cfgfile, "osd", "show_shuffle", &show.shuffle );
++		xmms_cfg_read_int (cfgfile, "osd", "show_listpos", &show.listpos );
+ 		xmms_cfg_free (cfgfile);
+ 	}
+ 
+@@ -247,6 +249,7 @@
+ 		xmms_cfg_write_int (cfgfile, "osd", "show_stop", show.stop );
+ 		xmms_cfg_write_int (cfgfile, "osd", "show_repeat", show.repeat );
+ 		xmms_cfg_write_int (cfgfile, "osd", "show_shuffle", show.shuffle );
++		xmms_cfg_write_int (cfgfile, "osd", "show_listpos", show.listpos );
+ 
+ 		xmms_cfg_write_default_file (cfgfile);
+ 		xmms_cfg_free (cfgfile);
+@@ -373,7 +376,10 @@
+ 		 if (title!=NULL)
+ 		 {
+        	          title2=malloc(strlen(current.title)+26);
+-		  sprintf(title2,"%i/%i: %s",xmms_remote_get_playlist_pos (gp.xmms_session)+1,xmms_remote_get_playlist_length (gp.xmms_session),current.title);
++		  if (show.listpos)
++		   sprintf(title2,"%i/%i: %s",xmms_remote_get_playlist_pos (gp.xmms_session)+1,xmms_remote_get_playlist_length (gp.xmms_session),current.title);
++		  else
++		   sprintf(title2,"%s",current.title);
+ 		 }
+  		}
+ 	}
+@@ -394,7 +400,10 @@
+ 			    if (current.title!=NULL)
+ 			    {
+ 	    	             title2=malloc(strlen(current.title)+52);
+-			     sprintf(title2,"%i/%i: %s (%.2i:%.2i)",xmms_remote_get_playlist_pos (gp.xmms_session)+1,xmms_remote_get_playlist_length (gp.xmms_session),current.title,xmms_remote_get_output_time(gp.xmms_session)/1000/60,xmms_remote_get_output_time(gp.xmms_session)/1000%60);
++			     if (show.listpos)
++			      sprintf(title2,"%i/%i: %s (%.2i:%.2i)",xmms_remote_get_playlist_pos (gp.xmms_session)+1,xmms_remote_get_playlist_length (gp.xmms_session),current.title,xmms_remote_get_output_time(gp.xmms_session)/1000/60,xmms_remote_get_output_time(gp.xmms_session)/1000%60);
++			     else
++			      sprintf(title2,"%s (%.2i:%.2i)",current.title,xmms_remote_get_output_time(gp.xmms_session)/1000/60,xmms_remote_get_output_time(gp.xmms_session)/1000%60);
+ 			    }
+ 			}
+ 		}
+diff -u -r xosd-2.2.4/src/xmms_plugin/xmms_osd.h xosd-2.2.4.org/src/xmms_plugin/xmms_osd.h
+--- xosd-2.2.4/src/xmms_plugin/xmms_osd.h	2003-09-12 15:31:17.802118056 +0200
++++ xosd-2.2.4.org/src/xmms_plugin/xmms_osd.h	2003-09-12 15:30:37.301275120 +0200
+@@ -20,6 +20,7 @@
+ 	gboolean stop;
+ 	gboolean repeat;
+ 	gboolean shuffle;
++	gboolean listpos;
+ };
+ extern struct show show;
+ 
diff --git a/x11-libs/xosd/xosd-2.1.0.ebuild b/x11-libs/xosd/xosd-2.1.0.ebuild
deleted file mode 100644
index 38077e17cf8c..000000000000
--- a/x11-libs/xosd/xosd-2.1.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.1.0.ebuild,v 1.4 2003/08/15 11:08:37 lanius Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Library for overlaying text/glyphs in X-Windows \
-X-On-Screen-Display plus binary for sending text from command line."
-HOMEPAGE="http://www.ignavus.net/"
-SRC_URI="http://www.ignavus.net/${P}.tar.gz"
-
-IUSE="xmms"
-DEPEND="virtual/x11
-	xmms? ( media-sound/xmms
-		media-libs/gdk-pixbuf )"
-RDEPEND=${DEPEND}
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~sparc ~ppc"
-
-src_compile() {
-	local myconf
-
-	if [ "`use xmms`" ]; then
-		myconf="--with-plugindir=/usr/lib/xmms"
-	else
-		myconf="--without-plugindir"
-	fi
-
-	econf || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS ChangeLog NEWS COPYING README
-}
diff --git a/x11-libs/xosd/xosd-2.2.2.ebuild b/x11-libs/xosd/xosd-2.2.4-r2.ebuild
index 279986e0a860..b64f3c25a878 100644
--- a/x11-libs/xosd/xosd-2.2.2.ebuild
+++ b/x11-libs/xosd/xosd-2.2.4-r2.ebuild
@@ -1,31 +1,37 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.2.ebuild,v 1.5 2003/08/15 11:10:39 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.4-r2.ebuild,v 1.1 2003/09/15 09:16:57 seemant Exp $
+
+IUSE="xmms"
 
 DESCRIPTION="Library for overlaying text/glyphs in X-Windows \
 X-On-Screen-Display plus binary for sending text from command line."
 HOMEPAGE="http://www.ignavus.net/"
-SRC_URI="http://www.ignavus.net/${P}.tar.gz"
+SRC_URI="http://ftp.debian.org/debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz"
 
-IUSE="xmms"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~mips ~arm"
 
 DEPEND="virtual/x11
 	xmms? ( media-sound/xmms
-		>=media-libs/gdk-pixbuf-0.22.0 )"
+	>=media-libs/gdk-pixbuf-0.22.0 )"
 
-src_compile() {
-	local myconf
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-font-align.patch
+	epatch ${FILESDIR}/${P}-xmms-trackpos.patch
+}
 
+src_compile() {
 	if [ "`use xmms`" ]; then
-		myconf="--with-plugindir=/usr/lib/xmms"
+		myconf="--with-plugindir=/usr/lib/xmms/General"
 	else
 		myconf="--without-plugindir"
 	fi
 
-	econf || die
+	econf ${myconf} || die
 	emake || die
 }