Maintenance update to 1.0.2.

audio/speex/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/06/12 00:52:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.2 2003/09/29 23:45:42 naddy Exp $
 
 COMMENT=	"patent-free speech codec"
 
-DISTNAME=	speex-1.0.1
+DISTNAME=	speex-1.0.2
 CATEGORIES=	audio
 HOMEPAGE=	http://www.speex.org/
 
@@ -18,7 +18,7 @@ MASTER_SITES=	${HOMEPAGE}download/
 
 LIB_DEPENDS=	ogg.4::audio/libogg
 
-CONFIGURE_STYLE= autoconf
+CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
 		--with-ogg-dir=${LOCALBASE}
 

audio/speex/distinfo

@@ -1,3 +1,3 @@
-MD5 (speex-1.0.1.tar.gz) = 20515626d2c755ca9216701b60c97120
-RMD160 (speex-1.0.1.tar.gz) = 5faedd3bf35be5cc11dcd80792d52e3ee18b904b
-SHA1 (speex-1.0.1.tar.gz) = 6a2d3542f7c1eb201e4b2dea190d548c41d0d202
+MD5 (speex-1.0.2.tar.gz) = a14e671c789ff3a2f9abbc4f2576910d
+RMD160 (speex-1.0.2.tar.gz) = 3e4989a5135049ba5adebaed0e2bac830e14875c
+SHA1 (speex-1.0.2.tar.gz) = ac5d2520276af86d97efa23953579cf790aea778

audio/speex/patches/patch-configure_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.1.1.1 2003/06/12 00:52:02 naddy Exp $
---- configure.in.orig	Tue May 13 00:58:07 2003
-+++ configure.in	Tue May 13 00:58:20 2003
-@@ -26,7 +26,7 @@ AC_CANONICAL_HOST
- AM_PROG_LIBTOOL
- 
- AC_C_BIGENDIAN
--AC_CHECK_HEADERS(sys/soundcard.h)
-+AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
- 
- AC_ARG_ENABLE(ogg,
-       [  --enable-ogg=[yes/no]    Turn on or off the use of ogg

audio/speex/patches/patch-src_speexdec_c

@@ -1,51 +1,11 @@
-$OpenBSD: patch-src_speexdec_c,v 1.1.1.1 2003/06/12 00:52:02 naddy Exp $
---- src/speexdec.c.orig	Thu Jun 12 01:11:28 2003
-+++ src/speexdec.c	Thu Jun 12 01:14:31 2003
-@@ -56,6 +56,14 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#elif defined HAVE_SYS_AUDIOIO_H
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <sys/audioio.h>
-+#include <fcntl.h>
-+#ifndef AUDIO_ENCODING_SLINEAR
-+#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR	/* Solaris */
-+#endif
+$OpenBSD: patch-src_speexdec_c,v 1.2 2003/09/29 23:45:42 naddy Exp $
+--- src/speexdec.c.orig	2003-09-30 01:35:01.000000000 +0200
++++ src/speexdec.c	2003-09-30 01:35:39.000000000 +0200
+@@ -194,6 +194,7 @@ FILE *out_file_open(char *outFile, int r
  #endif
- 
- #include <string.h>
-@@ -166,6 +174,32 @@ FILE *out_file_open(char *outFile, int r
-          close(audio_fd);
-          exit(1);
-       }
-+      fout = fdopen(audio_fd, "w");
-+#elif defined HAVE_SYS_AUDIOIO_H
-+      audio_info_t info;
-+      int audio_fd;
-+ 
-+      audio_fd = open("/dev/audio", O_WRONLY);
-+      if (audio_fd<0)
-+      {
-+         perror("Cannot open /dev/audio");
-+         exit(1);
-+      }
-+
-+      AUDIO_INITINFO(&info);
-+#ifdef AUMODE_PLAY	/* NetBSD/OpenBSD */
-+      info.mode = AUMODE_PLAY;
-+#endif
-+      info.play.encoding = AUDIO_ENCODING_SLINEAR;
-+      info.play.precision = 16;
+       info.play.encoding = AUDIO_ENCODING_SLINEAR;
+       info.play.precision = 16;
 +      info.play.sample_rate = rate;
-+      info.play.channels = *channels;
-+
-+      if (ioctl(audio_fd, AUDIO_SETINFO, &info) < 0)
-+      {
-+         perror("AUDIO_SETINFO");
-+         exit(1);
-+      } 
-       fout = fdopen(audio_fd, "w");
- #elif defined WIN32 || defined _WIN32
-       {
+       info.play.channels = *channels;
+       
+       if (ioctl(audio_fd, AUDIO_SETINFO, &info) < 0)

audio/speex/pkg/DESCR

@@ -2,5 +2,3 @@ Speex is a patent-free audio codec designed especially for voice
 (unlike Vorbis which targets general audio) signals and providing
 good narrowband and wideband quality.  This project aims to be
 complementary to the Vorbis codec.
-
-WWW: ${HOMEPAGE}

audio/speex/pkg/PFRAG.shared

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2003/06/12 00:52:02 naddy Exp $
-lib/libspeex.so.2.0
+@comment $OpenBSD: PFRAG.shared,v 1.2 2003/09/29 23:45:42 naddy Exp $
+lib/libspeex.so.2.1
 DYNLIBDIR(%B)