Update to 1.3.1:

libvorbis 1.3.1 (2010-02-26) -- "Xiph.Org libVorbis I 20100325 (Everywhere)"

 * tweak + minor arithmetic fix in floor1 fit
 * revert noise norm to conservative 1.2.3 behavior pending
   more listening testing

libvorbis 1.3.0 (2010-02-25) -- unreleased staging snapshot

 * Optimized surround support for 5.1 encoding at 44.1/48kHz
 * Added encoder control call to disable channel coupling
 * Correct an overflow bug in very low-bitrate encoding on 32 bit
   machines that caused inflated bitrates
 * Numerous API hardening, leak and build fixes
 * Correct bug in 22kHz compand setup that could cause a crash
 * Correct bug in 16kHz codebooks that could cause unstable pure
   tones at high bitrates

5 files changed, 8 insertions, 39 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 63fa046a375..457df6e9bb8 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2009/12/02 12:41:25 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2010/04/23 21:45:19 wiz Exp $
 
-DISTNAME=	libvorbis-1.2.3
-PKGREVISION=	1
+DISTNAME=	libvorbis-1.3.1
 CATEGORIES=	devel audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
 
diff --git a/audio/libvorbis/PLIST b/audio/libvorbis/PLIST
index 2f584d2f487..8f0ac2e2616 100644
--- a/audio/libvorbis/PLIST
+++ b/audio/libvorbis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/07/17 20:28:21 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/04/23 21:45:19 wiz Exp $
 include/vorbis/codec.h
 include/vorbis/vorbisenc.h
 include/vorbis/vorbisfile.h
@@ -9,6 +9,7 @@ lib/pkgconfig/vorbis.pc
 lib/pkgconfig/vorbisenc.pc
 lib/pkgconfig/vorbisfile.pc
 share/aclocal/vorbis.m4
+share/doc/${PKGNAME}/doxygen-build.stamp
 share/doc/${PKGNAME}/eightphase.png
 share/doc/${PKGNAME}/evenlsp.png
 share/doc/${PKGNAME}/fish_xiph_org.png
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index 7dd9e61732a..5ef9fc2bac3 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.18 2009/12/02 12:41:25 wiz Exp $
+$NetBSD: distinfo,v 1.19 2010/04/23 21:45:19 wiz Exp $
 
-SHA1 (libvorbis-1.2.3.tar.gz) = a93251aa5e4f142db4fa6433de80797f80960fac
-RMD160 (libvorbis-1.2.3.tar.gz) = e80ad7de3c2599e0d88994876407ac8fe3c9a0e7
-Size (libvorbis-1.2.3.tar.gz) = 1474492 bytes
-SHA1 (patch-aa) = bd1534e2f680d5621a7909fd0b197d9d8c52b91d
-SHA1 (patch-ab) = b253546a863893e96569d8afb5e626ffe5f226dc
+SHA1 (libvorbis-1.3.1.tar.gz) = 0874dd08699240b868b22979da4c95ae6325006b
+RMD160 (libvorbis-1.3.1.tar.gz) = 0ed122d628c3c0152ff2d245aaf5e7ac2667f0cc
+Size (libvorbis-1.3.1.tar.gz) = 1467164 bytes
diff --git a/audio/libvorbis/patches/patch-aa b/audio/libvorbis/patches/patch-aa
deleted file mode 100644
index c682deec856..00000000000
--- a/audio/libvorbis/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2009/12/02 12:41:25 wiz Exp $
-
-SVN r16957
-
---- lib/codebook.c.orig	2009-07-09 09:12:08.000000000 +0000
-+++ lib/codebook.c
-@@ -198,6 +198,7 @@ int vorbis_staticbook_unpack(oggpack_buf
-       for(i=0;i<s->entries;){
-         long num=oggpack_read(opb,_ilog(s->entries-i));
-         if(num==-1)goto _eofout;
-+	if(length>32)goto _errout;
-         for(j=0;j<num && i<s->entries;j++,i++)
-           s->lengthlist[i]=length;
-         length++;
diff --git a/audio/libvorbis/patches/patch-ab b/audio/libvorbis/patches/patch-ab
deleted file mode 100644
index 72b21043a18..00000000000
--- a/audio/libvorbis/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2009/12/02 12:41:25 wiz Exp $
-
-SVN 16326.
-
---- lib/backends.h.orig	2009-07-09 09:12:08.000000000 +0000
-+++ lib/backends.h
-@@ -111,7 +111,7 @@ typedef struct vorbis_info_residue0{
-   int    partitions;       /* possible codebooks for a partition */
-   int    groupbook;        /* huffbook for partitioning */
-   int    secondstages[64]; /* expanded out to pointers in lookup */
--  int    booklist[256];    /* list of second stage books */
-+  int    booklist[512];    /* list of second stage books */
- 
-   const float classmetric1[64];
-   const float classmetric2[64];