Move gnome-media from audio to the multimedia category.

This is version 1.2.3nb9.

6 files changed, 105 insertions, 0 deletions

diff --git a/multimedia/gnome-media/patches/patch-aa b/multimedia/gnome-media/patches/patch-aa
new file mode 100644
index 00000000000..56029cd6b4a
--- /dev/null
+++ b/multimedia/gnome-media/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2004/02/22 16:31:00 jmmv Exp $
+
+--- gmix/prefs.c.orig	Mon Jun 11 19:50:47 2001
++++ gmix/prefs.c
+@@ -34,6 +34,8 @@
+ #include <ctype.h>
+ #ifdef ALSA
+ #include <sys/asoundlib.h>
++#elif defined(HAVE_SOUNDCARD_H)
++#include <soundcard.h>
+ #else
+ #ifdef HAVE_LINUX_SOUNDCARD_H 
+ #include <linux/soundcard.h>
diff --git a/multimedia/gnome-media/patches/patch-ab b/multimedia/gnome-media/patches/patch-ab
new file mode 100644
index 00000000000..833a52305f4
--- /dev/null
+++ b/multimedia/gnome-media/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2004/02/22 16:31:00 jmmv Exp $
+
+--- gmix/Makefile.in.orig	Tue Jun 12 18:58:12 2001
++++ gmix/Makefile.in
+@@ -146,7 +146,7 @@
+ gmix_SOURCES =  	gmix.c gmix.h prefs.c prefs.h
+ 
+ 
+-gmix_LDADD =  	$(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) $(GMIX_LIBS)
++gmix_LDADD =  	$(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) $(GMIX_LIBS) -lossaudio
+ 
+ 
+ Audio_in_files = gmix.desktop.in
diff --git a/multimedia/gnome-media/patches/patch-ac b/multimedia/gnome-media/patches/patch-ac
new file mode 100644
index 00000000000..06db03b19e2
--- /dev/null
+++ b/multimedia/gnome-media/patches/patch-ac
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.1.1.1 2004/02/22 16:31:00 jmmv Exp $
+
+--- gmix/gmix.c.orig	Mon Jun 11 19:50:47 2001
++++ gmix/gmix.c
+@@ -55,7 +55,9 @@
+ #ifdef ALSA
+ #include <sys/asoundlib.h>
+ #else
+-#ifdef HAVE_LINUX_SOUNDCARD_H 
++#ifdef HAVE_SOUNDCARD_H
++#include <soundcard.h>
++#elif defined(HAVE_LINUX_SOUNDCARD_H)
+ #include <linux/soundcard.h>
+ #else 
+ #include <machine/soundcard.h>
+@@ -538,12 +547,16 @@
+ 	/*
+ 	 * mixer-name
+ 	 */
++#ifdef HAVE_MIXER_INFO
+ 	res=ioctl(new_device->fd, SOUND_MIXER_INFO, &new_device->info);
+ 	if (res!=0) {
+ 		g_free(new_device);
+ 		return NULL;
+ 	}
+ 	if(!isalpha(new_device->info.name[0]))
++#else
++	g_snprintf(new_device->info.id, 31, "%d", num+1);
++#endif
+ 		g_snprintf(new_device->info.name, 31, "Card %d", num+1);
+ 	/* 
+ 	 * several bitmasks describing the mixer
diff --git a/multimedia/gnome-media/patches/patch-ad b/multimedia/gnome-media/patches/patch-ad
new file mode 100644
index 00000000000..2e21755ad4a
--- /dev/null
+++ b/multimedia/gnome-media/patches/patch-ad
@@ -0,0 +1,18 @@
+$NetBSD: patch-ad,v 1.1.1.1 2004/02/22 16:31:00 jmmv 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
+  */
diff --git a/multimedia/gnome-media/patches/patch-ae b/multimedia/gnome-media/patches/patch-ae
new file mode 100644
index 00000000000..9c80f95e6cc
--- /dev/null
+++ b/multimedia/gnome-media/patches/patch-ae
@@ -0,0 +1,17 @@
+$NetBSD: patch-ae,v 1.1.1.1 2004/02/22 16:31:00 jmmv Exp $
+
+--- Makefile.in.orig	Tue Jun 12 18:58:00 2001
++++ Makefile.in
+@@ -135,10 +135,10 @@
+ 
+ always_built_SUBDIRS = cddbslave
+ 
+-SUBDIRS = intl po macros omf-install $(always_built_SUBDIRS) 	  @PROGRAMS_VUMETER@ @PROGRAMS_GMIX@ @PROGRAMS_TCD@ @PROGRAMS_GRECORD@
++SUBDIRS = intl po macros omf-install $(always_built_SUBDIRS) 	  @PROGRAMS_VUMETER@ @PROGRAMS_GMIX@ @PROGRAMS_GRECORD@
+ 
+ 
+-DIST_SUBDIRS = intl po macros omf-install $(always_built_SUBDIRS) 	       vu-meter gmix tcd grecord
++DIST_SUBDIRS = intl po macros omf-install $(always_built_SUBDIRS) 	       vu-meter gmix grecord
+ 
+ 
+ EXTRA_DIST = gnome-media.spec.in configure acinclude.m4 COPYING-DOCS 		sgmldocs.make xml-i18n-extract.in xml-i18n-merge.in 		xml-i18n-update.in
diff --git a/multimedia/gnome-media/patches/patch-af b/multimedia/gnome-media/patches/patch-af
new file mode 100644
index 00000000000..7fbc3dae96e
--- /dev/null
+++ b/multimedia/gnome-media/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.1.1.1 2004/02/22 16:31:00 jmmv Exp $
+--- po/Makefile.in.in.orig	Tue Oct  5 21:27:59 1999
++++ po/Makefile.in.in	Sun Nov  7 22:38:50 1999
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po