Swap patch-aa and patch-ab, and use a cleaner version of patch-ab provided by
ptiJo in 17217.
This commit is contained in:
wiz
parent
3f28c4cac5
commit
a21d154ce3
3 changed files with 69 additions and 69 deletions
|
|
@ -1,6 +1,6 @@
|
|||
$NetBSD: distinfo,v 1.1.1.1 2002/06/11 22:39:42 wiz Exp $
|
||||
$NetBSD: distinfo,v 1.2 2002/06/11 22:54:10 wiz Exp $
|
||||
|
||||
SHA1 (volume-0.8.tar.gz) = 7348c8fc41bdc6c236442748ef3c803851a151f8
|
||||
Size (volume-0.8.tar.gz) = 8395 bytes
|
||||
SHA1 (patch-aa) = 75b6ada0775c4f574fffb00cebc3dcc8d3af1cf2
|
||||
SHA1 (patch-ab) = b05e4a5b539b1710298820518090aeb8689fed11
|
||||
SHA1 (patch-aa) = adf96e0bd1e2b65e85394c4c50ce1db587b73195
|
||||
SHA1 (patch-ab) = 9281f2e550134887bfbc99464ab79987f4a26183
|
||||
|
|
|
|||
|
|
@ -1,13 +1,57 @@
|
|||
$NetBSD: patch-aa,v 1.1.1.1 2002/06/11 22:39:42 wiz Exp $
|
||||
$NetBSD: patch-aa,v 1.2 2002/06/11 22:54:11 wiz Exp $
|
||||
|
||||
--- volume.c.orig Sun Apr 14 17:22:08 2002
|
||||
+++ volume.c Sun Apr 14 17:22:23 2002
|
||||
@@ -20,7 +20,7 @@
|
||||
#ifdef __FreeBSD__
|
||||
#include <machine/soundcard.h>
|
||||
#else
|
||||
-#include <sys/soundcard.h>
|
||||
+#include <soundcard.h>
|
||||
#endif
|
||||
--- Makefile.orig Fri Jun 23 19:47:00 2000
|
||||
+++ Makefile
|
||||
@@ -1,27 +1,19 @@
|
||||
# Makefile for GKrellM volume plugin
|
||||
|
||||
#include "volume.h"
|
||||
-# 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_INCLUDE = `$(GTK_CONFIG) --cflags`
|
||||
-GTK_LIB = `$(GTK_CONFIG) --libs`
|
||||
+GTK_INCLUDE = `gtk-config --cflags`
|
||||
+GTK_LIB = `gtk-config --libs`
|
||||
|
||||
IMLIB_INCLUDE = `imlib-config --cflags-gdk`
|
||||
IMLIB_LIB = `imlib-config --libs-gdk`
|
||||
|
||||
-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
|
||||
|
||||
-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
|
||||
|
|
|
|||
|
|
@ -1,57 +1,13 @@
|
|||
$NetBSD: patch-ab,v 1.1.1.1 2002/06/11 22:39:42 wiz Exp $
|
||||
$NetBSD: patch-ab,v 1.2 2002/06/11 22:54:11 wiz Exp $
|
||||
|
||||
--- Makefile.orig Sun Apr 14 21:36:15 2002
|
||||
+++ Makefile Sun Apr 14 21:37:33 2002
|
||||
@@ -1,27 +1,19 @@
|
||||
# Makefile for GKrellM volume plugin
|
||||
--- volume.c.orig Wed Nov 22 21:35:42 2000
|
||||
+++ volume.c
|
||||
@@ -19,6 +19,8 @@
|
||||
|
||||
-# 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_INCLUDE = `$(GTK_CONFIG) --cflags`
|
||||
-GTK_LIB = `$(GTK_CONFIG) --libs`
|
||||
+GTK_INCLUDE = `gtk-config --cflags`
|
||||
+GTK_LIB = `gtk-config --libs`
|
||||
|
||||
IMLIB_INCLUDE = `imlib-config --cflags-gdk`
|
||||
IMLIB_LIB = `imlib-config --libs-gdk`
|
||||
|
||||
-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
|
||||
|
||||
-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
|
||||
#ifdef __FreeBSD__
|
||||
#include <machine/soundcard.h>
|
||||
+#elif __NetBSD__
|
||||
+#include <soundcard.h>
|
||||
#else
|
||||
#include <sys/soundcard.h>
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue