add xmms trackpos patch again, bug #57985

6 files changed, 193 insertions, 99 deletions

diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog
index 6981ab02e85b..9efcafb6360a 100644
--- a/x11-libs/xosd/ChangeLog
+++ b/x11-libs/xosd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/xosd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.33 2004/07/27 16:52:02 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.34 2004/08/02 07:58:43 lanius Exp $
+
+  02 Aug 2004; Heinrich Wendel <lanius@gentoo.org>
+  files/2.2.8-xmms-trackpos.patch, files/xosd-2.2.4-xmms-trackpos.patch:
+  add xmms trackpos patch again, bug #57985
 
 *xosd-2.2.8 (20 Jul 2004)
 
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
index 356623102f48..dfef7319ce49 100644
--- a/x11-libs/xosd/Manifest
+++ b/x11-libs/xosd/Manifest
@@ -1,9 +1,11 @@
 MD5 b5298577cce520b3b064055fe5293950 xosd-2.2.8.ebuild 991
+MD5 7a1ae652a6b77ec5d928519dde960d58 xosd-2.2.8-r1.ebuild 1037
 MD5 dbac0a2e7cbfe0397f55240711062600 ChangeLog 4374
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
 MD5 e5c60617c1930e10cafc2bde2a1af1be xosd-2.2.5-r1.ebuild 1035
 MD5 3c380aec54baadc4ae387d9cbba2d714 files/2.2.4-font-align.patch 640
-MD5 99aa8e6851c4a85fcbbcaef42f00ce81 files/xosd-2.2.4-xmms-trackpos.patch 4317
 MD5 7012b7e17c6cf060995e65335222ea2b files/2.2.5-xmms-trackpos.patch 4001
 MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8 63
 MD5 47b823d1241bc14385f5e911dcbf545e files/digest-xosd-2.2.5-r1 62
+MD5 06e494585c2baa22f89b8916515a7741 files/digest-xosd-2.2.8-r1 63
+MD5 5b6bffe8689739aff9d0eb219cc443d8 files/2.2.8-xmms-trackpos.patch 5167
diff --git a/x11-libs/xosd/files/2.2.8-xmms-trackpos.patch b/x11-libs/xosd/files/2.2.8-xmms-trackpos.patch
new file mode 100644
index 000000000000..06d3e7cb7bc6
--- /dev/null
+++ b/x11-libs/xosd/files/2.2.8-xmms-trackpos.patch
@@ -0,0 +1,139 @@
+diff -rc xosd-2.2.8/src/xmms_plugin/dlg_config.c xosd-2.2.8.patch/src/xmms_plugin/dlg_config.c
+*** xosd-2.2.8/src/xmms_plugin/dlg_config.c	Fri Oct  3 02:09:32 2003
+--- xosd-2.2.8.patch/src/xmms_plugin/dlg_config.c	Thu Jul 22 19:53:58 2004
+***************
+*** 26,32 ****
+  
+  static GtkToggleButton
+    * vol_on, *bal_on,
+!   *pause_on, *trackname_on, *stop_on, *repeat_on, *shuffle_on;
+  static GtkWidget *configure_win;
+  static GtkObject *timeout_obj, *offset_obj, *h_offset_obj, *shadow_obj,
+    *outline_obj;
+--- 26,32 ----
+  
+  static GtkToggleButton
+    * vol_on, *bal_on,
+!   *pause_on, *trackname_on, *stop_on, *repeat_on, *shuffle_on, *listpos_on;
+  static GtkWidget *configure_win;
+  static GtkObject *timeout_obj, *offset_obj, *h_offset_obj, *shadow_obj,
+    *outline_obj;
+***************
+*** 58,64 ****
+    show.stop = isactive(stop_on);
+    show.repeat = isactive(repeat_on);
+    show.shuffle = isactive(shuffle_on);
+! 
+  
+    if (colour)
+      g_free(colour);
+--- 58,64 ----
+    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);
+***************
+*** 532,542 ****
+    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);
+    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);
+  
+    sep = gtk_hseparator_new();
+    gtk_box_pack_start(GTK_BOX(vbox), sep, FALSE, FALSE, 0);
+--- 532,543 ----
+    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, 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 -rc xosd-2.2.8/src/xmms_plugin/xmms_osd.c xosd-2.2.8.patch/src/xmms_plugin/xmms_osd.c
+*** xosd-2.2.8/src/xmms_plugin/xmms_osd.c	Fri Oct  3 02:09:31 2003
+--- xosd-2.2.8.patch/src/xmms_plugin/xmms_osd.c	Thu Jul 22 23:15:50 2004
+***************
+*** 170,175 ****
+--- 170,176 ----
+    show.stop = 1;
+    show.repeat = 1;
+    show.shuffle = 1;
++   show.listpos = 1;
+  
+    g_free(colour);
+    g_free(font);
+***************
+*** 201,206 ****
+--- 202,208 ----
+      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);
+    }
+  
+***************
+*** 242,247 ****
+--- 244,250 ----
+      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);
+***************
+*** 386,395 ****
+        title = malloc(len);
+        playlist_time =
+          withtime ? xmms_remote_get_output_time(gp.xmms_session) : 0;
+!       snprintf(title, len,
+                 withtime ? "%i/%i: %s (%i:%02i)" : "%i/%i: %s",
+                 current.pos + 1, playlist_length, current.title,
+                 playlist_time / 1000 / 60, playlist_time / 1000 % 60);
+        replace_hexcodes(title);
+        xosd_display(osd, 1, XOSD_string, title);
+        free(title);
+--- 389,405 ----
+        title = malloc(len);
+        playlist_time =
+          withtime ? xmms_remote_get_output_time(gp.xmms_session) : 0;
+!       if (show.listpos)
+!         snprintf(title, len,
+                 withtime ? "%i/%i: %s (%i:%02i)" : "%i/%i: %s",
+                 current.pos + 1, playlist_length, current.title,
+                 playlist_time / 1000 / 60, playlist_time / 1000 % 60);
++       else
++         snprintf(title, len,
++                withtime ? "%s (%i:%02i)" : "%s",
++                current.title,
++                playlist_time / 1000 / 60, playlist_time / 1000 % 60);
++ 
+        replace_hexcodes(title);
+        xosd_display(osd, 1, XOSD_string, title);
+        free(title);
+diff -rc xosd-2.2.8/src/xmms_plugin/xmms_osd.h xosd-2.2.8.patch/src/xmms_plugin/xmms_osd.h
+*** xosd-2.2.8/src/xmms_plugin/xmms_osd.h	Fri Oct  3 02:09:31 2003
+--- xosd-2.2.8.patch/src/xmms_plugin/xmms_osd.h	Thu Jul 22 20:02:01 2004
+***************
+*** 21,26 ****
+--- 21,27 ----
+    gboolean stop;
+    gboolean repeat;
+    gboolean shuffle;
++   gboolean listpos;
+  };
+  extern struct show show;
+  
diff --git a/x11-libs/xosd/files/digest-xosd-2.2.8-r1 b/x11-libs/xosd/files/digest-xosd-2.2.8-r1
new file mode 100644
index 000000000000..c466c31d987e
--- /dev/null
+++ b/x11-libs/xosd/files/digest-xosd-2.2.8-r1
@@ -0,0 +1 @@
+MD5 85b00f6609603139855775d6213980cb xosd-2.2.8.tar.bz2 281156
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
deleted file mode 100644
index 995858392fe4..000000000000
--- a/x11-libs/xosd/files/xosd-2.2.4-xmms-trackpos.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-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.2.8-r1.ebuild b/x11-libs/xosd/xosd-2.2.8-r1.ebuild
new file mode 100644
index 000000000000..4b32f0e6075a
--- /dev/null
+++ b/x11-libs/xosd/xosd-2.2.8-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/xosd-2.2.8-r1.ebuild,v 1.1 2004/08/02 07:58:43 lanius Exp $
+
+inherit eutils
+
+IUSE="xinerama 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.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~ia64 ~amd64"
+
+DEPEND="virtual/x11
+	xmms? ( media-sound/xmms >=media-libs/gdk-pixbuf-0.22.0 )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-xmms-trackpos.patch
+}
+
+src_compile() {
+	local myconf=""
+
+	use xinerama || myconf="${myconf} --disable-xinerama"
+
+	use xmms || myconf="${myconf} --disable-new-plugin"
+
+	econf ${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog NEWS COPYING README
+
+	if [ -d ${D}no ]; then
+		rmdir ${D}no
+	fi
+}