From 576534810a11fcdb358e474743524aa55d7cff43 Mon Sep 17 00:00:00 2001 From: cube Date: Sun, 18 Jan 2004 13:51:15 +0000 Subject: Update to version 1.0.1, and fix gcc-3 bug in configure script. Changes: 10102003 - Changed some SDL_Error()s to __Sound_SetError() in new DLS code to fix linking issues. 10052003 - Fixed memory corruption when freeing DLS instruments, and bug when timidity is initialized multiple times (Thanks, Sam!). 09252003 - Sam Lantinga added support for DLS instruments to the MIDI decoder. 09132003 - Happy September. Added Speex (.spx) decoder. 08052003 - Fixed MIDI decoder on bigendian systems. 03102003 - Never actually created samplelist_mutex (Thanks, Glenn Maynard!). 01122003 - Fix to smpeg.c's rewinding code (Thanks, Eric). 12212002 - Fixed ogg.c to decode a full buffer at a time instead of one ogg packet per call, and mikmod has a check during initialization to prevent a clash with SDL_mixer (Thanks, Eric). 12092002 - Changed Sound_Init()'s call to SDL_Init() to SDL_InitSubSystem(), to prevent unwanted use of the SDL parachute (thanks, Glenn). --- audio/SDL_sound/DESCR | 23 ++++++++++++----------- audio/SDL_sound/Makefile | 7 +++---- audio/SDL_sound/PLIST | 6 +++--- audio/SDL_sound/buildlink2.mk | 4 ++-- audio/SDL_sound/distinfo | 7 ++++--- audio/SDL_sound/patches/patch-aa | 24 ++++++++++++++++++++++++ 6 files changed, 48 insertions(+), 23 deletions(-) create mode 100644 audio/SDL_sound/patches/patch-aa (limited to 'audio/SDL_sound') diff --git a/audio/SDL_sound/DESCR b/audio/SDL_sound/DESCR index b9bd948a878..138d90a28c5 100644 --- a/audio/SDL_sound/DESCR +++ b/audio/SDL_sound/DESCR @@ -1,11 +1,12 @@ -SDL_sound is a library that handles the decoding of several popular -sound file formats, such as .WAV and .MP3. It is meant to make the -programmer's sound playback tasks simpler. The programmer gives -SDL_sound a filename, or feeds it data directly from one of many -sources, and then reads the decoded waveform data back at her -leisure. If resource constraints are a concern, SDL_sound can -process sound data in programmer-specified blocks. Alternately, -SDL_sound can decode a whole sound file and hand back a single -pointer to the whole waveform. SDL_sound can also handle sample -rate, audio format, and channel conversion on-the-fly and behind-the- -scenes, if the programmer desires. +SDL_sound is a library that handles the decoding of several popular sound file +formats, such as .WAV and .MP3. It is meant to make the programmer's sound +playback tasks simpler. + +The programmer gives SDL_sound a filename, or feeds it data directly from one +of many sources, and then reads the decoded waveform data back at her leisure. + +If resource constraints are a concern, SDL_sound can process sound data in +programmer-specified blocks. Alternately, SDL_sound can decode a whole sound +file and hand back a single pointer to the whole waveform. SDL_sound can also +handle sample rate, audio format, and channel conversion on-the-fly and +behind-the-scenes, if the programmer desires. diff --git a/audio/SDL_sound/Makefile b/audio/SDL_sound/Makefile index 34d1f7c5c4b..f19a48715d2 100644 --- a/audio/SDL_sound/Makefile +++ b/audio/SDL_sound/Makefile @@ -1,12 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2003/12/08 14:41:38 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2004/01/18 13:51:15 cube Exp $ # -DISTNAME= SDL_sound-1.0.0 -PKGREVISION= 4 +DISTNAME= SDL_sound-1.0.1 CATEGORIES= audio MASTER_SITES= http://icculus.org/SDL_sound/downloads/ -MAINTAINER= cube@cubidou.net +MAINTAINER= cube@NetBSD.org HOMEPAGE= http://icculus.org/SDL_sound/ COMMENT= SDL library to handle the decoding of different file formats diff --git a/audio/SDL_sound/PLIST b/audio/SDL_sound/PLIST index 6f1a95c7315..58f1776e2cb 100644 --- a/audio/SDL_sound/PLIST +++ b/audio/SDL_sound/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/03/26 22:48:26 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/01/18 13:51:15 cube Exp $ bin/playsound include/SDL/SDL_sound.h lib/libSDL_sound-1.0.so -lib/libSDL_sound-1.0.so.0 -lib/libSDL_sound-1.0.so.0.0 +lib/libSDL_sound-1.0.so.1 +lib/libSDL_sound-1.0.so.1.0 lib/libSDL_sound.a lib/libSDL_sound.la lib/libSDL_sound.so diff --git a/audio/SDL_sound/buildlink2.mk b/audio/SDL_sound/buildlink2.mk index 18d80198b21..1a4773af43b 100644 --- a/audio/SDL_sound/buildlink2.mk +++ b/audio/SDL_sound/buildlink2.mk @@ -1,10 +1,10 @@ -# $NetBSD: buildlink2.mk,v 1.5 2003/12/08 14:41:38 wiz Exp $ +# $NetBSD: buildlink2.mk,v 1.6 2004/01/18 13:51:15 cube Exp $ .if !defined(SDL_SOUND_BUILDLINK2_MK) SDL_SOUND_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= SDL_sound -BUILDLINK_DEPENDS.SDL_sound?= SDL_sound>=1.0.0nb4 +BUILDLINK_DEPENDS.SDL_sound?= SDL_sound>=1.0.1 BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound EVAL_PREFIX+= BUILDLINK_PREFIX.SDL_sound=SDL_sound diff --git a/audio/SDL_sound/distinfo b/audio/SDL_sound/distinfo index 1aee55cddf7..d8ab794ce7d 100644 --- a/audio/SDL_sound/distinfo +++ b/audio/SDL_sound/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/03/26 22:48:26 wiz Exp $ +$NetBSD: distinfo,v 1.2 2004/01/18 13:51:15 cube Exp $ -SHA1 (SDL_sound-1.0.0.tar.gz) = ec0651919b1d5337dc69a70f181e2827be24dde7 -Size (SDL_sound-1.0.0.tar.gz) = 952534 bytes +SHA1 (SDL_sound-1.0.1.tar.gz) = 9cb8550facf64f941179ba5767f763d1d52ddd6b +Size (SDL_sound-1.0.1.tar.gz) = 1019056 bytes +SHA1 (patch-aa) = b65a1ff2fc5f75dfb5e1e05c6aa74318836792fd diff --git a/audio/SDL_sound/patches/patch-aa b/audio/SDL_sound/patches/patch-aa new file mode 100644 index 00000000000..ecb5b962857 --- /dev/null +++ b/audio/SDL_sound/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.1 2004/01/18 13:51:15 cube Exp $ + +--- configure.orig 2003-10-12 20:54:57.000000000 +0200 ++++ configure +@@ -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; -- cgit v1.2.3