diff options
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/gqmpeg/Makefile | 4 | ||||
| -rw-r--r-- | audio/gqmpeg/files/md5 | 4 | ||||
| -rw-r--r-- | audio/gqmpeg/patches/patch-aa | 23 | ||||
| -rw-r--r-- | audio/gqmpeg/patches/patch-ab | 28 |
4 files changed, 23 insertions, 36 deletions
diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile index d73f8a5b665..fcb427803a5 100644 --- a/audio/gqmpeg/Makefile +++ b/audio/gqmpeg/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 1999/05/15 03:49:13 hubertf Exp $ +# $NetBSD: Makefile,v 1.3 1999/05/27 00:49:44 hubertf Exp $ # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp # -DISTNAME= gqmpeg-0.5.2 +DISTNAME= gqmpeg-0.6.0 CATEGORIES= audio MASTER_SITES= http://www.geocities.com/SiliconValley/Haven/5235/ EXTRACT_SUFX= .src.tgz diff --git a/audio/gqmpeg/files/md5 b/audio/gqmpeg/files/md5 index 9a2bc3c6b36..da3f8721677 100644 --- a/audio/gqmpeg/files/md5 +++ b/audio/gqmpeg/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.2 1999/05/15 03:49:14 hubertf Exp $ +$NetBSD: md5,v 1.3 1999/05/27 00:49:44 hubertf Exp $ -MD5 (gqmpeg-0.5.2.src.tgz) = 2e1be28d9aaac1af8da6236f656a12c3 +MD5 (gqmpeg-0.6.0.src.tgz) = 0e9f8948aed67b5616924e66f1fac434 diff --git a/audio/gqmpeg/patches/patch-aa b/audio/gqmpeg/patches/patch-aa index 34116c38a5a..463ab352f2e 100644 --- a/audio/gqmpeg/patches/patch-aa +++ b/audio/gqmpeg/patches/patch-aa @@ -1,26 +1,29 @@ -$NetBSD: patch-aa,v 1.2 1999/05/15 03:49:14 hubertf Exp $ - ---- Makefile.BAK Sat May 15 05:28:13 1999 -+++ Makefile Sat May 15 05:28:41 1999 -@@ -1,11 +1,10 @@ +--- Makefile.orig Mon May 17 23:11:01 1999 ++++ Makefile Tue May 18 13:38:58 1999 +@@ -1,12 +1,10 @@ -PREFIX=/usr/local - +- GTK_INCLUDE = `gtk-config --cflags` GTK_LIB = `gtk-config --libs` IMLIB_INCLUDE = `imlib-config --cflags-gdk` IMLIB_LIB = `imlib-config --libs-gdk` + -CFLAGS = $(GTK_INCLUDE) $(IMLIB_INCLUDE) +CFLAGS += $(GTK_INCLUDE) $(IMLIB_INCLUDE) LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) - CC = gcc -Wall $(CFLAGS) -@@ -81,7 +80,7 @@ - default_skin/volume_sl.xpm + CC = gcc -g -Wall +@@ -107,10 +105,10 @@ + # targets: gqmpeg: $(OBJS) - $(CC) $(OBJS) -o gqmpeg $(LDFLAGS) + $(CC) $(OBJS) -o gqmpeg $(LDFLAGS) -lossaudio static: $(OBJS) - $(CC) $(OBJS) -o gqmpeg.static -static $(LDFLAGS) +- $(CC) $(OBJS) -o gqmpeg.static -static $(LDFLAGS) ++ $(CC) $(OBJS) -o gqmpeg.static -static $(LDFLAGS) -lossaudio + + install: gqmpeg + install -c gqmpeg $(PREFIX)/bin/gqmpeg diff --git a/audio/gqmpeg/patches/patch-ab b/audio/gqmpeg/patches/patch-ab index f8bb7876b6e..3e0cfecbc61 100644 --- a/audio/gqmpeg/patches/patch-ab +++ b/audio/gqmpeg/patches/patch-ab @@ -1,8 +1,9 @@ -$NetBSD: patch-ab,v 1.3 1999/05/15 18:50:58 he Exp $ +$NetBSD: patch-ab,v 1.4 1999/05/27 00:49:45 hubertf Exp $ ---- mixer.c.orig Sat Mar 27 13:38:09 1999 -+++ mixer.c Sat May 15 20:19:54 1999 -@@ -33,4 +33,9 @@ +--- mixer.c.orig Tue May 25 00:15:57 1999 ++++ mixer.c Thu May 27 02:16:01 1999 +@@ -42,6 +42,11 @@ + #include <audio.h> #endif +#ifdef __NetBSD__ @@ -12,21 +13,4 @@ $NetBSD: patch-ab,v 1.3 1999/05/15 18:50:58 he Exp $ + #define LEFT 1 #define RIGHT 256 -@@ -56,5 +61,5 @@ - static DeviceData *current_device = NULL; - --#if defined (linux) || defined (__FreeBSD__) -+#if defined (linux) || defined (__FreeBSD__) || defined (__NetBSD__) - void mixer_init(gint init_device_id) - { -@@ -91,5 +96,9 @@ - for (i=0; i<SOUND_MIXER_NRDEVICES; i++) - { -- if ((dev_mask & (1<<i)) && !(rec_mask & (1<<i))) /* skip unsupported & record devs */ -+ if ((dev_mask & (1<<i)) /* skip unsupported */ -+#ifndef __NetBSD__ -+ && !(rec_mask & (1<<i)) /* & record devs */ -+#endif -+ ) - { - DeviceData *device = g_new0(DeviceData, 1); + #define LEFT_MASK 0x00ff |