Update to 1.0alpha6:

libtheora 1.0alph6 (2006 May 30)

 * Merge theora-mmx simd acceleration (x86_32 and x86_64)
 * Major RTP payload specification update
 * Minor format specification updates
 * Fix some spurious calls to free() instead of _ogg_free()
 * Fix invalid array indexing in PixelLineSearch()
 * Improve robustness against invalid input
 * General warning cleanup
 * The offset_y member now means what every application thought it meant
   (offset from the top). This will mean some old files (those with a
   non-centered image created with a buggy encoder) will display differently.

6 files changed, 20 insertions, 57 deletions

diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile
index 2b29e86936d..56f3402791b 100644
--- a/multimedia/libtheora/Makefile
+++ b/multimedia/libtheora/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:15 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2006/06/11 14:21:47 wiz Exp $
 #
 
-DISTNAME=	libtheora-1.0alpha5
+DISTNAME=	libtheora-1.0alpha6
 CATEGORIES=	multimedia
 MASTER_SITES=	http://downloads.xiph.org/releases/theora/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/libtheora/PLIST b/multimedia/libtheora/PLIST
index 24f96021b81..63744845ec1 100644
--- a/multimedia/libtheora/PLIST
+++ b/multimedia/libtheora/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2005/10/12 21:59:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/06/11 14:21:47 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-00.txt
+share/doc/${PKGNAME}/draft-barbato-avt-rtp-theora-00.xml
 share/doc/${PKGNAME}/vp3-format.txt
 @dirrm share/doc/${PKGNAME}
 @dirrm include/theora
diff --git a/multimedia/libtheora/distinfo b/multimedia/libtheora/distinfo
index da95c25da85..b9f7bcd9214 100644
--- a/multimedia/libtheora/distinfo
+++ b/multimedia/libtheora/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.7 2006/01/21 14:14:53 rillig Exp $
+$NetBSD: distinfo,v 1.8 2006/06/11 14:21:47 wiz Exp $
 
-SHA1 (libtheora-1.0alpha5.tar.bz2) = 8e740ccd7219861de83ac17ecceb13c02ed7e24a
-RMD160 (libtheora-1.0alpha5.tar.bz2) = 47317a42ef6165a167dc45bb697d6528e1209469
-Size (libtheora-1.0alpha5.tar.bz2) = 1765512 bytes
-SHA1 (patch-aa) = 526a7a5e0688d4fe7f0b7e22fcd9fed46f976413
-SHA1 (patch-ab) = c98e9acac047fb51c4835b782906ecfe02b92e01
-SHA1 (patch-ac) = 37f60ea4ea3292f8302417eed52ef9b549f05947
+SHA1 (libtheora-1.0alpha6.tar.bz2) = 0fa7314a432e60c6178a7d98b6408c7a950155ed
+RMD160 (libtheora-1.0alpha6.tar.bz2) = b0d81dab81ec96d51e2d6a4c047beff807de6077
+Size (libtheora-1.0alpha6.tar.bz2) = 1559318 bytes
+SHA1 (patch-aa) = a7aa87db7eba240d8b31f1923ae6c1469efb1551
diff --git a/multimedia/libtheora/patches/patch-aa b/multimedia/libtheora/patches/patch-aa
index 5360ae41e34..19554026a8f 100644
--- a/multimedia/libtheora/patches/patch-aa
+++ b/multimedia/libtheora/patches/patch-aa
@@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.3 2006/01/21 14:14:53 rillig Exp $
+$NetBSD: patch-aa,v 1.4 2006/06/11 14:21:47 wiz Exp $
 
---- configure.orig	2005-08-20 20:44:13.000000000 +0200
-+++ configure	2006-01-21 15:13:32.000000000 +0100
-@@ -19322,7 +19322,7 @@ CFLAGS="$CFLAGS $cflags_save"
- LDFLAGS="$LDFLAGS $ldflags_save"
+--- 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
+       case "$target_os" in
 -	linux* | solaris* )
 +	linux*)
  		SHLIB_VERSION_ARG="-Wl,--version-script=Version_script"
  		;;
  	*)
-@@ -20102,6 +20102,8 @@ fi
+@@ -19673,6 +19673,8 @@ fi
  HAVE_SDL=no
  
  
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.3 2006/01/21 14:14:53 rillig Exp $
  # Check whether --with-sdl-prefix or --without-sdl-prefix was given.
  if test "${with_sdl_prefix+set}" = set; then
    withval="$with_sdl_prefix"
-@@ -20394,6 +20396,7 @@ echo "$as_me: WARNING: *** Unable to fin
+@@ -19970,6 +19972,7 @@ echo "$as_me: WARNING: *** Unable to fin
  
  
    rm -f conf.sdltest
@@ -28,7 +28,7 @@ $NetBSD: patch-aa,v 1.3 2006/01/21 14:14:53 rillig Exp $
  
  
  HAVE_OSS=no
-@@ -20401,6 +20404,8 @@ HAVE_OSS=no
+@@ -19977,6 +19980,8 @@ HAVE_OSS=no
  
  
  
@@ -37,7 +37,7 @@ $NetBSD: patch-aa,v 1.3 2006/01/21 14:14:53 rillig Exp $
  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`
-@@ -20556,7 +20561,7 @@ if test x$HAVE_OSS != xyes; then
+@@ -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
diff --git a/multimedia/libtheora/patches/patch-ab b/multimedia/libtheora/patches/patch-ab
deleted file mode 100644
index edefd8b44b8..00000000000
--- a/multimedia/libtheora/patches/patch-ab
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2005/10/12 21:59:42 wiz Exp $
-
---- examples/Makefile.am.orig	2005-05-01 19:03:32.000000000 +0200
-+++ examples/Makefile.am
-@@ -11,10 +11,12 @@ AM_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS)
- LDADD = ../lib/libtheora.la $(OGG_LIBS)
- 
- dump_video_SOURCES = dump_video.c
--dump_video_LDADD = $(LDADD)
-+dump_video_LDADD = $(GETOPT_OBJS) $(LDADD)
-+dump_video_DEPENDENCIES = $(GETOPT_OBJS)
- 
- player_example_SOURCES = player_example.c
--player_example_LDADD = $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
-+player_example_LDADD = $(GETOPT_OBJS) $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
-+dump_video_DEPENDENCIES = $(GETOPT_OBJS)
- 
- encoder_example_SOURCES = encoder_example.c
- EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
diff --git a/multimedia/libtheora/patches/patch-ac b/multimedia/libtheora/patches/patch-ac
deleted file mode 100644
index 465e30ae353..00000000000
--- a/multimedia/libtheora/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2005/10/12 21:59:42 wiz Exp $
-
---- examples/Makefile.in.orig	2005-08-20 21:30:41.000000000 +0200
-+++ examples/Makefile.in
-@@ -225,9 +225,11 @@ INCLUDES = -I$(top_srcdir)/include 
- AM_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS)
- LDADD = ../lib/libtheora.la $(OGG_LIBS)
- dump_video_SOURCES = dump_video.c
--dump_video_LDADD = $(LDADD)
-+dump_video_LDADD = $(GETOPT_OBJS) $(LDADD)
-+dump_video_DEPENDENCIES = $(GETOPT_OBJS)
- player_example_SOURCES = player_example.c
--player_example_LDADD = $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
-+player_example_LDADD = $(GETOPT_OBJS) $(LDADD) $(SDL_LIBS) $(VORBIS_LIBS)
-+player_example_DEPENDENCIES = $(GETOPT_OBJS)
- encoder_example_SOURCES = encoder_example.c
- EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
- encoder_example_LDADD = $(GETOPT_OBJS) $(LDADD) $(VORBIS_LIBS) $(VORBISENC_LIBS)