From dbb9029d22cbb75b138d5c907bc1b23649426e67 Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 31 Oct 2009 00:16:40 +0000 Subject: Update to 1.2.9. Set LICENSE. Remove dynamically loaded libraries from buildlink3.mk. 1.2.9: Ryan Gordon - Sun Oct 18 11:42:31 PDT 2009 * Updated native MIDI support on Mac OS X for 10.6 Ryan Gordon - Sun Oct 11 05:29:55 2009 UTC * Reset channel volumes after a fade out interrupts a fade in. Ryan Gordon - Sun Oct 11 02:59:12 2009 UTC * Fixed crash race condition with position audio functions Ryan Gordon - Sat Oct 10 17:05:45 2009 UTC * Fixed stereo panning in 8-bit mode Sam Lantinga - Sat Oct 10 11:07:15 2009 UTC * Added /usr/share/timidity to the default timidity.cfg locations Sam Lantinga - Sat Oct 3 13:33:36 PDT 2009 * MOD support uses libmikmod and is dynamically loaded by default * A patched version of libmikmod is included in libmikmod-3.1.12.zip * The libmikmod patches fix security issues CVE-2007-6720 and CVE-2009-0179. Sam Lantinga - Sat Oct 3 02:49:41 PDT 2009 * Added TIMIDITY_CFG environment variable to fully locate timidity.cfg Sam Lantinga - Fri Oct 2 07:15:35 PDT 2009 * Implemented seamless looping for music playback Forrest Voight - 2009-06-13 20:31:38 PDT * ID3 files are now recognized as MP3 format Steven Noonan - 2008-05-13 13:31:36 PDT * Fixed native MIDI crash on 64-bit Windows Ryan Gordon - Fri Jun 5 16:07:08 2009 UTC * Added decoder enumeration API: Mix_GetNumChunkDecoders(), Mix_GetChunkDecoder(), Mix_GetNumMusicDecoders(), Mix_GetMusicDecoder() Austen Dicken - Tue Feb 26 23:28:27 PST 2008 * Added support for FLAC audio both as chunks and streaming Tilman Sauerbeck - Tue Feb 26 03:44:47 PST 2008 * Added support for streaming WAV files with Mix_LoadMUS_RW() Ryan Gordon - Mon Feb 4 17:10:08 UTC 2008 * Fixed crash caused by not resetting position_channels --- audio/SDL_mixer/Makefile | 10 ++++++++-- audio/SDL_mixer/PLIST | 3 ++- audio/SDL_mixer/buildlink3.mk | 6 ++---- audio/SDL_mixer/distinfo | 12 ++++++------ audio/SDL_mixer/patches/patch-aa | 8 ++++---- audio/SDL_mixer/patches/patch-ab | 12 ++++++------ 6 files changed, 28 insertions(+), 23 deletions(-) (limited to 'audio') diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile index a055b4c1d6b..d91e52a6734 100644 --- a/audio/SDL_mixer/Makefile +++ b/audio/SDL_mixer/Makefile @@ -1,21 +1,25 @@ -# $NetBSD: Makefile,v 1.35 2007/07/26 00:03:27 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2009/10/31 00:16:40 wiz Exp $ -DISTNAME= SDL_mixer-1.2.8 +DISTNAME= SDL_mixer-1.2.9 CATEGORIES= audio MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.libsdl.org/projects/SDL_mixer/ COMMENT= Multi-channel audio mixer library +LICENSE= gnu-lgpl-v2.1 PKG_DESTDIR_SUPPORT= user-destdir +MAKE_JOBS_SAFE= no CONFLICTS= SDL-mixer-[0-9]* PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes +USE_TOOLS+= gmake GNU_CONFIGURE= yes +PKGCONFIG_OVERRIDE= SDL_mixer.pc.in .include "../../mk/bsd.prefs.mk" @@ -32,6 +36,8 @@ post-install: BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.10 +.include "../../audio/flac/buildlink3.mk" +.include "../../audio/libmikmod/buildlink3.mk" .include "../../audio/libvorbis/buildlink3.mk" .include "../../devel/SDL/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" diff --git a/audio/SDL_mixer/PLIST b/audio/SDL_mixer/PLIST index a3dfdff1fb8..934ba801fb8 100644 --- a/audio/SDL_mixer/PLIST +++ b/audio/SDL_mixer/PLIST @@ -1,5 +1,6 @@ -@comment $NetBSD: PLIST,v 1.4 2004/09/22 08:09:14 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2009/10/31 00:16:40 wiz Exp $ bin/playmus bin/playwave include/SDL/SDL_mixer.h lib/libSDL_mixer.la +lib/pkgconfig/SDL_mixer.pc diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk index eea88f735fb..c37b52730c8 100644 --- a/audio/SDL_mixer/buildlink3.mk +++ b/audio/SDL_mixer/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2009/03/20 19:23:51 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2009/10/31 00:16:40 wiz Exp $ BUILDLINK_TREE+= SDL_mixer @@ -10,9 +10,7 @@ BUILDLINK_ABI_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.6nb5 BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer BUILDLINK_INCDIRS.SDL_mixer?= include/SDL -.include "../../audio/libvorbis/buildlink3.mk" -.include "../../multimedia/libogg/buildlink3.mk" -.include "../../multimedia/smpeg/buildlink3.mk" +.include "../../devel/SDL/buildlink3.mk" .endif # SDL_MIXER_BUILDLINK3_MK BUILDLINK_TREE+= -SDL_mixer diff --git a/audio/SDL_mixer/distinfo b/audio/SDL_mixer/distinfo index 11226616ce1..e88eb43c47b 100644 --- a/audio/SDL_mixer/distinfo +++ b/audio/SDL_mixer/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.10 2007/07/26 00:03:27 wiz Exp $ +$NetBSD: distinfo,v 1.11 2009/10/31 00:16:40 wiz Exp $ -SHA1 (SDL_mixer-1.2.8.tar.gz) = 7fa56d378f9ca53434f9470aeb2997ad84a348c6 -RMD160 (SDL_mixer-1.2.8.tar.gz) = f2188b907aa779bb81415ac6726ad7f496357b85 -Size (SDL_mixer-1.2.8.tar.gz) = 2096559 bytes -SHA1 (patch-aa) = fb2d442a918936fabf427abf883df4605e219f37 -SHA1 (patch-ab) = 309c5879cad60e8975f2c4e36669a8708b5f996a +SHA1 (SDL_mixer-1.2.9.tar.gz) = 33c43d868ec7a30de1a44a6ac05e5419b5ff53df +RMD160 (SDL_mixer-1.2.9.tar.gz) = d39692a5fafe9035443d22ef8a3e91d4a38e787a +Size (SDL_mixer-1.2.9.tar.gz) = 2690835 bytes +SHA1 (patch-aa) = 7bedbb6794333233d0e4f9951dcc709b3fe06a22 +SHA1 (patch-ab) = c4d7ae3bd9a5e92ad8e457b180541aa270f22a46 diff --git a/audio/SDL_mixer/patches/patch-aa b/audio/SDL_mixer/patches/patch-aa index 4c21f2fcace..7d48ddb9310 100644 --- a/audio/SDL_mixer/patches/patch-aa +++ b/audio/SDL_mixer/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.5 2006/07/07 06:52:46 adam Exp $ +$NetBSD: patch-aa,v 1.6 2009/10/31 00:16:40 wiz Exp $ ---- timidity/config.h.orig 2006-05-01 09:25:52.000000000 +0200 +--- timidity/config.h.orig 2009-10-12 23:06:52.000000000 +0000 +++ timidity/config.h -@@ -169,7 +169,7 @@ typedef char int8; +@@ -171,7 +171,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. */ -#define CONFIG_FILE "timidity.cfg" +#define CONFIG_FILE SYSCONFDIR"/timidity.cfg" #define CONFIG_FILE_ETC "/etc/timidity.cfg" - #define CONFIG_FILE_ETC_TIMIDITY "/etc/timidity/timidity.cfg" + #if defined(__WIN32__) || defined(__OS2__) diff --git a/audio/SDL_mixer/patches/patch-ab b/audio/SDL_mixer/patches/patch-ab index 5e07ed507ae..6ce5fa49ff4 100644 --- a/audio/SDL_mixer/patches/patch-ab +++ b/audio/SDL_mixer/patches/patch-ab @@ -1,9 +1,9 @@ -$NetBSD: patch-ab,v 1.3 2006/09/17 15:59:44 joerg Exp $ +$NetBSD: patch-ab,v 1.4 2009/10/31 00:16:40 wiz Exp $ ---- Makefile.in.orig 2006-09-17 17:53:06.000000000 +0000 +--- Makefile.in.orig 2009-10-12 23:06:53.000000000 +0000 +++ Makefile.in -@@ -57,10 +57,10 @@ $(objects): - $(SHELL) $(auxdir)/mkinstalldirs $@ +@@ -75,10 +75,10 @@ $(objects)/$(TARGET): $(OBJECTS) $(VERSI + $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) - $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) @@ -13,5 +13,5 @@ $NetBSD: patch-ab,v 1.3 2006/09/17 15:59:44 joerg Exp $ - $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) - .PHONY: all depend install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist - depend: + install: all install-hdrs install-lib #install-bin + install-hdrs: -- cgit v1.2.3