Update to 3.2.0:

libmikmod 3.2.0 was released on 01-June-2012.

THANKS

- Axel "awe" Wefers <awe@fruitz-of-dojo.de>,
  for creating the CoreAudio driver, the new
  AIFF driver, and fixes for the wav output driver.
- Frank Loemker, for sending me his collection of patches
  for libmikmod.
- Anders F Björklund <afb@algonet.se>, for updates, fixes and tests on
  Mac Platforms and rpm support.
- Ivan Shmakov, for the NAS audio driver.
- Various downstream patch writers (from Mandriva, SuSE, Red Hat/Fedora,
Debian, etc.)
- P. Martin - the macports maintainer for some patches.
- Stéphan Kochen for two patches: one to change MDRIVER fields to "const",
and the other with putting variable declarations at the start of block (which
is more C89 compliant and fixes compilation on Microsoft Visual C++).

NEW FEATURES

- MacOS X CoreAudio driver
- Carbon support
- Loader for ASYLUM Music Format v1.0 (.amf) modules,
  as used in crusader games.
- New function 'Player_QueryVoices' added, which is used to return
  dynamic channel information about the module player. (Mikmod 3.2.2 uses
  it for it's dynamic panels).
- Mixing with floating point output. The MacOSX CoreAudio driver uses it.
  Thanks goes to Anders F Björklund for implementing this.
- AIFF disk writer driver.
- New NAS driver (Network Audio System). Tested with nasd and NCD X terminals.
- MREADERs now have an iobase member (previously was a static variable in mmio.c). This
  permits to have many MREADERs with different iobase base values.
- Created an example/ subdirectory, to hold programming examples.
- Added functions to read from memory (Player_LoadMem, Sample_LoadMem...) and a memory reader in mmio.c
- renamed internal _mm_malloc function to MikMod_malloc, which is now
  part of the API.
- Raw samples can now be loaded using the new Sample_LoadRaw* family of functions for sound effects.
- PowerPC 64 support
- ALSA (Advanced Linux Sound Architecture) driver is now working with "recent"
(actually a few years back) ALSAs.
- Change MDRIVER "char *" fields to "const char *".
    - Thanks to Stéphan Kochen.
- Implement a fix to the ALSA driver in MIKMOD_DYNAMIC mode so it will allow
linking against libmikmod when "-Wl,--no-undefined" is passed.
    - Reported by Andrey Bondrov from Mandriva.
    - The problem was that we used some snd_... identifiers indirectly in
    some macro expansions.

BUGFIXES

- The sun driver now compiles on solaris (Thanks to Nicolas Gros d'Aillon
  for sending me Jonathan Perkin's fix)
- The wav output driver had problems on big endian systems. Thanks to
  Axel "awe" Wefers for fixing this.
- A warning reported by Stéphane LOEUILLET in libmikmod.m4 with autoconf 1.8 was fixed.
- The 'card' argument, supported by the OSS driver was not documented via
  the MDRIVER->CmdLineHelp string.
- libmikmod-3.1.11-CVE-2010-2546,2971.diff (from Mandriva/Mageia).
- libmikmod-3.1.11-CVE-2009-3995,3996.diff (from Mandriva/Mageia).
- Now checking for linking against -lm (from Mandriva/Mageia).
- Modified patch of libmikmod-CVE-2009-0179.patch (from Mandriva/Mageia).
- Apply the libmikmod-CVE-2007-6720.patch (from Mandriva/Mageia).
- Implement a fix for sprintf-of-list
    - sprintf(list, "%sSOMETHING", list) does not work as expected and
    suffers from the
    http://en.wikipedia.org/wiki/Schlemiel_the_Painter%27s_algorithm
    syndrome.
- Apply a patch for non-blocking opening of the OSS driver. (from Mandriva/Mageia).
- Fixed the prototypes of vc_callback (thanks to P. Martin).
- Cast a vc_callback parameter to "unsigned char *" instead of "char *",
becuase the former is what it accepts (thanks to P. Martin).
- Check for Samples' validatity in virtch_common.c (thanks to P. Martin).
- Fix compilation on MSVC.
    - Thanks to Stéphan Kochen.

4 files changed, 19 insertions, 38 deletions

diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index ac604fc9616..5382c2010d0 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2012/01/13 10:54:46 obache Exp $
+# $NetBSD: Makefile,v 1.51 2012/06/03 21:44:59 wiz Exp $
 
-DISTNAME=	libmikmod-3.1.12
-PKGREVISION=	1
+DISTNAME=	libmikmod-3.2.0
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mikmod/}
+MASTER_SITES=	http://mikmod.shlomifish.org/files/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://mikmod.raphnet.net/
diff --git a/audio/libmikmod/distinfo b/audio/libmikmod/distinfo
index 71ea6e49213..7576dbb27dc 100644
--- a/audio/libmikmod/distinfo
+++ b/audio/libmikmod/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2010/05/02 11:42:17 wiz Exp $
+$NetBSD: distinfo,v 1.14 2012/06/03 21:44:59 wiz Exp $
 
-SHA1 (libmikmod-3.1.12.tar.gz) = 782113f8ec5c9960cacadadc7b0bea8ae607fae4
-RMD160 (libmikmod-3.1.12.tar.gz) = 561bb8d189d0e3a69f318b629489aa652f63fd52
-Size (libmikmod-3.1.12.tar.gz) = 618011 bytes
+SHA1 (libmikmod-3.2.0.tar.gz) = 6d30f59019872699bdcc9bcf6893eea9d6b12c13
+RMD160 (libmikmod-3.2.0.tar.gz) = 066db43670878914774f16b2c5444acfa8e86f28
+Size (libmikmod-3.2.0.tar.gz) = 873258 bytes
 SHA1 (patch-ab) = afda9a7d29e70e42c037163ac5b2d2742c77daab
-SHA1 (patch-ac) = 6fc74c596c50fcea30e280b894a631e5dcb2b6a5
-SHA1 (patch-ad) = f2fc607efccd4d883ce6b642ab644f0e7bf747f6
+SHA1 (patch-ac) = f35745a0880181c06f9e37c1cfe51e5408b4928d
+SHA1 (patch-ad) = bc4983d181acedc6f32b85aadd3a0011280d3227
diff --git a/audio/libmikmod/patches/patch-ac b/audio/libmikmod/patches/patch-ac
index 19407df1fa2..a84cc848f57 100644
--- a/audio/libmikmod/patches/patch-ac
+++ b/audio/libmikmod/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.8 2008/06/02 08:20:05 dholland Exp $
+$NetBSD: patch-ac,v 1.9 2012/06/03 21:44:59 wiz Exp $
 
---- configure.orig	2004-01-21 12:43:52.000000000 -0500
-+++ configure	2008-06-02 04:18:48.000000000 -0400
-@@ -5741,6 +5741,7 @@
+--- configure.orig	2012-06-01 13:15:40.000000000 +0000
++++ configure
+@@ -11829,6 +11829,7 @@ $as_echo "libraries $x_libraries, header
  fi
  
  
 +if false ; then
  # Check if makeinfo support html output. If it doesn't, pretend it's missing
  # rather than failing rebuilding the documentation.
- echo $ac_n "checking if makeinfo supports html output""... $ac_c" 1>&6
-@@ -5763,6 +5764,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if makeinfo supports html output" >&5
+@@ -11851,6 +11852,7 @@ then
  else
  	MAKEINFO="$MAKEINFO --no-split"
  fi
@@ -18,12 +18,3 @@ $NetBSD: patch-ac,v 1.8 2008/06/02 08:20:05 dholland Exp $
  
  # ====================
  # Check for libraries.
-@@ -7743,7 +7745,7 @@
- 	# systems, libaudiofile, libasound on Linux)
- 	if test $libmikmod_dynload != no
- 	then
--		ESD_LIBS="`echo $ESD_LIBS|sed -e 's/-lesd//'|sed -e 's/-lasound//'|sed -e 's/-laudiofile//'|sed -e 's/-lossaudio//'`"
-+		ESD_LIBS="`echo $ESD_LIBS|sed -e 's/-lesd//g'|sed -e 's/-lasound//g'|sed -e 's/-laudiofile//g'|sed -e 's/-lossaudio//g'`"
- 	fi
- 	LIBRARY_LIB="$ESD_LIBS $LIBRARY_LIB"
- fi
diff --git a/audio/libmikmod/patches/patch-ad b/audio/libmikmod/patches/patch-ad
index e6364b0a69e..5e2de7df018 100644
--- a/audio/libmikmod/patches/patch-ad
+++ b/audio/libmikmod/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.7 2002/11/19 13:04:38 salo Exp $
+$NetBSD: patch-ad,v 1.8 2012/06/03 21:44:59 wiz Exp $
 
---- drivers/drv_sun.c.orig	Sun Jan 13 01:58:57 2002
-+++ drivers/drv_sun.c	Tue Nov 19 05:22:18 2002
-@@ -79,12 +79,18 @@
+--- drivers/drv_sun.c.orig	2012-03-14 17:02:59.000000000 +0000
++++ drivers/drv_sun.c
+@@ -79,9 +79,9 @@ extern int fputs(const char *, FILE *);
  #endif
  
  /* Sound device to open */
@@ -14,12 +14,3 @@ $NetBSD: patch-ad,v 1.7 2002/11/19 13:04:38 salo Exp $
  #define SOUNDDEVICE "/dev/audio"
  #endif
  
-+/* Solaris */
-+#ifdef SOLARIS
-+#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR
-+#define AUDIO_ENCODING_ULINEAR AUDIO_ENCODING_LINEAR8
-+#endif
-+
- /* Compatibility defines, for old *BSD or SunOS systems */
- #ifndef AUDIO_ENCODING_PCM16
- #define AUDIO_ENCODING_PCM16 AUDIO_ENCODING_LINEAR