- Update to 1.0.3
PR: 130871 Submitted by: Marcus von Appen <mva at sysfault dot org>
This commit is contained in:
Dmitry Marakasov
parent
f9bb0344ff
commit
00336724d6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=227576
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= sdl_sound
|
||||
PORTVERSION= 1.0.1
|
||||
PORTREVISION= 14
|
||||
PORTVERSION= 1.0.3
|
||||
CATEGORIES= audio
|
||||
MASTER_SITES= http://www.icculus.org/SDL_sound/downloads/
|
||||
DISTNAME= SDL_sound-${PORTVERSION}
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
MD5 (SDL_sound-1.0.1.tar.gz) = 49e197ef7c8ab623d0640dc74be43160
|
||||
SHA256 (SDL_sound-1.0.1.tar.gz) = 8289b483d994283d599686643d402d073c8dd6c067a9c5b232a7e3e03eca4089
|
||||
SIZE (SDL_sound-1.0.1.tar.gz) = 1019056
|
||||
MD5 (SDL_sound-1.0.3.tar.gz) = aa09cd52df85d29bee87a664424c94b5
|
||||
SHA256 (SDL_sound-1.0.3.tar.gz) = 3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df
|
||||
SIZE (SDL_sound-1.0.3.tar.gz) = 1127100
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
--- 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
|
||||
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
|
||||
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
|
||||
|
||||
# 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
|
||||
@ -1,99 +0,0 @@
|
||||
--- 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;
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
bin/playsound
|
||||
bin/playsound_simple
|
||||
include/SDL/SDL_sound.h
|
||||
lib/libSDL_sound.a
|
||||
lib/libSDL_sound.la
|
||||
|
||||
Loading…
Reference in New Issue
Block a user