Update to FLAC 1.2.1. This version includes two and a half years

worth of changes and an altered API.

Bump the revision of all ports that depend on libFLAC and adapt to
the new API where necessary.  Some patches from Debian, Gentoo,
OpenBSD, and upstream repositories.

PR:	119476

3 files changed, 112 insertions, 4 deletions

diff --git a/audio/sdl_sound/Makefile b/audio/sdl_sound/Makefile
index 4c4bea3889bc..e4b4ba9dcbe4 100644
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sdl_sound
 PORTVERSION=	1.0.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	audio
 MASTER_SITES=	http://www.icculus.org/SDL_sound/downloads/
 DISTNAME=	SDL_sound-${PORTVERSION}
@@ -32,7 +32,7 @@ OPTIONS=	FLAC "Enable flac support" on \
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_FLAC)
-LIB_DEPENDS+=	FLAC.7:${PORTSDIR}/audio/flac
+LIB_DEPENDS+=	FLAC.10:${PORTSDIR}/audio/flac
 .else
 CONFIGURE_ARGS+=--disable-flac
 .endif
diff --git a/audio/sdl_sound/files/patch-configure b/audio/sdl_sound/files/patch-configure
index dd8de669db0e..991a930c5181 100644
--- a/audio/sdl_sound/files/patch-configure
+++ b/audio/sdl_sound/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	Mon Oct 13 03:54:57 2003
-+++ configure	Mon Oct 13 07:44:41 2003
+--- configure.orig	2003-10-12 20:54:57.000000000 +0200
++++ configure	2008-03-27 21:35:53.000000000 +0100
 @@ -6684,6 +6684,7 @@
  
  # This can be used to rebuild libtool when needed
@@ -8,3 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -7089,7 +7090,7 @@
+ 
+ fi
+ 
+-x="C__seekable_stream_decoder_process_single"
++x="C__stream_decoder_process_single"
+ flcsym="FLA$x"
+ # Check whether --enable-flac or --disable-flac was given.
+ if test "${enable_flac+set}" = set; then
diff --git a/audio/sdl_sound/files/patch-decoders_flac.c b/audio/sdl_sound/files/patch-decoders_flac.c
new file mode 100644
index 000000000000..22831e681c51
--- /dev/null
+++ b/audio/sdl_sound/files/patch-decoders_flac.c
@@ -0,0 +1,99 @@
+--- decoders/flac.c.orig	2003-03-10 23:44:14.000000000 +0100
++++ decoders/flac.c	2008-03-27 21:35:30.000000000 +0100
+@@ -44,42 +44,33 @@
+ #define __SDL_SOUND_INTERNAL__
+ #include "SDL_sound_internal.h"
+ 
+-#include <FLAC/seekable_stream_decoder.h>
++#include <FLAC/stream_decoder.h>
+ 
+-#define D_END_OF_STREAM               FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
++#define D_END_OF_STREAM               FLAC__STREAM_DECODER_END_OF_STREAM
+ 
+-#define d_new()                       FLAC__seekable_stream_decoder_new()
+-#define d_init(x)                     FLAC__seekable_stream_decoder_init(x)
+-#define d_process_metadata(x)         FLAC__seekable_stream_decoder_process_until_end_of_metadata(x)
+-#define d_process_one_frame(x)        FLAC__seekable_stream_decoder_process_single(x)
+-#define d_get_state(x)                FLAC__seekable_stream_decoder_get_state(x)
+-#define d_finish(x)                   FLAC__seekable_stream_decoder_finish(x)
+-#define d_delete(x)                   FLAC__seekable_stream_decoder_delete(x)
+-#define d_set_read_callback(x, y)     FLAC__seekable_stream_decoder_set_read_callback(x, y)
+-#define d_set_write_callback(x, y)    FLAC__seekable_stream_decoder_set_write_callback(x, y)
+-#define d_set_metadata_callback(x, y) FLAC__seekable_stream_decoder_set_metadata_callback(x, y)
+-#define d_set_error_callback(x, y)    FLAC__seekable_stream_decoder_set_error_callback(x, y)
+-#define d_set_client_data(x, y)       FLAC__seekable_stream_decoder_set_client_data(x, y)
+-
+-typedef FLAC__SeekableStreamDecoder           decoder_t;
+-typedef FLAC__SeekableStreamDecoderReadStatus d_read_status_t;
+-
+-#define D_SEEK_STATUS_OK              FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK
+-#define D_SEEK_STATUS_ERROR           FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR
+-#define D_TELL_STATUS_OK              FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK
+-#define D_TELL_STATUS_ERROR           FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR
+-#define D_LENGTH_STATUS_OK            FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK
+-#define D_LENGTH_STATUS_ERROR         FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR
+-
+-#define d_set_seek_callback(x, y)     FLAC__seekable_stream_decoder_set_seek_callback(x, y)
+-#define d_set_tell_callback(x, y)     FLAC__seekable_stream_decoder_set_tell_callback(x, y)
+-#define d_set_length_callback(x, y)   FLAC__seekable_stream_decoder_set_length_callback(x, y)
+-#define d_set_eof_callback(x, y)      FLAC__seekable_stream_decoder_set_eof_callback(x, y)
+-#define d_seek_absolute(x, y)         FLAC__seekable_stream_decoder_seek_absolute(x, y)
+-
+-typedef FLAC__SeekableStreamDecoderSeekStatus   d_seek_status_t;
+-typedef FLAC__SeekableStreamDecoderTellStatus   d_tell_status_t;
+-typedef FLAC__SeekableStreamDecoderLengthStatus d_length_status_t;
++#define d_new()                       FLAC__stream_decoder_new()
++#define d_init(a,b,c,d,e,f,g,h,i,j)   FLAC__stream_decoder_init_stream(a,b,c,d,e,f,g,h,i,j)
++#define d_process_metadata(x)         FLAC__stream_decoder_process_until_end_of_metadata(x)
++#define d_process_one_frame(x)        FLAC__stream_decoder_process_single(x)
++#define d_get_state(x)                FLAC__stream_decoder_get_state(x)
++#define d_finish(x)                   FLAC__stream_decoder_finish(x)
++#define d_delete(x)                   FLAC__stream_decoder_delete(x)
++
++typedef FLAC__StreamDecoder           decoder_t;
++typedef FLAC__StreamDecoderReadStatus d_read_status_t;
++
++#define D_SEEK_STATUS_OK              FLAC__STREAM_DECODER_SEEK_STATUS_OK
++#define D_SEEK_STATUS_ERROR           FLAC__STREAM_DECODER_SEEK_STATUS_ERROR
++#define D_TELL_STATUS_OK              FLAC__STREAM_DECODER_TELL_STATUS_OK
++#define D_TELL_STATUS_ERROR           FLAC__STREAM_DECODER_TELL_STATUS_ERROR
++#define D_LENGTH_STATUS_OK            FLAC__STREAM_DECODER_LENGTH_STATUS_OK
++#define D_LENGTH_STATUS_ERROR         FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR
++
++#define d_seek_absolute(x, y)         FLAC__stream_decoder_seek_absolute(x, y)
++
++typedef FLAC__StreamDecoderSeekStatus   d_seek_status_t;
++typedef FLAC__StreamDecoderTellStatus   d_tell_status_t;
++typedef FLAC__StreamDecoderLengthStatus d_length_status_t;
+ 
+ #define D_WRITE_CONTINUE     FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE
+ #define D_READ_END_OF_STREAM FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM
+@@ -400,17 +391,6 @@
+         BAIL_MACRO(ERR_OUT_OF_MEMORY, 0);
+     } /* if */       
+ 
+-    d_set_read_callback(decoder, read_callback);
+-    d_set_write_callback(decoder, write_callback);
+-    d_set_metadata_callback(decoder, metadata_callback);
+-    d_set_error_callback(decoder, error_callback);
+-    d_set_seek_callback(decoder, seek_callback);
+-    d_set_tell_callback(decoder, tell_callback);
+-    d_set_length_callback(decoder, length_callback);
+-    d_set_eof_callback(decoder, eof_callback);
+-
+-    d_set_client_data(decoder, f);
+-
+     f->rw = internal->rw;
+     f->sample = sample;
+     f->decoder = decoder;
+@@ -418,7 +398,9 @@
+     f->is_flac = 0 /* !!! FIXME: should be "has_extension", not "0". */;
+ 
+     internal->decoder_private = f;
+-    d_init(decoder);
++    d_init(decoder, read_callback, seek_callback, tell_callback,
++        length_callback, eof_callback, write_callback, metadata_callback,
++        error_callback, f);
+ 
+     sample->flags = SOUND_SAMPLEFLAG_NONE;
+