On systems that don't have a mixer_info, define it in gmix.h, not gmix.c

This fixes building under NetBSD-1.4.x
Bump PKGREVISION
Closes PR pkg/15908 by Olaf Seibert.

4 files changed, 24 insertions, 19 deletions

diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 4524c168ede..e90b735c3ad 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2002/07/17 13:22:49 rh Exp $
+# $NetBSD: Makefile,v 1.14 2002/07/26 09:17:05 rh Exp $
 
 DISTNAME=	gnome-media-1.2.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=stable/sources/gnome-media/}
 
diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo
index cbe7b0883d3..a1038a7d5bd 100644
--- a/audio/gnome-media/distinfo
+++ b/audio/gnome-media/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.3 2001/08/13 18:38:55 rh Exp $
+$NetBSD: distinfo,v 1.4 2002/07/26 09:17:05 rh Exp $
 
 SHA1 (gnome-media-1.2.3.tar.gz) = 2b20ed2eb69576dad1c740b14c095a01ba270d61
 Size (gnome-media-1.2.3.tar.gz) = 789032 bytes
 SHA1 (patch-aa) = 0fbbff8ba31f7a3c662db412701edab02e5af5fd
 SHA1 (patch-ab) = c86c48b12a5e61e84b0ae17b73ec3656996c8ed0
-SHA1 (patch-ac) = f5c0b2562fe1a57873af3eac16a793a291a91cbb
+SHA1 (patch-ac) = 3cb7bad07d5ea0265bc083705d51a6574c49410c
+SHA1 (patch-ad) = 9d0ad2316afb3e09530a929784f10fc4e97dae8b
 SHA1 (patch-ae) = 643f24f3d8a20bd2e7071e1c4d51a8a3590086e8
 SHA1 (patch-af) = bc3fe755bc8e12be3436e121da5a1c059883cd11
diff --git a/audio/gnome-media/patches/patch-ac b/audio/gnome-media/patches/patch-ac
index 94277567c78..424af9d2c54 100644
--- a/audio/gnome-media/patches/patch-ac
+++ b/audio/gnome-media/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.3 2001/08/13 18:38:55 rh Exp $
+$NetBSD: patch-ac,v 1.4 2002/07/26 09:17:06 rh Exp $
 
 --- gmix/gmix.c.orig	Mon Jun 11 19:50:47 2001
 +++ gmix/gmix.c
@@ -13,20 +13,6 @@ $NetBSD: patch-ac,v 1.3 2001/08/13 18:38:55 rh Exp $
  #include <linux/soundcard.h>
  #else 
  #include <machine/soundcard.h>
-@@ -106,6 +108,13 @@
- GtkWidget *app;
- GtkWidget  *slidernotebook;
- 
-+#if !defined(HAVE_MIXER_INFO) && !defined(SOUND_MIXER_INFO)
-+typedef struct {
-+	char id[20];
-+	char name[40];
-+} mixer_info;
-+#endif
-+
- /* Menus */
- static GnomeUIInfo help_menu[] = {
- 	GNOMEUIINFO_ITEM_STOCK(N_("Help"), NULL, help, GNOME_STOCK_PIXMAP_HELP),
 @@ -538,12 +547,16 @@
  	/*
  	 * mixer-name
diff --git a/audio/gnome-media/patches/patch-ad b/audio/gnome-media/patches/patch-ad
new file mode 100644
index 00000000000..a62e737eefb
--- /dev/null
+++ b/audio/gnome-media/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.3 2002/07/26 09:17:06 rh Exp $
+
+--- gmix/gmix.h.orig	Tue Jun 12 03:50:47 2001
++++ gmix/gmix.h
+@@ -36,6 +36,13 @@
+ } mixer_info;
+ #endif
+ 
++#if !defined(HAVE_MIXER_INFO) && !defined(SOUND_MIXER_INFO)
++typedef struct {
++	char id[20];
++	char name[40];
++} mixer_info;
++#endif
++
+ /* 
+  * All, that is known about a mixer-device
+  */