summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2006-07-07 06:52:46 +0000
committeradam <adam@pkgsrc.org>2006-07-07 06:52:46 +0000
commit6d74af81be2fba4957900edc119698780e55125c (patch)
treed85ec37c304be11a877fa1ba3985f0e7386c5bbc /audio
parent51dc91185ded90c884a925ee646cc5dc236c0beb (diff)
downloadpkgsrc-6d74af81be2fba4957900edc119698780e55125c.tar.gz
Changes 1.2.7:
* Added support for dynamically loading SMPEG library * Added support for dynamically loading Ogg Vorbis library * Removed automake dependency, to allow Universal binaries on Mac OS X * Added gcc-fat.sh for generating Universal binaries on Mac OS X * Updated libtool support to version 1.5.22 * Use SDL_RWops also for native midi mac and win32 * Use SDL_RWops also for native midi gpl (todo: mac and win32) * Tweaked Mix_Chunk's definition to make predeclaration easier. * Search timidity.cfg also in /etc * Fix memory leaks in timidity player * Use also SDL_RWops to read midifiles for timidity * Patch from Eric Wing to fix native midi compiling on MacOS/x86. * Disabled support for the system version of libmikmod by default * Fixed building mikmod support on UNIX * Always build SDL_RWops music support * Added SDL_RWops support for reading MP3 files
Diffstat (limited to 'audio')
-rw-r--r--audio/SDL_mixer/Makefile15
-rw-r--r--audio/SDL_mixer/distinfo10
-rw-r--r--audio/SDL_mixer/patches/patch-aa12
3 files changed, 19 insertions, 18 deletions
diff --git a/audio/SDL_mixer/Makefile b/audio/SDL_mixer/Makefile
index ae5e61618e6..0a7b8fc2bad 100644
--- a/audio/SDL_mixer/Makefile
+++ b/audio/SDL_mixer/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2006/06/12 16:28:05 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2006/07/07 06:52:46 adam Exp $
-DISTNAME= SDL_mixer-1.2.6
-PKGREVISION= 5
+DISTNAME= SDL_mixer-1.2.7
CATEGORIES= audio
MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/
@@ -13,8 +12,8 @@ CONFLICTS= SDL-mixer-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_LIBTOOL= YES
-GNU_CONFIGURE= YES
+USE_LIBTOOL= yes
+GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
@@ -24,8 +23,10 @@ CFLAGS+= -DSYSCONFDIR="\"${PKG_SYSCONFDIR}\""
INSTALLATION_DIRS= bin
post-install:
- ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playmus ${PREFIX}/bin
- ${LIBTOOL} ${INSTALL_PROGRAM} ${WRKSRC}/playwave ${PREFIX}/bin
+ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
+ ${WRKSRC}/build/playmus ${PREFIX}/bin
+ ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
+ ${WRKSRC}/build/playwave ${PREFIX}/bin
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../multimedia/libogg/buildlink3.mk"
diff --git a/audio/SDL_mixer/distinfo b/audio/SDL_mixer/distinfo
index 93bb7f21c93..0f22c397aa0 100644
--- a/audio/SDL_mixer/distinfo
+++ b/audio/SDL_mixer/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/06/01 14:11:26 wiz Exp $
+$NetBSD: distinfo,v 1.8 2006/07/07 06:52:46 adam Exp $
-SHA1 (SDL_mixer-1.2.6.tar.gz) = d8e09d87a750c4bd989f0a3e4f1b6baff601b8f1
-RMD160 (SDL_mixer-1.2.6.tar.gz) = f20e3b7db266d9a0da75f2319dcc403d869907e6
-Size (SDL_mixer-1.2.6.tar.gz) = 1147838 bytes
-SHA1 (patch-aa) = 1e4de54337d13e3c8407ca4bd6cc0b8777b6992f
+SHA1 (SDL_mixer-1.2.7.tar.gz) = 42b351360ea9debb2bec23e7e67ba355ec3762a9
+RMD160 (SDL_mixer-1.2.7.tar.gz) = cacb218f966d35cc66c663c0ce65b148869c08c3
+Size (SDL_mixer-1.2.7.tar.gz) = 1960614 bytes
+SHA1 (patch-aa) = fb2d442a918936fabf427abf883df4605e219f37
diff --git a/audio/SDL_mixer/patches/patch-aa b/audio/SDL_mixer/patches/patch-aa
index d6aa6aec985..4c21f2fcace 100644
--- a/audio/SDL_mixer/patches/patch-aa
+++ b/audio/SDL_mixer/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2005/06/01 14:11:26 wiz Exp $
+$NetBSD: patch-aa,v 1.5 2006/07/07 06:52:46 adam Exp $
---- timidity/config.h.orig 2004-12-16 05:20:14.000000000 +0000
+--- timidity/config.h.orig 2006-05-01 09:25:52.000000000 +0200
+++ timidity/config.h
-@@ -223,7 +223,7 @@ typedef char int8;
+@@ -169,7 +169,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"
- #ifdef __WIN32__
- #define DEFAULT_PATH "\\TIMIDITY"
- #else
+ #define CONFIG_FILE_ETC "/etc/timidity.cfg"
+ #define CONFIG_FILE_ETC_TIMIDITY "/etc/timidity/timidity.cfg"
+