summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/SDL_sound/Makefile7
-rw-r--r--audio/SDL_sound/PLIST3
-rw-r--r--audio/SDL_sound/buildlink3.mk7
-rw-r--r--audio/SDL_sound/distinfo10
-rw-r--r--audio/SDL_sound/patches/patch-aa33
-rw-r--r--audio/SDL_sound/patches/patch-ac101
6 files changed, 14 insertions, 147 deletions
diff --git a/audio/SDL_sound/Makefile b/audio/SDL_sound/Makefile
index 0f7c56b3834..e208fe7cc71 100644
--- a/audio/SDL_sound/Makefile
+++ b/audio/SDL_sound/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2007/12/16 14:33:53 heinz Exp $
+# $NetBSD: Makefile,v 1.21 2008/04/22 21:23:41 wiz Exp $
#
-DISTNAME= SDL_sound-1.0.1
-PKGREVISION= 6
+DISTNAME= SDL_sound-1.0.2
CATEGORIES= audio
MASTER_SITES= http://icculus.org/SDL_sound/downloads/
@@ -18,6 +17,8 @@ USE_LIBTOOL= YES
.include "../../audio/flac/buildlink3.mk"
.include "../../audio/libmikmod/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/speex/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/physfs/buildlink3.mk"
.include "../../multimedia/smpeg/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/SDL_sound/PLIST b/audio/SDL_sound/PLIST
index 9afce801e58..d2925b46f44 100644
--- a/audio/SDL_sound/PLIST
+++ b/audio/SDL_sound/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:14 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/22 21:23:41 wiz Exp $
bin/playsound
+bin/playsound_simple
include/SDL/SDL_sound.h
lib/libSDL_sound.la
diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk
index 4c665cb003b..364388eb651 100644
--- a/audio/SDL_sound/buildlink3.mk
+++ b/audio/SDL_sound/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2006/07/08 23:10:35 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2008/04/22 21:23:41 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_SOUND_BUILDLINK3_MK:= ${SDL_SOUND_BUILDLINK3_MK}+
@@ -13,13 +13,14 @@ BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}SDL_sound
.if !empty(SDL_SOUND_BUILDLINK3_MK:M+)
BUILDLINK_API_DEPENDS.SDL_sound+= SDL_sound>=1.0.1
-BUILDLINK_ABI_DEPENDS.SDL_sound+= SDL_sound>=1.0.1nb5
+BUILDLINK_ABI_DEPENDS.SDL_sound+= SDL_sound>=1.0.2
BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound
.endif # SDL_SOUND_BUILDLINK3_MK
+.include "../../audio/flac/buildlink3.mk"
.include "../../audio/libmikmod/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
+.include "../../audio/speex/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
-.include "../../multimedia/smpeg/buildlink3.mk"
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
diff --git a/audio/SDL_sound/distinfo b/audio/SDL_sound/distinfo
index 98f13232dc9..ba04f5cc29e 100644
--- a/audio/SDL_sound/distinfo
+++ b/audio/SDL_sound/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2007/01/13 23:36:28 wiz Exp $
+$NetBSD: distinfo,v 1.5 2008/04/22 21:23:41 wiz Exp $
-SHA1 (SDL_sound-1.0.1.tar.gz) = 9cb8550facf64f941179ba5767f763d1d52ddd6b
-RMD160 (SDL_sound-1.0.1.tar.gz) = 28d934d604e5db9b3b0b681785406587323ea765
-Size (SDL_sound-1.0.1.tar.gz) = 1019056 bytes
-SHA1 (patch-aa) = 466578457c3c38012f5ef63632ad58a0d70675f1
-SHA1 (patch-ac) = 7c5151593785538390abc27a3ef6322fc9e5e5b1
+SHA1 (SDL_sound-1.0.2.tar.gz) = 227af9a37067a92d7ebe11f117699e50125f8ff3
+RMD160 (SDL_sound-1.0.2.tar.gz) = 8d1a94b9933930eff137e0435144ef13de3c10a4
+Size (SDL_sound-1.0.2.tar.gz) = 1126960 bytes
diff --git a/audio/SDL_sound/patches/patch-aa b/audio/SDL_sound/patches/patch-aa
deleted file mode 100644
index 996f613ae88..00000000000
--- a/audio/SDL_sound/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2007/01/13 23:36:28 wiz Exp $
-
---- configure.orig 2003-10-12 18:54:57.000000000 +0000
-+++ configure
-@@ -7089,7 +7089,7 @@ EOF
-
- 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
-@@ -7363,15 +7363,15 @@ int main (int argc, char *argv[])
- }
- else
- {
-- printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the
-+ printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the \
- minimum version\n", $smpeg_major_version, $smpeg_minor_version,
- $smpeg_micro_version);
-- printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is
-+ printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is \
- correct, then it is\n", major, minor, micro);
- printf("*** best to upgrade to the required version.\n");
-- printf("*** If smpeg-config was wrong, set the environment variable
-+ printf("*** If smpeg-config was wrong, set the environment variable \
- SMPEG_CONFIG\n");
-- printf("*** to point to the correct copy of smpeg-config, and remove
-+ printf("*** to point to the correct copy of smpeg-config, and remove \
- the file\n");
- printf("*** config.cache before re-running configure\n");
- return 1;
diff --git a/audio/SDL_sound/patches/patch-ac b/audio/SDL_sound/patches/patch-ac
deleted file mode 100644
index cece50c1f25..00000000000
--- a/audio/SDL_sound/patches/patch-ac
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/13 23:36:28 wiz Exp $
-
---- decoders/flac.c.orig 2003-03-10 22:44:14.000000000 +0000
-+++ decoders/flac.c
-@@ -44,6 +44,16 @@
- #define __SDL_SOUND_INTERNAL__
- #include "SDL_sound_internal.h"
-
-+#include <FLAC/export.h>
-+
-+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
-+#ifdef LEGACY_FLAC
- #include <FLAC/seekable_stream_decoder.h>
-
- #define D_END_OF_STREAM FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
-@@ -80,6 +90,34 @@ typedef FLAC__SeekableStreamDecoderReadS
- typedef FLAC__SeekableStreamDecoderSeekStatus d_seek_status_t;
- typedef FLAC__SeekableStreamDecoderTellStatus d_tell_status_t;
- typedef FLAC__SeekableStreamDecoderLengthStatus d_length_status_t;
-+#else
-+#include <FLAC/stream_decoder.h>
-+
-+#define D_END_OF_STREAM FLAC__STREAM_DECODER_END_OF_STREAM
-+
-+#define d_new() FLAC__stream_decoder_new()
-+#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;
-+#endif
-
- #define D_WRITE_CONTINUE FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE
- #define D_READ_END_OF_STREAM FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM
-@@ -141,9 +179,15 @@ static void free_flac(flac_t *f)
- } /* free_flac */
-
-
-+#ifdef LEGACY_FLAC
- static d_read_status_t read_callback(
- const decoder_t *decoder, FLAC__byte buffer[],
- unsigned int *bytes, void *client_data)
-+#else
-+static d_read_status_t read_callback(
-+ const decoder_t *decoder, FLAC__byte buffer[],
-+ size_t *bytes, void *client_data)
-+#endif
- {
- flac_t *f = (flac_t *) client_data;
- Uint32 retval;
-@@ -400,6 +444,7 @@ static int FLAC_open(Sound_Sample *sampl
- BAIL_MACRO(ERR_OUT_OF_MEMORY, 0);
- } /* if */
-
-+#ifdef LEGACY_FLAC
- d_set_read_callback(decoder, read_callback);
- d_set_write_callback(decoder, write_callback);
- d_set_metadata_callback(decoder, metadata_callback);
-@@ -410,6 +455,7 @@ static int FLAC_open(Sound_Sample *sampl
- d_set_eof_callback(decoder, eof_callback);
-
- d_set_client_data(decoder, f);
-+#endif
-
- f->rw = internal->rw;
- f->sample = sample;
-@@ -418,7 +464,12 @@ static int FLAC_open(Sound_Sample *sampl
- f->is_flac = 0 /* !!! FIXME: should be "has_extension", not "0". */;
-
- internal->decoder_private = f;
-+ /* really should check the init return value here: */
-+#ifdef LEGACY_FLAC
- d_init(decoder);
-+#else
-+ FLAC__stream_decoder_init_stream(decoder, read_callback, seek_callback, tell_callback, length_callback, eof_callback, write_callback, metadata_callback, error_callback, f);
-+#endif
-
- sample->flags = SOUND_SAMPLEFLAG_NONE;
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-20 17:29:12 +0000