From f105ba0aacd99219f69b45db230e0d7d6d15aba9 Mon Sep 17 00:00:00 2001 From: Jose Alberto Suarez Lopez Date: Fri, 9 Aug 2002 18:34:28 +0000 Subject: fix bugs and patchs --- media-sound/xmms-xosd/ChangeLog | 7 +- media-sound/xmms-xosd/files/Makefile-gentoo.diff | 93 ++++++++++++++++++++++ .../xmms-xosd/files/digest-xmms-xosd-1.0.0-r1 | 1 + media-sound/xmms-xosd/files/xmms_osd.c-gentoo.diff | 57 +++++++++++++ media-sound/xmms-xosd/xmms-xosd-1.0.0-r1.ebuild | 38 +++++++++ 5 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 media-sound/xmms-xosd/files/Makefile-gentoo.diff create mode 100644 media-sound/xmms-xosd/files/digest-xmms-xosd-1.0.0-r1 create mode 100644 media-sound/xmms-xosd/files/xmms_osd.c-gentoo.diff create mode 100644 media-sound/xmms-xosd/xmms-xosd-1.0.0-r1.ebuild (limited to 'media-sound') diff --git a/media-sound/xmms-xosd/ChangeLog b/media-sound/xmms-xosd/ChangeLog index d40572bb33ca..c625a7596a1d 100644 --- a/media-sound/xmms-xosd/ChangeLog +++ b/media-sound/xmms-xosd/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for media-sound/xmms-xosd # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2 # Mantainer: José Alberto Suárez López -# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-xosd/ChangeLog,v 1.3 2002/08/08 22:10:51 aliz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms-xosd/ChangeLog,v 1.4 2002/08/09 18:34:28 bass Exp $ + +*xmms-xosd-1.0.0 + + 09 Aug 2002; J.Alberto Suárez L. xosd-1.0.0-r1.ebuild: + some fixes. *xmms-xosd-0.70 (08 Jun 2002) diff --git a/media-sound/xmms-xosd/files/Makefile-gentoo.diff b/media-sound/xmms-xosd/files/Makefile-gentoo.diff new file mode 100644 index 000000000000..f5af552b09b3 --- /dev/null +++ b/media-sound/xmms-xosd/files/Makefile-gentoo.diff @@ -0,0 +1,93 @@ +--- Makefile.orig 2002-04-18 14:26:49.000000000 -0600 ++++ Makefile 2002-04-18 15:12:31.000000000 -0600 +@@ -1,82 +1,27 @@ + # +-# Makefile for X-on-screen display ++# Makefile for X-on-screen display xmms plugin + # + + LIBRARY_VERSION=0 + VERSION=0.7.0 + +-PREFIX=/usr/local +-EXEC_PREFIX=$(PREFIX) +-BINDIR=$(EXEC_PREFIX)/bin +-LIBDIR=$(EXEC_PREFIX)/lib +-MANDIR=$(PREFIX)/man +-INCLUDEDIR=$(PREFIX)/include +-XMMS_PLUGINDIR=$(HOME)/.xmms +- +-CC=gcc +-INSTALL=/usr/bin/install -c +-INSTALL_DATA=$(INSTALL) -m 644 +- +-CFLAGS=-O2 -Wall -pipe -I. -DXOSD_VERSION=\"$(VERSION)\" -I/usr/X11R6/include +-LDFLAGS=-L. -L/usr/X11R6/lib -lX11 -lXext -lpthread -lXt ++XOSDCFLAGS=$(CFLAGS) -I/usr/include -DXOSD_VERSION=\"$(VERSION)\" ++LDFLAGS=-L/usr/lib + + XOSDLIBS=-lxosd + +-SOURCES=NEWS AUTHORS ChangeLog README COPYING Makefile testprog.c xosd.c \ +- xosd.h xmms_osd.c osd_cat.c xosd.3 osd_cat.1 +- +-ARFLAGS=cru +- +-all: testprog libxosd.a libxosd.so libxmms_osd.so osd_cat +- +-%.o: %.c +- $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ +- +-%.o.pic: %.c +- $(CC) -c $(CFLAGS) $(CPPFLAGS) $< -o $@ -fPIC ++SOURCES= xmms_osd.c + +-libxosd.so: xosd.o.pic +- $(CC) -shared -fPIC -o $@ $+ $(LDFLAGS) \ +- -Wl,-soname,libxosd.so.$(LIBRARY_VERSION) +- +-libxosd.a: xosd.o +- $(AR) $(ARFLAGS) libxosd.a $+ +- ranlib libxosd.a ++all: libxmms_osd.so + + xmms_osd.o: xmms_osd.c +- $(CC) -c -o $@ xmms_osd.c `xmms-config --cflags` -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 $(CFLAGS) ++ $(CC) -c -o $@ xmms_osd.c `xmms-config --cflags` $(XOSDCFLAGS) + + libxmms_osd.so: xmms_osd.o +- $(CC) -shared -o $@ $+ $(LDFLAGS) `gtk-config --libs` $(XOSDLIBS) ++ $(CC) -shared -o $@ $+ $(LDFLAGS) `xmms-config --libs` $(XOSDLIBS) + + testprog: testprog.o libxosd.so + $(CC) -o $@ testprog.o $(LDFLAGS) $(XOSDLIBS) + +-osd_cat: libxosd.so osd_cat.o +- $(CC) -o $@ osd_cat.o $(LDFLAGS) $(XOSDLIBS) +- +-tar: xosd-$(VERSION).tar.gz +- +-xosd-$(VERSION).tar.gz: +- ln -s . xosd-$(VERSION) +- tar cfz $@ $(patsubst %, xosd-$(VERSION)/%, $(SOURCES)) +- rm xosd-$(VERSION) +- +-install: all +- $(INSTALL) libxosd.so $(LIBDIR)/libxosd.so.$(LIBRARY_VERSION) +- rm -f $(PREFIX)/lib/libxosd.so +- ln -s $(PREFIX)/lib/libxosd.so.$(LIBRARY_VERSION) $(PREFIX)/lib/libxosd.so +- mkdir -p $(XMMS_PLUGINDIR)/Plugins/General +- rm -f $(XMMS_PLUGINDIR)/Plugins/General/libxmms_osd.so +- cp -a libxmms_osd.so $(XMMS_PLUGINDIR)/Plugins/General +- $(INSTALL) osd_cat $(BINDIR) +- mkdir -p $(MANDIR)/man1 $(MANDIR)/man3 +- $(INSTALL_DATA) osd_cat.1 $(MANDIR)/man1/ +- $(INSTALL_DATA) xosd.3 $(MANDIR)/man3/ +- +-clean: +- rm -f *~ *.o *.o.pic xosd testprog libxosd.so libxmms_osd.so libxosd.a osd_cat +- rm -f xosd-$(VERSION).tar.gz +- +-.PHONY: all tar clean install ++.PHONY: all + # vim: noexpandtab diff --git a/media-sound/xmms-xosd/files/digest-xmms-xosd-1.0.0-r1 b/media-sound/xmms-xosd/files/digest-xmms-xosd-1.0.0-r1 new file mode 100644 index 000000000000..feb3e42df95f --- /dev/null +++ b/media-sound/xmms-xosd/files/digest-xmms-xosd-1.0.0-r1 @@ -0,0 +1 @@ +MD5 02cc1a532f2989752d5fbaa40ddcac5d xosd-1.0.0.tar.gz 164913 diff --git a/media-sound/xmms-xosd/files/xmms_osd.c-gentoo.diff b/media-sound/xmms-xosd/files/xmms_osd.c-gentoo.diff new file mode 100644 index 000000000000..a6119d855dae --- /dev/null +++ b/media-sound/xmms-xosd/files/xmms_osd.c-gentoo.diff @@ -0,0 +1,57 @@ +--- xmms_osd.c.orig 2002-04-20 22:37:40.000000000 -0600 ++++ xmms_osd.c 2002-04-20 22:56:52.000000000 -0600 +@@ -16,6 +16,11 @@ + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ ++/* Updates (c) 2002 Stacey Keast (slik@telusplanet.net) ++ * make global variables static - prevents SIGSEGV ++ * NULL colour and font variables - prevents crashes when restarting ++ * pluggin, if it was already running (static variables aren't cleared) ++ */ + + #include + +@@ -51,18 +56,18 @@ + cleanup, + }; + +-xosd *osd; +-guint timeout_tag; +-int previous_song, previous_length, previous_volume, previous_balance; +-gboolean previous_playing, previous_paused, previous_repeat, previous_shuffle; +-gchar *font; +-gchar *colour; +-gint timeout; +-gint offset; +-gint shadow_offset; +-gint pos; +-GtkObject *timeout_obj, *offset_obj, *shadow_obj; +-GtkWidget *configure_win, *font_entry, *colour_entry, ++static xosd *osd; ++static guint timeout_tag; ++static int previous_song, previous_length, previous_volume, previous_balance; ++static gboolean previous_playing, previous_paused, previous_repeat, previous_shuffle; ++static gchar *font; ++static gchar *colour; ++static gint timeout; ++static gint offset; ++static gint shadow_offset; ++static gint pos; ++static GtkObject *timeout_obj, *offset_obj, *shadow_obj; ++static GtkWidget *configure_win, *font_entry, *colour_entry, + *timeout_spin, *offset_spin, *pos_top, *pos_bottom, *shadow_spin; + + GeneralPlugin *get_gplugin_info(void) +@@ -98,9 +103,11 @@ + + if (font) + g_free (font); ++ font=NULL; + + if (colour) + g_free (colour); ++ colour=NULL; + + xosd_uninit (osd); + } diff --git a/media-sound/xmms-xosd/xmms-xosd-1.0.0-r1.ebuild b/media-sound/xmms-xosd/xmms-xosd-1.0.0-r1.ebuild new file mode 100644 index 000000000000..67ea58b6b669 --- /dev/null +++ b/media-sound/xmms-xosd/xmms-xosd-1.0.0-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License, v2 or later +NAME=xosd-1.0.0 +S=${WORKDIR}/${NAME} +DESCRIPTION="xmms plugin for overlaying song titles in X-Windows - X-On-Screen-Display" +SRC_URI="http://www.ignavus.net/${NAME}.tar.gz" +HOMEPAGE="http://www.ignavus.net/" +DEPEND="virtual/x11 + virtual/glibc + >=media-sound/xmms-1.2.6-r1 + x11-libs/xosd" +RDEPEND="${DEPEND}" +LICENSE="GPL" +SLOT="0" +KEYWORDS="x86" + +src_unpack() { + unpack ${A} + cd ${WORKDIR}/${NAME} + ./autogen.sh + patch Makefile < ${FILESDIR}/Makefile-gentoo.diff + patch src/xmms_osc.c < ${FILESDIR}/xmms_osd.c-gentoo.diff +} +src_compile() { + cd ${S} + ./configure --prefix=/usr --host=${CHOST} || die + make || die +} +src_install () { + cd ${WORKDIR}/${NAME} + insinto /usr/lib/xmms/General + doins src/.libs/libxmms_osd.so src/.libs/libxmms_osd.so.0 src/.libs/libxmms_osd.so.0.0.0 + fperms 0755 /usr/lib/xmms/General/libxmms_osd.so + fperms 0755 /usr/lib/xmms/General/libxmms_osd.so.0 + fperms 0755 /usr/lib/xmms/General/libxmms_osd.so.0.0.0 + into /usr + dodoc AUTHORS ChangeLog COPYING README +} -- cgit v1.2.3-65-gdbad