diff options
Diffstat (limited to 'misc/xosd/files/patch-aa')
| -rw-r--r-- | misc/xosd/files/patch-aa | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/misc/xosd/files/patch-aa b/misc/xosd/files/patch-aa index 36ad971be26e..fde9830f79d9 100644 --- a/misc/xosd/files/patch-aa +++ b/misc/xosd/files/patch-aa @@ -1,11 +1,17 @@ -diff -ruN Makefile.orig Makefile ---- Makefile.orig Fri Mar 23 09:11:14 2001 -+++ Makefile Wed May 2 05:30:30 2001 -@@ -5,20 +5,18 @@ +--- Makefile Thu Mar 22 19:11:14 2001 ++++ Makefile.new Sun May 20 22:24:43 2001 +@@ -5,20 +5,25 @@ LIBRARY_VERSION=0 VERSION=0.7.0 -PREFIX=/usr/local ++LOCALBASE?=/usr/local ++X11BASE?=/usr/X11R6 ++GTK_CONFIG?=$(X11BASE)/bin/gtk-config ++GLIB_CONFIG?=$(LOCALBASE)/bin/glib-config ++XMMS_CONFIG?=$(X11BASE)/bin/xmms-config ++PTHREAD_CFLAGS?=-D_THREAD_SAFE ++PTHREAD_LIBS?=-lpthread EXEC_PREFIX=$(PREFIX) BINDIR=$(EXEC_PREFIX)/bin LIBDIR=$(EXEC_PREFIX)/lib @@ -13,18 +19,36 @@ diff -ruN Makefile.orig Makefile INCLUDEDIR=$(PREFIX)/include -XMMS_PLUGINDIR=$(HOME)/.xmms - CC=gcc +-CC=gcc ++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 -+CFLAGS+=-I. -DXOSD_VERSION=\"$(VERSION)\" -I/usr/X11R6/include -I/usr/local/include -+LDFLAGS=-lc_r -L. -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -pthread -lXt -lgnugetopt ++CFLAGS+=-I. -DXOSD_VERSION=\"$(VERSION)\" -I$(X11BASE)/include -I$(LOCALBASE)/include `$(GTK_CONFIG) --cflags` `$(GLIB_CONFIG) --cflags` $(PTHREAD_CFLAGS) ++LDFLAGS=$(PTHREAD_LIBS) -L. -L/usr/X11R6/lib -L/usr/local/lib -lX11 -lXext -lXt -lgnugetopt XOSDLIBS=-lxosd -@@ -66,9 +64,11 @@ +@@ -44,10 +49,14 @@ + ranlib libxosd.a + + 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) ++ if [ "$(XMMS_PLUGINDIR)" ]; then \ ++ $(CC) $(CFLAGS) `$(XMMS_CONFIG) --cflags` -c -o $@ xmms_osd.c; \ ++ fi + + libxmms_osd.so: xmms_osd.o +- $(CC) -shared -o $@ $+ $(LDFLAGS) `gtk-config --libs` $(XOSDLIBS) ++ if [ "$(XMMS_PLUGINDIR)" ]; then \ ++ $(CC) `$(GTK_CONFIG) --libs` -shared -o $@ $+ $(LDFLAGS) $(XOSDLIBS); \ ++ fi + + testprog: testprog.o libxosd.so + $(CC) -o $@ testprog.o $(LDFLAGS) $(XOSDLIBS) +@@ -66,10 +75,13 @@ $(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 @@ -37,26 +61,7 @@ diff -ruN Makefile.orig Makefile + cp -pf libxmms_osd.so $(XMMS_PLUGINDIR)/General; \ + fi $(INSTALL) osd_cat $(BINDIR) ++ $(INSTALL_DATA) xosd.h $(INCLUDEDIR)/ mkdir -p $(MANDIR)/man1 $(MANDIR)/man3 $(INSTALL_DATA) osd_cat.1 $(MANDIR)/man1/ -diff -ruN xosd.c.orig xosd.c ---- xosd.c.orig Fri Mar 23 08:55:45 2001 -+++ xosd.c Wed May 2 04:34:44 2001 -@@ -270,7 +270,7 @@ - if (!XCheckWindowEvent (osd->display, osd->window, ExposureMask, &report)) - { - MUTEX_RELEASE (); -- usleep (500); -+ usleep (100000); - continue; - } - MUTEX_RELEASE (); -@@ -304,7 +304,7 @@ - - while (!osd->done) - { -- usleep (1000); -+ usleep (200000); - MUTEX_GET (); - if (osd->timeout != -1 && - osd->mapped && + $(INSTALL_DATA) xosd.3 $(MANDIR)/man3/ |