Update to 1.0beta2:

libtheora 1.0beta2 (2007 October 12)

 - Fix a crash bug on char-is-unsigned architectures (PowerPC)
 - Fix a buffer sizing issue that caused rare encoder crashes
 - Fix a buffer alignment issue
 - Build fixes for MingW32, MSVC
 - Improved format documentation.

libtheora 1.0beta1 (2007 September 22)

 - Granulepos scheme modified to match other codecs. This bumps
   the bitstream revision to 3.2.1. Bitstreams marked 3.2.0 are
   handled correctly by this decoder. Older decoders will show
   a one frame sync error in the less noticable direction.

It also includes the changes done for alpha8, which was short lived and
is only interesting for historical reasons:

libtheora 1.0alpha8 (2007 September 18)

 - Switch to new spec compliant decoder from theora-exp branch.
   Written by Dr. Timothy Terriberry.
 - Add support to the encoder for using quantization settings
   provided by the application.
 - more assembly optimizations

4 files changed, 12 insertions, 106 deletions

diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index aee6d4cd058..8807eb14dac 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2006/11/05 17:25:35 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2007/10/17 20:46:55 wiz Exp $
 #
 
-DISTNAME=	libtheora-1.0alpha7
+DISTNAME=	libtheora-1.0beta2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xiph.org/releases/theora/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,7 +17,10 @@ PKGCONFIG_OVERRIDE=	theora.pc.in
 USE_LIBTOOL=		YES
 TEST_TARGET=		check
 
+CONFIGURE_ARGS+=	--disable-examples
 CONFIGURE_ARGS+=	HAVE_DOXYGEN=false
+# disable player
+CONFIGURE_ENV+=		ac_cv_path_SDL_CONFIG=no
 
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
diff --git a/multimedia/libtheora/PLIST b/multimedia/libtheora/PLIST
index 4d3e8aff204..7973aa3fce6 100644
--- a/multimedia/libtheora/PLIST
+++ b/multimedia/libtheora/PLIST
@@ -1,59 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2006/07/02 11:38:23 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/10/17 20:46:55 wiz Exp $
 include/theora/theora.h
 lib/libtheora.la
 lib/pkgconfig/theora.pc
 share/doc/${PKGNAME}/color.html
 share/doc/${PKGNAME}/doxygen-build.stamp
-share/doc/${PKGNAME}/draft-barbato-avt-rtp-theora-01.txt
-share/doc/${PKGNAME}/draft-barbato-avt-rtp-theora-01.xml
-share/doc/${PKGNAME}/html/annotated.html
-share/doc/${PKGNAME}/html/doxygen.css
-share/doc/${PKGNAME}/html/doxygen.png
-share/doc/${PKGNAME}/html/files.html
-share/doc/${PKGNAME}/html/functions.html
-share/doc/${PKGNAME}/html/functions_vars.html
-share/doc/${PKGNAME}/html/globals.html
-share/doc/${PKGNAME}/html/globals_defs.html
-share/doc/${PKGNAME}/html/globals_enum.html
-share/doc/${PKGNAME}/html/globals_eval.html
-share/doc/${PKGNAME}/html/globals_func.html
-share/doc/${PKGNAME}/html/hierarchy.html
-share/doc/${PKGNAME}/html/index.html
-share/doc/${PKGNAME}/html/structtheora__comment.html
-share/doc/${PKGNAME}/html/structtheora__info.html
-share/doc/${PKGNAME}/html/structtheora__state.html
-share/doc/${PKGNAME}/html/structyuv__buffer.html
-share/doc/${PKGNAME}/html/tab_b.gif
-share/doc/${PKGNAME}/html/tab_l.gif
-share/doc/${PKGNAME}/html/tab_r.gif
-share/doc/${PKGNAME}/html/tabs.css
-share/doc/${PKGNAME}/html/theora_8h-source.html
-share/doc/${PKGNAME}/html/theora_8h.html
-share/doc/${PKGNAME}/latex/Helvetica.ttf
-share/doc/${PKGNAME}/latex/Makefile
-share/doc/${PKGNAME}/latex/annotated.tex
-share/doc/${PKGNAME}/latex/doxygen.sty
-share/doc/${PKGNAME}/latex/files.tex
-share/doc/${PKGNAME}/latex/hierarchy.tex
-share/doc/${PKGNAME}/latex/index.tex
-share/doc/${PKGNAME}/latex/refman.aux
-share/doc/${PKGNAME}/latex/refman.dvi
-share/doc/${PKGNAME}/latex/refman.idx
-share/doc/${PKGNAME}/latex/refman.ilg
-share/doc/${PKGNAME}/latex/refman.ind
-share/doc/${PKGNAME}/latex/refman.log
-share/doc/${PKGNAME}/latex/refman.tex
-share/doc/${PKGNAME}/latex/refman.toc
-share/doc/${PKGNAME}/latex/structtheora__comment.tex
-share/doc/${PKGNAME}/latex/structtheora__info.aux
-share/doc/${PKGNAME}/latex/structtheora__info.tex
-share/doc/${PKGNAME}/latex/structtheora__state.aux
-share/doc/${PKGNAME}/latex/structtheora__state.tex
-share/doc/${PKGNAME}/latex/structyuv__buffer.aux
-share/doc/${PKGNAME}/latex/structyuv__buffer.tex
-share/doc/${PKGNAME}/latex/theora_8h.tex
+share/doc/${PKGNAME}/draft-ietf-avt-rtp-theora-00.txt
+share/doc/${PKGNAME}/draft-ietf-avt-rtp-theora-00.xml
 share/doc/${PKGNAME}/vp3-format.txt
-@dirrm share/doc/${PKGNAME}/latex
-@dirrm share/doc/${PKGNAME}/html
 @dirrm share/doc/${PKGNAME}
 @dirrm include/theora
diff --git a/multimedia/libtheora/distinfo b/multimedia/libtheora/distinfo
index ea61ed212f1..af9f285f384 100644
--- a/multimedia/libtheora/distinfo
+++ b/multimedia/libtheora/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.9 2006/07/02 11:38:23 drochner Exp $
+$NetBSD: distinfo,v 1.10 2007/10/17 20:46:55 wiz Exp $
 
-SHA1 (libtheora-1.0alpha7.tar.bz2) = ee97d30e0818c27666477113c019d53f15449d3d
-RMD160 (libtheora-1.0alpha7.tar.bz2) = 45a46c35cb1bd6f44a82a286940937e031edb14f
-Size (libtheora-1.0alpha7.tar.bz2) = 1673255 bytes
-SHA1 (patch-aa) = a7aa87db7eba240d8b31f1923ae6c1469efb1551
+SHA1 (libtheora-1.0beta2.tar.bz2) = d58490cc507e1840fbdb432a1dd12433644cc04b
+RMD160 (libtheora-1.0beta2.tar.bz2) = 544bdb94e09fdfcfb76b603dd32c40ed5d6103a2
+Size (libtheora-1.0beta2.tar.bz2) = 1774632 bytes
diff --git a/multimedia/libtheora/patches/patch-aa b/multimedia/libtheora/patches/patch-aa
deleted file mode 100644
index 19554026a8f..00000000000
--- a/multimedia/libtheora/patches/patch-aa
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/06/11 14:21:47 wiz Exp $
-
---- configure.orig	2006-05-30 22:47:15.000000000 +0000
-+++ configure
-@@ -18891,7 +18891,7 @@ if test "x$lt_cv_prog_gnu_ld" = "xyes"; 
-    SHLIB_VERSION_ARG="Wl,--version-script=Version_script"
- 
-       case "$target_os" in
--	linux* | solaris* )
-+	linux*)
- 		SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
- 		;;
- 	*)
-@@ -19673,6 +19673,8 @@ fi
- HAVE_SDL=no
- 
- 
-+# SDL is only used for the sample player; disable it
-+if false; then
- # Check whether --with-sdl-prefix or --without-sdl-prefix was given.
- if test "${with_sdl_prefix+set}" = set; then
-   withval="$with_sdl_prefix"
-@@ -19970,6 +19972,7 @@ echo "$as_me: WARNING: *** Unable to fin
- 
- 
-   rm -f conf.sdltest
-+fi
- 
- 
- HAVE_OSS=no
-@@ -19977,6 +19980,8 @@ HAVE_OSS=no
- 
- 
- 
-+# OSS is only used by the sample player; disable it.
-+if false; then
- for ac_header in sys/soundcard.h soundcard.h machine/soundcard.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -20132,7 +20137,7 @@ if test x$HAVE_OSS != xyes; then
-   { echo "$as_me:$LINENO: WARNING: OSS audio support not found -- not compiling player_example" >&5
- echo "$as_me: WARNING: OSS audio support not found -- not compiling player_example" >&2;}
- fi
--
-+fi
- 
- 
- ac_enable_float=yes