From 2cad507f50835ca6b70e71ec2077fd2e04846172 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 30 Sep 2003 03:02:27 +0000 Subject: version bump --- x11-libs/xosd/ChangeLog | 11 ++- x11-libs/xosd/files/2.2.5-xmms-trackpos.patch | 107 ++++++++++++++++++++++++++ x11-libs/xosd/files/digest-xosd-2.2.5 | 1 + x11-libs/xosd/xosd-2.2.5.ebuild | 38 +++++++++ 4 files changed, 154 insertions(+), 3 deletions(-) create mode 100644 x11-libs/xosd/files/2.2.5-xmms-trackpos.patch create mode 100644 x11-libs/xosd/files/digest-xosd-2.2.5 create mode 100644 x11-libs/xosd/xosd-2.2.5.ebuild (limited to 'x11-libs') diff --git a/x11-libs/xosd/ChangeLog b/x11-libs/xosd/ChangeLog index 1dc8ee27354d..2cc195dd721c 100644 --- a/x11-libs/xosd/ChangeLog +++ b/x11-libs/xosd/ChangeLog @@ -1,12 +1,17 @@ # 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.22 2003/09/15 19:56:39 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/xosd/ChangeLog,v 1.23 2003/09/30 03:02:27 vapier Exp $ - 15 Sep 2003; Michael Sterrett xosd-2.2.4-r2.ebuild: - updating 2.2.4 to stable on x86 per lanius' instruction +*xosd-2.2.5 (29 Sep 2003) + + 29 Sep 2003; Mike Frysinger : + Version bumpage. *xosd-2.2.4-r2 (15 Sep 2003) + 15 Sep 2003; Michael Sterrett xosd-2.2.4-r2.ebuild: + updating 2.2.4 to stable on x86 per lanius' instruction + 15 Sep 2003; Seemant Kulleen xosd-2.1.0.ebuild, xosd-2.2.2.ebuild, xosd-2.2.4-r2.ebuild, files/xosd-2.2.4-xmms-trackpos.patch: diff --git a/x11-libs/xosd/files/2.2.5-xmms-trackpos.patch b/x11-libs/xosd/files/2.2.5-xmms-trackpos.patch new file mode 100644 index 000000000000..be0435972644 --- /dev/null +++ b/x11-libs/xosd/files/2.2.5-xmms-trackpos.patch @@ -0,0 +1,107 @@ +diff -ur xosd-2.2.5.orig/src/xmms_plugin/dlg_config.c xosd-2.2.5/src/xmms_plugin/dlg_config.c +--- xosd-2.2.5.orig/src/xmms_plugin/dlg_config.c 2003-09-29 22:48:34.875787152 -0400 ++++ xosd-2.2.5/src/xmms_plugin/dlg_config.c 2003-09-29 22:49:59.710890256 -0400 +@@ -26,7 +26,7 @@ + + static GtkToggleButton + * vol_on, *bal_on, +- *pause_on, *trackname_on, *stop_on, *repeat_on, *shuffle_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,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); +@@ -564,11 +564,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 -ur xosd-2.2.5.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.5/src/xmms_plugin/xmms_osd.c +--- xosd-2.2.5.orig/src/xmms_plugin/xmms_osd.c 2003-09-29 22:48:34.874787304 -0400 ++++ xosd-2.2.5/src/xmms_plugin/xmms_osd.c 2003-09-29 22:54:27.111239224 -0400 +@@ -175,6 +175,7 @@ + show.stop = 1; + show.repeat = 1; + show.shuffle = 1; ++ show.listpos = 1; + + g_free (colour); + g_free (font); +@@ -207,6 +208,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); + } + +@@ -249,6 +251,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); +@@ -376,10 +379,13 @@ + if (title != NULL) + { + title2 = malloc (strlen (current.title) + 26); ++ 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); + } + } + } +@@ -400,6 +406,7 @@ + if (current.title != NULL) + { + title2 = malloc (strlen (current.title) + 52); ++ 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), +@@ -408,6 +415,11 @@ + 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 -ur xosd-2.2.5.orig/src/xmms_plugin/xmms_osd.h xosd-2.2.5/src/xmms_plugin/xmms_osd.h +--- xosd-2.2.5.orig/src/xmms_plugin/xmms_osd.h 2003-09-29 22:48:34.874787304 -0400 ++++ xosd-2.2.5/src/xmms_plugin/xmms_osd.h 2003-09-29 22:54:45.944376152 -0400 +@@ -21,6 +21,7 @@ + gboolean stop; + gboolean repeat; + gboolean shuffle; ++ gboolean listpos; + }; + extern struct show show; + diff --git a/x11-libs/xosd/files/digest-xosd-2.2.5 b/x11-libs/xosd/files/digest-xosd-2.2.5 new file mode 100644 index 000000000000..60827abb3603 --- /dev/null +++ b/x11-libs/xosd/files/digest-xosd-2.2.5 @@ -0,0 +1 @@ +MD5 96bae6f0800c1710d7d4edb3b37b01e5 xosd-2.2.5.tar.gz 388861 diff --git a/x11-libs/xosd/xosd-2.2.5.ebuild b/x11-libs/xosd/xosd-2.2.5.ebuild new file mode 100644 index 000000000000..533a7546476a --- /dev/null +++ b/x11-libs/xosd/xosd-2.2.5.ebuild @@ -0,0 +1,38 @@ +# 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.5.ebuild,v 1.1 2003/09/30 03:02:27 vapier Exp $ + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~sparc ~ppc ~alpha ~hppa ~mips ~arm" +IUSE="xmms" + +DEPEND="virtual/x11 + xmms? ( media-sound/xmms + >=media-libs/gdk-pixbuf-0.22.0 )" + +src_unpack() { + unpack ${A} + cd ${S} +# epatch ${FILESDIR}/${PV}-font-align.patch + epatch ${FILESDIR}/${PV}-xmms-trackpos.patch +} + +src_compile() { + local myconf="" + [ `use xmms` ] \ + && myconf="--with-plugindir=/usr/lib/xmms/General" \ + || myconf="--without-plugindir" + + econf ${myconf} || die + emake || die +} + +src_install() { + make DESTDIR=${D} install || die + dodoc AUTHORS ChangeLog NEWS COPYING README +} -- cgit v1.2.3-65-gdbad