head 1.12; access; symbols pkgsrc-2014Q3:1.11.0.4 pkgsrc-2014Q3-base:1.11 pkgsrc-2014Q2:1.11.0.2 pkgsrc-2014Q2-base:1.11 pkgsrc-2014Q1:1.10.0.4 pkgsrc-2014Q1-base:1.10 pkgsrc-2013Q4:1.10.0.2 pkgsrc-2013Q4-base:1.10 pkgsrc-2013Q3:1.9.0.12 pkgsrc-2013Q3-base:1.9 pkgsrc-2013Q2:1.9.0.10 pkgsrc-2013Q2-base:1.9 pkgsrc-2013Q1:1.9.0.8 pkgsrc-2013Q1-base:1.9 pkgsrc-2012Q4:1.9.0.6 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.9.0.4 pkgsrc-2012Q3-base:1.9 pkgsrc-2012Q2:1.9.0.2 pkgsrc-2012Q2-base:1.9 pkgsrc-2012Q1:1.8.0.36 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.34 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.32 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.30 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.8.0.28 pkgsrc-2011Q1-base:1.8 pkgsrc-2010Q4:1.8.0.26 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.24 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.22 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.20 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.18 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.16 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.14 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.12 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.10 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.8 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.6 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.4 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.2 pkgsrc-2008Q1:1.7.0.38 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.36 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.34 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.32 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.30 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.28 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.26 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.24 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.22 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.20 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.18 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.16 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.14 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.12 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.10 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.8 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.6 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.4 pkgsrc-2003Q4-base:1.7 netbsd-1-6-1:1.7.0.2 netbsd-1-6-1-base:1.7 netbsd-1-6:1.5.0.6 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.2 pkgviews-base:1.5 buildlink2:1.4.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.4 netbsd-1-5-PATCH001:1.3 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3; locks; strict; comment @# @; 1.12 date 2014.11.21.15.44.27; author adam; state dead; branches; next 1.11; commitid SiWAwhNr7x9ne4Zx; 1.11 date 2014.03.31.08.34.12; author wiz; state Exp; branches; next 1.10; commitid cS1SPswJbMM7pPux; 1.10 date 2013.10.06.16.09.01; author wiz; state Exp; branches; next 1.9; commitid ZRvrpXsyXZtwzf8x; 1.9 date 2012.06.03.21.44.59; author wiz; state Exp; branches; next 1.8; 1.8 date 2008.06.02.08.20.05; author dholland; state Exp; branches; next 1.7; 1.7 date 2002.08.31.03.47.54; author wiz; state Exp; branches; next 1.6; 1.6 date 2002.08.25.19.21.52; author jlam; state Exp; branches; next 1.5; 1.5 date 2002.07.13.01.03.35; author mycroft; state Exp; branches; next 1.4; 1.4 date 2001.06.19.16.00.06; author jlam; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2000.06.09.07.53.03; author jlam; state Exp; branches; next 1.2; 1.2 date 2000.04.02.16.07.05; author pooka; state Exp; branches; next 1.1; 1.1 date 2000.03.07.22.45.10; author tron; state Exp; branches; next ; 1.4.2.1 date 2002.08.22.11.09.50; author jlam; state Exp; branches; next ; desc @@ 1.12 log @Changes 3.3.7: - Android support, thanks to Radovan Cervenka, with the OpenSL ES driver adapted from the old libmikmod-android project. - Support for AmigaOS and its variants like MorphOS, AROS, and a new AHI driver thanks to Szilárd Biró. - Build system configuration and packaging simplifications, tidy-ups. - Several portability tweaks. - New PSP driver. (untested. suggested by Jon Daniel, based on older ports from pspdev.) - Fix some OS/2 bit rot. (for nostalgia...) @ text @$NetBSD: patch-ac,v 1.11 2014/03/31 08:34:12 wiz Exp $ --- configure.orig 2014-03-20 20:20:14.000000000 +0000 +++ configure @@@@ -12359,6 +12359,7 @@@@ CC=$lt_save_CC +if false ; then # Check if makeinfo support html output. If it doesn't, pretend it's missing # rather than failing rebuilding the documentation. { $as_echo "$as_me:${as_lineno-$LINENO}: checking if makeinfo supports html output" >&5 @@@@ -12379,6 +12380,7 @@@@ if test $libmikmod_cv_makeinfo_html = no else MAKEINFO="$MAKEINFO --no-split" fi +fi # ============================================================= # Check for typedefs, structures, and compiler characteristics. @ 1.11 log @Update to 3.3.6: libmikmod v3.3.6 was released on 20-Mar-2014. - UMX loader: Minor corrections to the container parse code with relation to upkg file format. (for correctness' sake only...) - ALSA and ESD drivers: Fixed a dlopen() issue. - PulseAudio driver: Simplified its command line parser procedure, so that it always sets server and sink to some value, NULL or otherwise, and fix a very minor memory leak on some occasions. - Configury, OSS driver: Removed useless check for /dev/sndstat presence, added check to cover all our bases for less common setups. - Configury, NAS driver: Use the configury detected X header and library locations when necessary, not just hardcoded /usr/X11R6/. - Several configury and makefile clean-ups. - Added Dreamcast driver from the old 3.2.0b2 dreamcast.es port. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.10 2013/10/06 16:09:01 wiz Exp $ @ 1.10 log @Update to 3.3.2: Summary of changes between libmikmod 3.2.0 and libmikmod 3.3.2 (): ========================================================================== libmikmod 3.3.2 was released on 05-Oct-2013. This is a serious bug fix release after the previous 3.2.0 series, with some additional new features. All who are using libmikmod-3.2.0 (or the interim 3.3.1-beta) must upgrade to the new libmikmod-3.3.2 version. THANKS - Paul Spark for Microsoft Visual C 6.0 fixes. - Ozkan Sezer: many changes. NEW FEATURES - New CMake build system. - Updated configury, support for cross-compilation, support for building in a separate directory, support latest autotools. - New SDL driver - works both with SDL-1.2.x and with SDL2, supports floating point output if compiled against SDL2. - New OpenAL driver, originally suggested by 'kervala', with fixes and updates and with floating point output support. - The multi-platform SDL and OpenAL drivers, if they are compiled, have priority over OS-specific hw drivers for MikMod_RegisterAllDrivers(). - New windows xaudio2 driver, originally suggested by 'honza.c', with updates, xaudio2.8 support and with floating point output support. - ALSA driver now supports only the contemporary ALSA 1.0.x versions. All of the ancient ALSA 0.3.x-0.4.x code were removed. - Floating point output mode support for ALSA, OSS, Direct Sound, WinMM drivers and for WAV file writer. - The pipe and stdout drivers are now configurable - Raw file-writer now has the lowest priority among the file-writers. - GCC elf and macho symbol visibility attributes now supported. - Windows: dllexport/dllimport attributes work properly for MinGW[-w64], as well as windows compilers. Static builds using MSVC, LCC, etc are now named mikmod_static.lib. When compiling against static libmikmod, MIKMOD_STATIC should be defined so that dllimport wouldn't be assumed. BUGFIXES - ALSA fixes from Fedora. - ALSA fixes for "Write error: File descriptor in bad state" crashes, e.g. RedHat bug #915121. Now works stable. - ESD (esound) updates from Fedora. Add esd back to configury which was removed in 3.2.0b3, now requiring >= 0.2.18. - Minor OSS fixes. - The NAS driver now actually compiles. - 64 bit detection fixes. - Fix BOOL type use all over the source. - Several const correctness fixes. - Fixes for CVE-2007-6720 and CVE-2009-0179. - mmio: memreader fixes and updates. - Fixes for access violations introduced in 3.2.0b3. - Fixes for broken memory allocation wrappers introduced in 3.2.0b3. - Fix MikMod_strerror() might read beyond end of a static array. - Fix looping volume in Player_SetVolume(), based on an old patch by Yi-Huang Han. - XM loader now reads songlength amount of orders from the file and then seeks to mh->headersize+60 (sf.net bug #10.) - Fix "unclick" code to consider loop lengths shorter than 16: fixes crashes seen with several xm files (sf.net bug #12, mpd bug #3425.) - Mac OS X: new standalone makefile with cross-compilation support. - DJGPP build fixes. - Windows: fixes/updates, win64 fully supported. MinGW[-w64] fully supported along with MSVC and LCC. new standalone MinGW makefile with cross-compilation support. - SIMD (AltiVec and SSE2) option is now disabled by default. Can be enabled by --enable-simd configury option, similarly with cmake. (the standalone makefiles or project files are added instructions on how to enable the feature if required.) - Many compiler warning fixes, other small cleanups. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.9 2012/06/03 21:44:59 wiz Exp $ d3 1 a3 1 --- configure.orig 2013-10-05 14:00:10.000000000 +0000 d5 2 a6 1 @@@@ -11471,6 +11471,7 @@@@ fi a7 1 fi d13 1 a13 1 @@@@ -11493,6 +11494,7 @@@@ then d19 2 a20 2 # ==================== # Check for libraries. @ 1.9 log @Update to 3.2.0: libmikmod 3.2.0 was released on 01-June-2012. THANKS - Axel "awe" Wefers , 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 , 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. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.8 2008/06/02 08:20:05 dholland Exp $ d3 1 a3 1 --- configure.orig 2012-06-01 13:15:40.000000000 +0000 d5 2 a6 1 @@@@ -11829,6 +11829,7 @@@@ $as_echo "libraries $x_libraries, header a8 1 d13 1 a13 1 @@@@ -11851,6 +11852,7 @@@@ then @ 1.8 log @Fix a configure botchup that breaks the build of mikmod if libmikmod is built with esound support. PR 35992. PKGREVISION -> 3. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 2002/08/31 03:47:54 wiz Exp $ d3 3 a5 3 --- configure.orig 2004-01-21 12:43:52.000000000 -0500 +++ configure 2008-06-02 04:18:48.000000000 -0400 @@@@ -5741,6 +5741,7 @@@@ d12 2 a13 2 echo $ac_n "checking if makeinfo supports html output""... $ac_c" 1>&6 @@@@ -5763,6 +5764,7 @@@@ a20 9 @@@@ -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 @ 1.7 log @Convert to buildlink2. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.6 2002/08/25 19:21:52 jlam Exp $ d3 3 a5 3 --- configure.orig Tue Jan 22 01:21:19 2002 +++ configure Thu Jul 11 02:05:35 2002 @@@@ -1865,6 +1865,7 @@@@ d13 1 a13 1 @@@@ -1887,6 +1888,7 @@@@ d21 9 @ 1.6 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4.2.1 2002/08/22 11:09:50 jlam Exp $ a20 9 @@@@ -2667,7 +2669,7 @@@@ if eval "test \"`echo '$''{'libmikmod_cv_esd_needs_alsa'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if (esd-config --libs 2>&1 |grep asound >/dev/null) 2>/dev/null + if ($ESD_CONFIG --libs 2>&1 |grep asound >/dev/null) 2>/dev/null then libmikmod_cv_esd_needs_alsa=yes else @ 1.5 log @Update to libmikmod 3.1.10. Numerous bug fixes across the board; output is noticably better. Tested with all the pkgs that use it: mikmod, xmms, xpuyopuyo, xscorch. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2001/06/19 16:00:06 jlam Exp $ @ 1.4 log @Convert to use buildlink.mk files and mark as USE_BUILDLINK_ONLY. Refer to esd-config as $ESD_CONFIG in configure script. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- configure.orig Mon Feb 14 15:20:17 2000 +++ configure @@@@ -1862,6 +1862,7 @@@@ d13 3 a15 3 @@@@ -1882,6 +1883,7 @@@@ then MAKEINFO="$missing_dir/missing makeinfo" d21 1 a21 1 @@@@ -2447,7 +2449,7 @@@@ @ 1.4.2.1 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.5 2002/07/13 01:03:35 mycroft Exp $ d3 3 a5 3 --- configure.orig Tue Jan 22 01:21:19 2002 +++ configure Thu Jul 11 02:05:35 2002 @@@@ -1865,6 +1865,7 @@@@ d13 3 a15 3 @@@@ -1887,6 +1888,7 @@@@ else MAKEINFO="$MAKEINFO --no-split" d21 1 a21 1 @@@@ -2667,7 +2669,7 @@@@ @ 1.3 log @USE_LIBTOOL and LTCONFIG_OVERRIDE, instead of pkglibtool and patching configure. @ text @d4 1 a4 1 +++ configure Fri Jun 9 03:41:08 2000 d13 1 a13 2 @@@@ -1881,6 +1882,7 @@@@ if test $libmikmod_cv_makeinfo_html = no d16 1 a17 1 fi d20 10 @ 1.2 log @Update libmikmod to 3.1.9. Changes since 3.1.7 are numerous, see file NEWS included in the distribution for a complete list. @ text @d3 3 a5 19 --- configure.orig Mon Feb 14 22:20:17 2000 +++ configure Sun Apr 2 14:50:50 2000 @@@@ -1646,6 +1646,7 @@@@ *) lt_target="$target" ;; esac +if false ; then # Check for any special flags to pass to ltconfig. libtool_flags="--cache-file=$cache_file" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" @@@@ -1799,6 +1800,7 @@@@ # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' +fi # Redirect the config.log output again, so that the ltconfig log is not # clobbered by the next message. @@@@ -1862,6 +1864,7 @@@@ d13 1 a13 1 @@@@ -1881,6 +1884,7 @@@@ @ 1.1 log @Make sure that our package libtool is used. @ text @d3 5 a7 3 --- configure.orig Mon Jun 28 05:57:18 1999 +++ configure Tue Mar 7 23:38:45 2000 @@@@ -1618,6 +1618,7 @@@@ d9 1 a9 3 +if false; then d13 1 a13 1 @@@@ -1771,6 +1772,7 @@@@ d21 16 @