From 7b3c35537d82254af139f176a63180e563f715de Mon Sep 17 00:00:00 2001 From: adam Date: Wed, 5 Jan 2005 12:20:37 +0000 Subject: Changes 1.2.6: * Added support for using the system version of libmikmod * Added SDL_RWops support for reading Ogg Vorbis files * Added 4 and 6 channel surround sound output support * Added support for RMID format MIDI files * Improved timidity support (reverb, chorus, Roland & Yamaha sysex dumps, etc.) * Fixed bug with MIDI volume in native Windows playback * Added SDL_RWops support for reading MOD files --- audio/SDL_mixer/Makefile | 21 +++++++++------------ audio/SDL_mixer/distinfo | 9 ++++----- audio/SDL_mixer/patches/patch-aa | 8 ++++---- audio/SDL_mixer/patches/patch-ab | 25 ------------------------- 4 files changed, 17 insertions(+), 46 deletions(-) delete mode 100644 audio/SDL_mixer/patches/patch-ab (limited to 'audio/SDL_mixer') diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile index 1dbcc92f969..aaf97aa3d99 100644 --- a/audio/SDL_mixer/Makefile +++ b/audio/SDL_mixer/Makefile @@ -1,24 +1,21 @@ -# $NetBSD: Makefile,v 1.17 2004/10/20 10:55:46 adam Exp $ -# +# $NetBSD: Makefile,v 1.18 2005/01/05 12:20:37 adam Exp $ -DISTNAME= SDL_mixer-1.2.5 -PKGREVISION= 4 -CATEGORIES= audio -MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ +DISTNAME= SDL_mixer-1.2.6 +CATEGORIES= audio +MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.libsdl.org/projects/SDL_mixer/ -COMMENT= Multi-channel audio mixer library +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.libsdl.org/projects/SDL_mixer/ +COMMENT= Multi-channel audio mixer library CONFLICTS= SDL-mixer-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews USE_BUILDLINK3= YES -GNU_CONFIGURE= YES -USE_X11= YES USE_LIBTOOL= YES - +USE_X11= YES +GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-music-ogg CPPFLAGS= -Dunix=1 diff --git a/audio/SDL_mixer/distinfo b/audio/SDL_mixer/distinfo index d06b127dc5e..01586c5222c 100644 --- a/audio/SDL_mixer/distinfo +++ b/audio/SDL_mixer/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2003/08/01 21:35:43 jmc Exp $ +$NetBSD: distinfo,v 1.5 2005/01/05 12:20:37 adam Exp $ -SHA1 (SDL_mixer-1.2.5.tar.gz) = 48c7c7143f0a0a21e94e743ca0fafd7ae33f62dd -Size (SDL_mixer-1.2.5.tar.gz) = 936765 bytes -SHA1 (patch-aa) = c55dcaf2251370131d90d6834eb8244c08342d98 -SHA1 (patch-ab) = 4af9bd3bdbd30d94f2cffdce7c7e4fb1154b0953 +SHA1 (SDL_mixer-1.2.6.tar.gz) = d8e09d87a750c4bd989f0a3e4f1b6baff601b8f1 +Size (SDL_mixer-1.2.6.tar.gz) = 1147838 bytes +SHA1 (patch-aa) = 8f6b53ee69251e666538dfdbaf1ff481c73eb7ef diff --git a/audio/SDL_mixer/patches/patch-aa b/audio/SDL_mixer/patches/patch-aa index 131bdc37484..2b36e08c153 100644 --- a/audio/SDL_mixer/patches/patch-aa +++ b/audio/SDL_mixer/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2003/05/11 02:23:19 salo Exp $ +$NetBSD: patch-aa,v 1.3 2005/01/05 12:20:37 adam Exp $ ---- timidity/config.h.orig Mon Mar 24 00:04:57 2003 -+++ timidity/config.h Mon Mar 24 00:06:06 2003 -@@ -206,7 +206,7 @@ +--- timidity/config.h.orig 2004-12-16 05:20:14.000000000 +0000 ++++ timidity/config.h +@@ -223,7 +223,7 @@ typedef char int8; /* You could specify a complete path, e.g. "/etc/timidity.cfg", and then specify the library directory in the configuration file. */ diff --git a/audio/SDL_mixer/patches/patch-ab b/audio/SDL_mixer/patches/patch-ab deleted file mode 100644 index 1c09d3d7d58..00000000000 --- a/audio/SDL_mixer/patches/patch-ab +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2003/07/30 17:21:08 grant Exp $ - ---- configure.orig 2003-03-07 06:29:16.000000000 +0000 -+++ configure 2003-07-29 12:14:17.192643000 +0100 -@@ -2458,16 +2458,11 @@ - } - else - { -- 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 --correct, then it is\n", major, minor, micro); -+ 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 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 --SMPEG_CONFIG\n"); -- printf("*** to point to the correct copy of smpeg-config, and remove --the file\n"); -+ 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 the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -- cgit v1.2.3