diff options
author | cube <cube@pkgsrc.org> | 2004-02-24 22:39:26 +0000 |
---|---|---|
committer | cube <cube@pkgsrc.org> | 2004-02-24 22:39:26 +0000 |
commit | cb994ffd3d7da484eefe73fa2b456a38bb7c06c6 (patch) | |
tree | 956ffad3cd88acd5c2bc4736a1c50811df149a1f /audio/gkrellm-volume/patches | |
parent | cc84e1adc7b2fede4e8f200989508a6f3a4599d0 (diff) | |
download | pkgsrc-cb994ffd3d7da484eefe73fa2b456a38bb7c06c6.tar.gz |
Update to version 2.1.9, from pkgsrc-wip.
This is the GKrellM-2 version of the plugin volume.
Diffstat (limited to 'audio/gkrellm-volume/patches')
-rw-r--r-- | audio/gkrellm-volume/patches/patch-aa | 65 | ||||
-rw-r--r-- | audio/gkrellm-volume/patches/patch-ab | 13 |
2 files changed, 15 insertions, 63 deletions
diff --git a/audio/gkrellm-volume/patches/patch-aa b/audio/gkrellm-volume/patches/patch-aa index 755fa550dc7..5794d0dabb2 100644 --- a/audio/gkrellm-volume/patches/patch-aa +++ b/audio/gkrellm-volume/patches/patch-aa @@ -1,57 +1,22 @@ -$NetBSD: patch-aa,v 1.2 2002/06/11 22:54:11 wiz Exp $ +$NetBSD: patch-aa,v 1.3 2004/02/24 22:39:26 cube Exp $ ---- Makefile.orig Fri Jun 23 19:47:00 2000 +--- Makefile.orig 2003-01-18 20:59:09.000000000 +0100 +++ Makefile -@@ -1,27 +1,19 @@ - # Makefile for GKrellM volume plugin +@@ -2,14 +2,14 @@ --# Linux --GTK_CONFIG = gtk-config --SYSLIB = -lpthread -- --# FreeBSD --#GTK_CONFIG = gtk12-config --#SYSLIB = -- --PLUGIN_DIR = /usr/share/gkrellm/plugins -+PLUGIN_DIR = ${LOCALBASE}/lib/gkrellm/plugins - GKRELLM_INCLUDE = -I/usr/local/include + GTK_CONFIG = pkg-config gtk+-2.0 --GTK_INCLUDE = `$(GTK_CONFIG) --cflags` --GTK_LIB = `$(GTK_CONFIG) --libs` -+GTK_INCLUDE = `gtk-config --cflags` -+GTK_LIB = `gtk-config --libs` +-PLUGIN_DIR ?= /usr/local/lib/gkrellm2/plugins +-GKRELLM_INCLUDE = -I/usr/local/include ++PLUGIN_DIR ?= $(PREFIX)/lib/gkrellm2/plugins ++GKRELLM_INCLUDE = -I$(BUILDLINK_DIR)/include - IMLIB_INCLUDE = `imlib-config --cflags-gdk` - IMLIB_LIB = `imlib-config --libs-gdk` + GTK_CFLAGS = `$(GTK_CONFIG) --cflags` + GTK_LIB = `$(GTK_CONFIG) --libs` --FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) --LIBS = $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) --LFLAGS = -shared -+CFLAGS+= -O2 -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(GKRELLM_INCLUDE) -+LIBS+= $(GTK_LIB) $(IMLIB_LIB) $(SYSLIB) -+LFLAGS+= -shared -lpthread -lossaudio + FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) +-LIBS = $(GTK_LIB) ++LIBS = $(GTK_LIB) $(LIBOSSAUDIO) + LFLAGS = -shared --CC = gcc $(CFLAGS) $(FLAGS) -+CC = gcc $(CFLAGS) - - INSTALL = install -c - INSTALL_PROGRAM = $(INSTALL) -s -@@ -30,9 +22,6 @@ - - all: volume.so - --freebsd: -- make GTK_CONFIG=gtk12-config SYSLIB=all -- - volume.so: $(OBJS) - $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) - -@@ -40,6 +29,7 @@ - rm -f *.o core *.so* *.bak *~ - - install: -+ mkdir -p $(PLUGIN_DIR) - $(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR) - - volume.c.o: volume.c + PACKAGE ?= gkrellm-volume diff --git a/audio/gkrellm-volume/patches/patch-ab b/audio/gkrellm-volume/patches/patch-ab deleted file mode 100644 index 6303f0f2edc..00000000000 --- a/audio/gkrellm-volume/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/06/11 22:54:11 wiz Exp $ - ---- volume.c.orig Wed Nov 22 21:35:42 2000 -+++ volume.c -@@ -19,6 +19,8 @@ - - #ifdef __FreeBSD__ - #include <machine/soundcard.h> -+#elif __NetBSD__ -+#include <soundcard.h> - #else - #include <sys/soundcard.h> - #endif |