[vorbis-dev] Patches for NetBSD

[Jeremy C. Reed]

I submitted four new packages for the NetBSD pkgsrc collection: libao,
libogg, libvorbis and vorbis-tools for 1.0beta4. 

The following is some of the patches needed for libao and vorbis-tools.

Official Developers: When you receive patches or development suggestions
can you please acknowledge them? (For example: "Noted.", "Thanks, but
already done.", "Not necessary, because ...", "Interesting idea, but can
you change ...", "Yes, will use for next release", "Your patch
solves the problem, but there is a better way ...", etc.) The feedback
doesn't need to be long, but would be nice for those who contribute.

libao:

$NetBSD: patch-aa,v 1.1.1.1 2001/03/15 20:35:58 wiz Exp $

--- configure.orig	Sun Feb 25 20:58:48 2001
+++ configure	Wed Mar 14 22:03:19 2001
@@ -2086,6 +2086,8 @@
   HAVE_OSS_TRUE='#'
   HAVE_OSS_FALSE=
 fi
+HAVE_OSS_TRUE=
+HAVE_OSS_FALSE='#'
 
 
 echo $ac_n "checking for snd_pcm_open in -lasound""... $ac_c" 1>&6
$NetBSD: patch-ab,v 1.1.1.1 2001/03/15 20:35:58 wiz Exp $

--- ../libao-0.6.0.orig/src/plugins/oss/ao_oss.c	Fri Feb 23 17:31:48 2001
+++ src/plugins/oss/ao_oss.c	Wed Mar 14 22:12:22 2001
@@ -113,7 +113,7 @@
                 }
         } else {
                 /* default: first try the devfs path */
-		state->dev = strdup("/dev/sound/dsp");
+		state->dev = strdup("/dev/audio");
                 state->fd=open(state->dev,O_WRONLY);
                 if(state->fd < 0) 
                 {
@@ -198,7 +198,7 @@
 int plugin_get_latency(ao_internal_t *state)
 {
         int odelay = 0;
-	ioctl(((ao_oss_internal_t *)state)->fd, SNDCTL_DSP_GETODELAY, &odelay);
+/*	ioctl(((ao_oss_internal_t *)state)->fd, SNDCTL_DSP_GETODELAY, &odelay); */
         return odelay;
 }
 
$NetBSD: patch-ac,v 1.1.1.1 2001/03/15 20:35:58 wiz Exp $

--- ../libao-0.6.0.orig/src/audio_out.c	Fri Feb 23 17:31:46 2001
+++ src/audio_out.c	Thu Mar 15 10:21:55 2001
@@ -63,7 +63,7 @@
         driver_tree_t *dt;
         void *handle;
         
-	handle = dlopen(plugin_file, RTLD_NOW);
+	handle = dlopen(plugin_file, DL_LAZY);
         if (handle) {
                 dt = (driver_tree_t *)malloc(sizeof(driver_tree_t));
                 if (!dt) return NULL;
$NetBSD: patch-ad,v 1.1 2001/03/16 10:10:35 wiz Exp $

--- src/ao_wav.c.orig	Sat Feb 24 02:31:46 2001
+++ src/ao_wav.c
@@ -221,7 +221,7 @@
 
                 /* Swap the bytes into the swap buffer (so we don't
                  mess up the output_samples buffer) */
-		for(i = 0; i < num_bytes/2; i+=2) {
+		for(i = 0; i < num_bytes; i+=2) {
                         s->swap_buffer[i]   = ((char *) output_samples)[i+1];
                         s->swap_buffer[i+1] = ((char *) output_samples)[i];
                 }

vorbis-tools:

$NetBSD: patch-aa,v 1.1.1.1 2001/03/15 20:53:06 wiz Exp $

--- ../vorbis-tools-1.0beta4.orig/configure	Sun Feb 25 21:51:05 2001
+++ configure	Thu Mar 15 09:52:40 2001
@@ -1822,7 +1822,7 @@
     AO_LIBS="-L$ao_prefix/lib"
   fi
 
-  AO_LIBS="$AO_LIBS -lao -ldl"
+  AO_LIBS="$AO_LIBS -lao -lossaudio"
 
   echo $ac_n "checking for ao""... $ac_c" 1>&6
 echo "configure:1829: checking for ao" >&5
$NetBSD: patch-ab,v 1.1.1.1 2001/03/15 20:53:06 wiz Exp $

--- ../vorbis-tools-1.0beta4.orig/ogg123/Makefile.in	Mon Feb 26 03:02:14 2001
+++ ogg123/Makefile.in	Sat Mar 10 03:47:13 2001
@@ -85,7 +85,7 @@
 bin_PROGRAMS = ogg123
 docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
 doc_DATA = ogg123rc-example
-mandir = $(datadir)/man
+mandir = $(prefix)/man
 man_MANS = ogg123.1
 
 INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AO_CFLAGS@

I hope this helps!

   Jeremy C. Reed
   http://www.reedmedia.net/

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'vorbis-dev-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.