Update to 1.2.3. Set LICENSE.

Two of the patches were from upstream CVS, the other two are not needed
any longer because the configure script was improved.

libvorbis 1.2.3 (2009-07-09) -- "Xiph.Org libVorbis I 20090709"

 * correct a vorbisfile bug that prevented proper playback of
   Vorbis files where all audio in a logical stream is in a
   single page
 * Additional decode setup hardening against malicious streams
 * Add 'OV_EXCLUDE_STATIC_CALLBACKS' define for developers who
   wish to avoid avoid unused symbol warnings from the static
   callbacks defined in vorbisfile.h

libvorbis 1.2.2 (2009-06-24) -- "Xiph.Org libVorbis I 20090624"

 * define VENDOR and ENCODER strings
 * seek correctly in files bigger than 2 GB (Windows)
 * fix regression from CVE-2008-1420; 1.0b1 files work again
 * mark all tables as constant to reduce memory occupation
 * additional decoder hardening against malicious streams
 * substantially reduce amount of seeking performed by Vorbisfile
 * Multichannel decode bugfix
 * build system updates
 * minor specification clarifications/fixes

libvorbis 1.2.1 (unreleased) -- "Xiph.Org libVorbis I 20080501"

 * Improved robustness with corrupt streams.
 * New ov_read_filter() vorbisfile call allows filtering decoded
   audio as floats before converting to integer samples.
 * Fix an encoder bug with multichannel streams.
 * Replaced RTP payload format draft with RFC 5215.
 * Bare bones self test under 'make check'.
 * Fix a problem encoding some streams between 14 and 28 kHz.
 * Fix a numerical instability in the edge extrapolation filter.
 * Build system improvements.
 * Specification correction.

7 files changed, 19 insertions, 126 deletions

diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 890e1713997..8bfd935c586 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.47 2008/05/14 16:36:18 drochner Exp $
+# $NetBSD: Makefile,v 1.48 2009/07/17 20:28:21 wiz Exp $
 
-DISTNAME=	libvorbis-1.2.0
-PKGREVISION=	1
+DISTNAME=	libvorbis-1.2.3
 CATEGORIES=	devel audio
 MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
 
 MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.xiph.org/vorbis/
 COMMENT=	Library for the Ogg Vorbis audio encoding format
+LICENSE=	modified-bsd
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -15,15 +15,9 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
-GCC_REQD+=		2.95.3
-
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=		F77=${FALSE:Q}
-
 PKGCONFIG_OVERRIDE+=	vorbis.pc.in
 PKGCONFIG_OVERRIDE+=	vorbisenc.pc.in
 PKGCONFIG_OVERRIDE+=	vorbisfile.pc.in
 
 .include "../../multimedia/libogg/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/libvorbis/PLIST b/audio/libvorbis/PLIST
index 4b6c1a49f0b..2f584d2f487 100644
--- a/audio/libvorbis/PLIST
+++ b/audio/libvorbis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/06/14 17:32:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/07/17 20:28:21 wiz Exp $
 include/vorbis/codec.h
 include/vorbis/vorbisenc.h
 include/vorbis/vorbisfile.h
@@ -9,29 +9,21 @@ lib/pkgconfig/vorbis.pc
 lib/pkgconfig/vorbisenc.pc
 lib/pkgconfig/vorbisfile.pc
 share/aclocal/vorbis.m4
-share/doc/${PKGNAME}/components.png
-share/doc/${PKGNAME}/draft-ietf-avt-rtp-vorbis-06.txt
-share/doc/${PKGNAME}/draft-ietf-avt-rtp-vorbis-06.xml
 share/doc/${PKGNAME}/eightphase.png
 share/doc/${PKGNAME}/evenlsp.png
-share/doc/${PKGNAME}/floor1-1.png
-share/doc/${PKGNAME}/floor1-2.png
-share/doc/${PKGNAME}/floor1-3.png
-share/doc/${PKGNAME}/floor1-4.png
+share/doc/${PKGNAME}/fish_xiph_org.png
 share/doc/${PKGNAME}/floor1_inverse_dB_table.html
 share/doc/${PKGNAME}/floorval.png
 share/doc/${PKGNAME}/fourphase.png
 share/doc/${PKGNAME}/framing.html
 share/doc/${PKGNAME}/helper.html
-share/doc/${PKGNAME}/hufftree-under.png
-share/doc/${PKGNAME}/hufftree.png
 share/doc/${PKGNAME}/index.html
 share/doc/${PKGNAME}/lspmap.png
 share/doc/${PKGNAME}/oddlsp.png
 share/doc/${PKGNAME}/oggstream.html
 share/doc/${PKGNAME}/programming.html
-share/doc/${PKGNAME}/residue-pack.png
-share/doc/${PKGNAME}/residue2.png
+share/doc/${PKGNAME}/rfc5215.txt
+share/doc/${PKGNAME}/rfc5215.xml
 share/doc/${PKGNAME}/squarepolar.png
 share/doc/${PKGNAME}/stereo.html
 share/doc/${PKGNAME}/stream.png
@@ -40,13 +32,20 @@ share/doc/${PKGNAME}/vorbis-clip.txt
 share/doc/${PKGNAME}/vorbis-errors.txt
 share/doc/${PKGNAME}/vorbis-fidelity.html
 share/doc/${PKGNAME}/vorbis.html
+share/doc/${PKGNAME}/vorbisenc/changes.html
+share/doc/${PKGNAME}/vorbisenc/examples.html
 share/doc/${PKGNAME}/vorbisenc/index.html
+share/doc/${PKGNAME}/vorbisenc/ov_ectl_ratemanage2_arg.html
+share/doc/${PKGNAME}/vorbisenc/ov_ectl_ratemanage_arg.html
 share/doc/${PKGNAME}/vorbisenc/overview.html
 share/doc/${PKGNAME}/vorbisenc/reference.html
 share/doc/${PKGNAME}/vorbisenc/style.css
 share/doc/${PKGNAME}/vorbisenc/vorbis_encode_ctl.html
 share/doc/${PKGNAME}/vorbisenc/vorbis_encode_init.html
 share/doc/${PKGNAME}/vorbisenc/vorbis_encode_init_vbr.html
+share/doc/${PKGNAME}/vorbisenc/vorbis_encode_setup_init.html
+share/doc/${PKGNAME}/vorbisenc/vorbis_encode_setup_managed.html
+share/doc/${PKGNAME}/vorbisenc/vorbis_encode_setup_vbr.html
 share/doc/${PKGNAME}/vorbisenc/vorbis_info.html
 share/doc/${PKGNAME}/vorbisfile/OggVorbis_File.html
 share/doc/${PKGNAME}/vorbisfile/callbacks.html
@@ -66,6 +65,7 @@ share/doc/${PKGNAME}/vorbisfile/ov_callbacks.html
 share/doc/${PKGNAME}/vorbisfile/ov_clear.html
 share/doc/${PKGNAME}/vorbisfile/ov_comment.html
 share/doc/${PKGNAME}/vorbisfile/ov_crosslap.html
+share/doc/${PKGNAME}/vorbisfile/ov_fopen.html
 share/doc/${PKGNAME}/vorbisfile/ov_info.html
 share/doc/${PKGNAME}/vorbisfile/ov_open.html
 share/doc/${PKGNAME}/vorbisfile/ov_open_callbacks.html
@@ -108,7 +108,4 @@ share/doc/${PKGNAME}/vorbisfile/vorbis_info.html
 share/doc/${PKGNAME}/vorbisfile/vorbisfile_example_c.html
 share/doc/${PKGNAME}/vorbisword2.png
 share/doc/${PKGNAME}/wait.png
-share/doc/${PKGNAME}/white-ogg.png
 share/doc/${PKGNAME}/white-xifish.png
-share/doc/${PKGNAME}/window1.png
-share/doc/${PKGNAME}/window2.png
diff --git a/audio/libvorbis/distinfo b/audio/libvorbis/distinfo
index e2858d5218f..84adab88e8d 100644
--- a/audio/libvorbis/distinfo
+++ b/audio/libvorbis/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.16 2009/05/18 04:42:44 dholland Exp $
+$NetBSD: distinfo,v 1.17 2009/07/17 20:28:21 wiz Exp $
 
-SHA1 (libvorbis-1.2.0.tar.gz) = 6ff5f9d9d71cc385ee180171cc21af5653b76a16
-RMD160 (libvorbis-1.2.0.tar.gz) = 54bf2b48943e283f003cd5dfb4bf9e519b6a817d
-Size (libvorbis-1.2.0.tar.gz) = 1494373 bytes
-SHA1 (patch-aa) = 8d6d491a75531eb0527da6218eeb123692ae747e
-SHA1 (patch-ab) = 07c6ef26df0adf1abce4b96a6aff512ed1d6597a
-SHA1 (patch-ac) = afa921a67e85ccc81ced6ddfb7d48a9472de76dd
-SHA1 (patch-ad) = bb28ad8754b8d1dadd6541c2a80a2961e5343914
+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
diff --git a/audio/libvorbis/patches/patch-aa b/audio/libvorbis/patches/patch-aa
deleted file mode 100644
index 68a94ca9833..00000000000
--- a/audio/libvorbis/patches/patch-aa
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2008/05/14 16:36:18 drochner Exp $
-
---- ./lib/res0.c.orig	2007-07-24 02:09:47.000000000 +0200
-+++ ./lib/res0.c
-@@ -223,6 +223,20 @@ vorbis_info_residue *res0_unpack(vorbis_
-   for(j=0;j<acc;j++)
-     if(info->booklist[j]>=ci->books)goto errout;
- 
-+  /* verify the phrasebook is not specifying an impossible or

-+     inconsistent partitioning scheme. */

-+  {

-+    int entries = ci->book_param[info->groupbook]->entries;

-+    int dim = ci->book_param[info->groupbook]->dim;

-+    int partvals = 1;

-+    while(dim>0){

-+      partvals *= info->partitions;

-+      if(partvals > entries) goto errout;

-+      dim--;

-+    }

-+    if(partvals != entries) goto errout;

-+  }

-+

-   return(info);
-  errout:
-   res0_free_info(info);
-@@ -263,7 +277,7 @@ vorbis_look_residue *res0_look(vorbis_ds
-     }
-   }
- 
--  look->partvals=rint(pow((float)look->parts,(float)dim));
-+  look->partvals=look->phrasebook->entries;
-   look->stages=maxstage;
-   look->decodemap=_ogg_malloc(look->partvals*sizeof(*look->decodemap));
-   for(j=0;j<look->partvals;j++){
diff --git a/audio/libvorbis/patches/patch-ab b/audio/libvorbis/patches/patch-ab
deleted file mode 100644
index 43a4f0c7eb4..00000000000
--- a/audio/libvorbis/patches/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2008/05/14 16:36:18 drochner Exp $
-
---- ./lib/codebook.c.orig	2008-05-14 18:17:20.000000000 +0200
-+++ ./lib/codebook.c
-@@ -159,6 +159,8 @@ int vorbis_staticbook_unpack(oggpack_buf
-   s->entries=oggpack_read(opb,24);
-   if(s->entries==-1)goto _eofout;
- 
-+  if(_ilog(s->dim)+_ilog(s->entries)>24)goto _eofout;
-+
-   /* codeword ordering.... length ordered or unordered? */
-   switch((int)oggpack_read(opb,1)){
-   case 0:
-@@ -225,7 +227,7 @@ int vorbis_staticbook_unpack(oggpack_buf
-       int quantvals=0;
-       switch(s->maptype){
-       case 1:
--	quantvals=_book_maptype1_quantvals(s);
-+	quantvals=(s->dim==0?0:_book_maptype1_quantvals(s));
- 	break;
-       case 2:
- 	quantvals=s->entries*s->dim;
diff --git a/audio/libvorbis/patches/patch-ac b/audio/libvorbis/patches/patch-ac
deleted file mode 100644
index 73502154928..00000000000
--- a/audio/libvorbis/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2009/05/18 04:42:44 dholland Exp $
-
-gcc no longer supports -mv8 on solaris (PR 37177)
-
---- configure.in.orig	2009-05-18 00:39:36.000000000 -0400
-+++ configure.in	2009-05-18 00:39:58.000000000 -0400
-@@ -156,9 +156,9 @@
- 		CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
- 		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
- 	sparc-sun-*)
--		DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8"
--		CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
--		PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
-+		DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
-+		CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char"
-+		PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char" ;;
- 	*-*-darwin*)
- 		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
- 		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"
diff --git a/audio/libvorbis/patches/patch-ad b/audio/libvorbis/patches/patch-ad
deleted file mode 100644
index 142629f1d7c..00000000000
--- a/audio/libvorbis/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2009/05/18 04:42:44 dholland Exp $
-
-gcc no longer supports -mv8 on solaris (PR 37177)
-
---- configure.orig	2009-05-18 00:39:40.000000000 -0400
-+++ configure	2009-05-18 00:40:13.000000000 -0400
-@@ -19472,9 +19472,9 @@
- 		CFLAGS="-O20 -ffast-math -D_REENTRANT -fsigned-char"
- 		PROFILE="-pg -g -O20 -ffast-math -D_REENTRANT -fsigned-char";;
- 	sparc-sun-*)
--		DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char -mv8"
--		CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char -mv8"
--		PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char -mv8" ;;
-+		DEBUG="-g -Wall -W -D__NO_MATH_INLINES -fsigned-char"
-+		CFLAGS="-O20 -ffast-math -D__NO_MATH_INLINES -fsigned-char"
-+		PROFILE="-pg -g -O20 -D__NO_MATH_INLINES -fsigned-char" ;;
- 	*-*-darwin*)
- 		DEBUG="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O0 -fsigned-char"
- 		CFLAGS="-DDARWIN -fno-common -force_cpusubtype_ALL -Wall -g -O4 -ffast-math -fsigned-char"