Use native audio output, not libossaudio.

3 files changed, 82 insertions, 19 deletions

diff --git a/audio/ac3dec/files/patch-sum b/audio/ac3dec/files/patch-sum
index 3e7938391f6..2bfd3db9911 100644
--- a/audio/ac3dec/files/patch-sum
+++ b/audio/ac3dec/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.5 2000/09/26 03:08:29 hubertf Exp $
+$NetBSD: patch-sum,v 1.6 2001/01/08 00:21:59 mycroft Exp $
 
-MD5 (patch-aa) = f472e1fe1da3dbb6f8b1d293ef0eb42c
-MD5 (patch-ab) = 8c475b6221cd65061b798e2e7ab58ca1
+MD5 (patch-aa) = bd2172d900d36afc035f18d3d33b3e5f
+MD5 (patch-ab) = 5577de9cd57f58c7c8b64b363b61cf78
 MD5 (patch-ac) = 63a575c0609f7f3e80c240e6c1ed8b81
diff --git a/audio/ac3dec/patches/patch-aa b/audio/ac3dec/patches/patch-aa
index 60f074f095d..0ed52511827 100644
--- a/audio/ac3dec/patches/patch-aa
+++ b/audio/ac3dec/patches/patch-aa
@@ -1,12 +1,56 @@
-$NetBSD: patch-aa,v 1.3 2000/05/09 14:04:29 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2001/01/08 00:22:00 mycroft Exp $
 
---- configure.orig	Wed Mar 29 19:51:49 2000
-+++ configure	Tue May  9 09:32:16 2000
-@@ -1255,27 +1255,7 @@
+--- configure.orig	Thu Mar 30 00:51:49 2000
++++ configure	Mon Jan  8 00:20:13 2001
+@@ -1211,72 +1211,12 @@
+ fi
+ 
+ 
+-echo $ac_n "checking for _oss_ioctl in -lossaudio""... $ac_c" 1>&6
+-echo "configure:1216: checking for _oss_ioctl in -lossaudio" >&5
+-ac_lib_var=`echo ossaudio'_'_oss_ioctl | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-lossaudio  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1224 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char _oss_ioctl();
+-
+-int main() {
+-_oss_ioctl()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  LIBS="$LIBS -lossaudio"
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-
  case "$host" in
  *-linux*) rm -f output.c; ln -s output_linux.c output.c;;
--*-openbsd*|*-freebsd*) rm -f output.c; ln -s output_linux.c output.c;;
-+*-openbsd*|*-freebsd*|*-netbsd*) rm -f output.c; ln -s output_linux.c output.c;;
++*-netbsd*) rm -f output.c; ln -s output_solaris.c output.c;;
+ *-openbsd*|*-freebsd*) rm -f output.c; ln -s output_linux.c output.c;;
  *-irix*) rm -f output.c; ln -s output_irix.c output.c;;
  *-solaris*) rm -f output.c; ln -s output_solaris.c output.c;;
 -*) echo "$host is not currently supported by ac3dec"; exit 1;;
@@ -31,3 +75,4 @@ $NetBSD: patch-aa,v 1.3 2000/05/09 14:04:29 dmcmahill Exp $
 -;;
  *) echo "$host is not currently supported by ac3dec"; exit 1;;
  esac
+ 
diff --git a/audio/ac3dec/patches/patch-ab b/audio/ac3dec/patches/patch-ab
index 42dc6e211ec..b3e43e8e89d 100644
--- a/audio/ac3dec/patches/patch-ab
+++ b/audio/ac3dec/patches/patch-ab
@@ -1,13 +1,31 @@
-$NetBSD: patch-ab,v 1.2 2000/04/06 15:42:42 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2001/01/08 00:22:00 mycroft Exp $
 
---- output_linux.c.orig	Thu Mar 30 02:51:24 2000
-+++ output_linux.c	Thu Apr  6 17:28:05 2000
-@@ -33,7 +33,7 @@
- #include <unistd.h>
+--- output_solaris.c.orig	Thu Mar 30 00:51:24 2000
++++ output_solaris.c	Mon Jan  8 00:16:44 2001
+@@ -34,12 +34,13 @@
  #include <fcntl.h>
+ #include <sys/audioio.h>
+ #include <sys/ioctl.h>
+-#include <stropts.h>
+ #include <signal.h>
  #include <math.h>
--#if defined(__OpenBSD__)
-+#if defined(__NetBSD__) || defined (__OpenBSD__)
- #include <soundcard.h>
- #elif defined(__FreeBSD__)
- #include <machine/soundcard.h>
+ 
++#ifndef __NetBSD__
+ //FIXME broken solaris headers!
+ int usleep(unsigned int useconds);
++#endif
+ 
+ 
+ //this sux...types should go in config.h methinks
+@@ -79,7 +80,11 @@
+ 	info.play.sample_rate = rate;
+ 	info.play.precision = bits;
+ 	info.play.channels = channels;
++#ifndef __NetBSD__
+ 	info.play.buffer_size = 1024;
++#else
++	info.blocksize = 1024;
++#endif
+ 	info.play.encoding = AUDIO_ENCODING_LINEAR;
+ 	//info.play.port = AUDIO_SPEAKER;
+ 	//info.play.gain = 110;