Update to V0.6.3. Changes:

This release adds support for the newly released mpg123 0.59r.
New features include mpg123's --aggresive support (for higher
priority, see README), freeamp support, and NetBSD native sound
mixer support. This release also fixes ipc on NetBSD, crashes in
g_hook_next_valid(), and more, leading to a more robust program.

6 files changed, 10 insertions, 262 deletions

diff --git a/audio/gqmpeg/Makefile b/audio/gqmpeg/Makefile
index 7cb782fdec6..d68087abac1 100644
--- a/audio/gqmpeg/Makefile
+++ b/audio/gqmpeg/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 1999/07/10 10:42:04 tron Exp $
+# $NetBSD: Makefile,v 1.7 1999/07/12 00:53:52 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.6 1998/12/28 01:02:05 vanilla Exp
 #
 
-DISTNAME=	gqmpeg-0.6.2
+DISTNAME=	gqmpeg-0.6.3
 CATEGORIES=	audio
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Haven/5235/
 EXTRACT_SUFX=	.src.tgz
 
 MAINTAINER=	rxg@ms25.url.com.tw
-HOMEPAGE=	http://www.geocities.com/SiliconValley/Haven/5235/
+HOMEPAGE=	http://www.geocities.com/SiliconValley/Haven/5235/mpeg-over.html
 
 DEPENDS+=	gtk+-1.2.2:../../x11/gtk
 DEPENDS+=	imlib-1.9.4:../../graphics/imlib
diff --git a/audio/gqmpeg/files/md5 b/audio/gqmpeg/files/md5
index 15810e56253..37bef309505 100644
--- a/audio/gqmpeg/files/md5
+++ b/audio/gqmpeg/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/06/06 23:57:53 hubertf Exp $
+$NetBSD: md5,v 1.6 1999/07/12 00:53:53 hubertf Exp $
 
-MD5 (gqmpeg-0.6.2.src.tgz) = eca73e9511f22c338e3133c9abc68c2c
+MD5 (gqmpeg-0.6.3.src.tgz) = 01ec3ac587847b73e90326ea014cee22
diff --git a/audio/gqmpeg/files/patch-sum b/audio/gqmpeg/files/patch-sum
index 1c55f8dbc62..05961344819 100644
--- a/audio/gqmpeg/files/patch-sum
+++ b/audio/gqmpeg/files/patch-sum
@@ -1,5 +1,3 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:12 agc Exp $
+$NetBSD: patch-sum,v 1.2 1999/07/12 00:53:53 hubertf Exp $
 
-MD5 (patch-aa) = 9cd7ba0449a93452181ac94c5b96f42c
-MD5 (patch-ab) = 25b0f74de3ef545090f1e5f704b835f7
-MD5 (patch-ac) = 16c943bc63c0b25f11660012784815c7
+MD5 (patch-aa) = 0f240b66c71480f785499cfefa41d9c5
diff --git a/audio/gqmpeg/patches/patch-aa b/audio/gqmpeg/patches/patch-aa
index d5116988e3d..a27b7f8bf7b 100644
--- a/audio/gqmpeg/patches/patch-aa
+++ b/audio/gqmpeg/patches/patch-aa
@@ -1,25 +1,9 @@
-$NetBSD: patch-aa,v 1.5 1999/06/29 00:58:30 hubertf Exp $
-
---- Makefile.orig	Tue May 25 06:22:37 1999
-+++ Makefile	Sun Jun 13 09:21:33 1999
-@@ -1,19 +1,14 @@
+--- Makefile.orig	Mon Jul 12 02:31:07 1999
++++ Makefile	Mon Jul 12 02:31:40 1999
+@@ -1,6 +1,4 @@
  
 -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)
- 
- #The following commented out lines are for replacing the stock defines on
- #the named platforms.
--
--#for NetBSD:
--#LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -lossaudio
- 
- #for IRIX
- #LDFLAGS = $(GTK_LIB) $(IMLIB_LIB) -laudio
diff --git a/audio/gqmpeg/patches/patch-ab b/audio/gqmpeg/patches/patch-ab
deleted file mode 100644
index 9e40a5e6803..00000000000
--- a/audio/gqmpeg/patches/patch-ab
+++ /dev/null
@@ -1,223 +0,0 @@
-$NetBSD: patch-ab,v 1.9 1999/06/29 00:58:30 hubertf Exp $
-
---- mixer.c.orig	Wed Jun  2 05:50:45 1999
-+++ mixer.c	Sun Jun 20 00:44:06 1999
-@@ -24,7 +24,7 @@
- #include <linux/soundcard.h>
- #endif
- 
--#if defined(sun) && defined(__svr4__)
-+#if defined(sun) && defined(__svr4__) || defined(__NetBSD__)
- #include <sys/audioio.h>
- #endif
- 
-@@ -32,11 +32,6 @@
- #include <machine/soundcard.h>
- #endif
- 
--#ifdef __NetBSD__
--#include <soundcard.h>
--#undef _POSIX_SOURCE
--#endif
--
- #ifdef __sgi
- #include <math.h>
- #include <audio.h>
-@@ -65,7 +60,7 @@
- static GList *device_list = NULL;
- static DeviceData *current_device = NULL;
- 
--#if defined (linux) || defined (__FreeBSD__) || defined (__NetBSD__)
-+#if defined (linux) || defined (__FreeBSD__)
- void mixer_init(gint init_device_id)
- {
- 	char *device_names[] = SOUND_DEVICE_NAMES;
-@@ -100,11 +95,7 @@
- 	/* get device listing */
- 	for (i=0; i<SOUND_MIXER_NRDEVICES; i++)
- 		{
--		if ((dev_mask & (1<<i)) /* skip unsupported */
--#ifndef __NetBSD__
--		   && !(rec_mask & (1<<i)) /* & record devs */
--#endif
--		   )
-+		if ((dev_mask & (1<<i)) && !(rec_mask & (1<<i))) /* skip unsupported & record devs */
-  			{
- 			DeviceData *device = g_new0(DeviceData, 1);
- 			device->device_id = i;
-@@ -186,6 +177,166 @@
- 	return vol;
- }
- 
-+#elif defined(__NetBSD__)
-+mixer_devinfo_t *infos;
-+mixer_ctrl_t *values;
-+void mixer_init(gint init_device_id)
-+{
-+  int fd, i, ndev;
-+  char *mixer_device;
-+  audio_device_t adev;
-+  mixer_devinfo_t dinfo;
-+
-+  mixer_device = getenv("MIXERDEVICE");
-+  if (mixer_device == NULL)
-+    mixer_device = "/dev/mixer0";
-+
-+  if ((fd = open(mixer_device, O_RDWR)) == -1) {
-+    perror(mixer_device);
-+    mixer_enabled = FALSE;
-+  }
-+
-+  if (ioctl(fd, AUDIO_GETDEV, &adev) == -1) {
-+    perror(mixer_device);
-+    close(fd);
-+    mixer_enabled = FALSE;
-+  }
-+
-+  for (ndev = 0; ; ndev++) {
-+    dinfo.index = ndev;
-+    if (ioctl(fd, AUDIO_MIXER_DEVINFO, &dinfo) == -1)
-+      break;
-+  }
-+  infos = calloc(ndev, sizeof *infos);
-+  values = calloc(ndev, sizeof *values);
-+
-+  for (i = 0; i < ndev; i++) {
-+    infos[i].index = i;
-+    ioctl(fd, AUDIO_MIXER_DEVINFO, &infos[i]);
-+  }
-+
-+  for (i = 0; i < ndev; i++) {
-+    values[i].dev = i;
-+    values[i].type = infos[i].type;
-+    if (infos[i].type == AUDIO_MIXER_VALUE) {
-+      DeviceData *device = g_new0(DeviceData, 1);
-+      device->device_id = i;
-+      device->device_name = infos[i].label.name;
-+      device->stereo = 1;
-+      device_list = g_list_append(device_list, device);
-+
-+      values[i].un.value.num_channels = 2;
-+      if (ioctl(fd, AUDIO_MIXER_READ, &values[i]) == -1) {
-+        values[i].un.value.num_channels = 1;
-+        if (ioctl(fd, AUDIO_MIXER_READ, &values[i]) == -1)
-+          perror("AUDIO_MIXER_READ");
-+      }
-+
-+      if (debug_mode) printf("Mixer device added to list: %d, %s, %d\n",
-+                             device->device_id, device->device_name,
-+                             device->stereo);
-+      if (init_device_id == i) current_device = device;
-+    }
-+  }
-+
-+  close(fd);
-+
-+  if (device_list) {
-+    mixer_enabled = TRUE;
-+    if (!current_device)
-+      current_device = device_list->data;
-+    current_vol = mixer_get_vol(current_device);
-+  } else {
-+    mixer_enabled = FALSE;
-+  }
-+}
-+
-+static void mixer_set_vol(DeviceData *device, gint vol)
-+{
-+  int fd;
-+  char *mixer_device;
-+  mixer_ctrl_t *m;
-+
-+  mixer_device = getenv("MIXERDEVICE");
-+  if (mixer_device == NULL)
-+    mixer_device = "/dev/mixer0";
-+
-+  if ((fd = open(mixer_device, O_RDWR)) == -1) {
-+    perror(mixer_device);
-+    close(fd);
-+  }
-+
-+  m = &values[device->device_id];
-+  if (ioctl(fd, AUDIO_MIXER_WRITE, m) == -1) {
-+    perror("AUDIO_MIXER_WRITE");
-+    close(fd);
-+  }
-+
-+  close(fd);
-+
-+  if (m->un.value.num_channels == 2) {
-+    /* input and output seem to only have one channel?? */
-+    if (device->device_id == 13 || device->device_id == 14) {
-+      m->un.value.level[0] = vol * AUDIO_MAX_GAIN / 100;
-+    } else if (current_bal < 50) {
-+      m->un.value.level[0] = vol * AUDIO_MAX_GAIN / 100;
-+      m->un.value.level[1] = m->un.value.level[0] * current_bal / 50;
-+    } else if (current_bal > 50) {
-+      m->un.value.level[1] = vol * AUDIO_MAX_GAIN / 100;
-+      m->un.value.level[0] = m->un.value.level[1] * (100 - current_bal) / 50;
-+    } else {
-+      m->un.value.level[0] = m->un.value.level[1] = vol * AUDIO_MAX_GAIN / 100;
-+    }
-+  } else {
-+    m->un.value.level[0] = vol * AUDIO_MAX_GAIN / 100;
-+  }
-+  /* from AUDIO_MIN_GAIN (0) to AUDIO_MAX_GAIN (255) */
-+
-+  if (debug_mode) printf("volume set to %d (%d)\n", vol, current_bal);
-+}
-+
-+static gint mixer_get_vol(DeviceData *device)
-+{
-+  int fd;
-+  char *mixer_device;
-+  mixer_ctrl_t *m;
-+
-+  mixer_device = getenv("MIXERDEVICE");
-+  if (mixer_device == NULL)
-+    mixer_device = "/dev/mixer0";
-+
-+  if ((fd = open(mixer_device, O_RDWR)) == -1) {
-+    perror(mixer_device);
-+    close(fd);
-+    return -1;
-+  }
-+
-+  m = &values[device->device_id];
-+  if (ioctl(fd, AUDIO_MIXER_READ, m) == -1) {
-+    perror("AUDIO_MIXER_READ");
-+    close(fd);
-+    return -1;
-+  }
-+
-+  close(fd);
-+
-+  if (m->un.value.num_channels == 2) {
-+    if (m->un.value.level[0] > m->un.value.level[1]) {
-+      current_bal = m->un.value.level[1] * 50 / m->un.value.level[0];
-+      return m->un.value.level[0] * 100 / AUDIO_MAX_GAIN;
-+    } else if (m->un.value.level[0] < m->un.value.level[1]) {
-+      current_bal = 100 - (m->un.value.level[0] * 50 / m->un.value.level[1]);
-+      return m->un.value.level[1] * 100 / AUDIO_MAX_GAIN;
-+    } else {
-+      current_bal = 50;
-+      return m->un.value.level[0] * 100 / AUDIO_MAX_GAIN;
-+    }
-+  } else {
-+    current_bal = 50;
-+    return m->un.value.level[0] * 100 / AUDIO_MAX_GAIN;
-+  }
-+}
-+
- #elif defined(sun) && defined(__svr4__)
- static int device_ids[] = { AUDIO_SPEAKER,
- 			    AUDIO_LINE_OUT,
-@@ -444,7 +595,7 @@
- 
- #endif
- 
--#if defined(sun) && defined(__svr4__)
-+#if defined(sun) && defined(__svr4__) || defined(__NetBSD__)
- /* from 0 through 100% */
- void set_volume(gint vol)
- {
diff --git a/audio/gqmpeg/patches/patch-ac b/audio/gqmpeg/patches/patch-ac
deleted file mode 100644
index a4fb5d25584..00000000000
--- a/audio/gqmpeg/patches/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- ipc.c.orig	Mon Jun 14 00:47:56 1999
-+++ ipc.c	Mon Jun 14 00:49:37 1999
-@@ -219,6 +219,8 @@
- 			printf("unknown ipc command: `%s'\n", i_buf);
- 			}
- 		}
-+	if (feof(ipc_file_id) != 0)
-+		rewind (ipc_file_id);
- 	return TRUE;
- }
-