head 1.9; access; symbols pkgsrc-2026Q1:1.9.0.82 pkgsrc-2026Q1-base:1.9 pkgsrc-2025Q4:1.9.0.80 pkgsrc-2025Q4-base:1.9 pkgsrc-2025Q3:1.9.0.78 pkgsrc-2025Q3-base:1.9 pkgsrc-2025Q2:1.9.0.76 pkgsrc-2025Q2-base:1.9 pkgsrc-2025Q1:1.9.0.74 pkgsrc-2025Q1-base:1.9 pkgsrc-2024Q4:1.9.0.72 pkgsrc-2024Q4-base:1.9 pkgsrc-2024Q3:1.9.0.70 pkgsrc-2024Q3-base:1.9 pkgsrc-2024Q2:1.9.0.68 pkgsrc-2024Q2-base:1.9 pkgsrc-2024Q1:1.9.0.66 pkgsrc-2024Q1-base:1.9 pkgsrc-2023Q4:1.9.0.64 pkgsrc-2023Q4-base:1.9 pkgsrc-2023Q3:1.9.0.62 pkgsrc-2023Q3-base:1.9 pkgsrc-2023Q2:1.9.0.60 pkgsrc-2023Q2-base:1.9 pkgsrc-2023Q1:1.9.0.58 pkgsrc-2023Q1-base:1.9 pkgsrc-2022Q4:1.9.0.56 pkgsrc-2022Q4-base:1.9 pkgsrc-2022Q3:1.9.0.54 pkgsrc-2022Q3-base:1.9 pkgsrc-2022Q2:1.9.0.52 pkgsrc-2022Q2-base:1.9 pkgsrc-2022Q1:1.9.0.50 pkgsrc-2022Q1-base:1.9 pkgsrc-2021Q4:1.9.0.48 pkgsrc-2021Q4-base:1.9 pkgsrc-2021Q3:1.9.0.46 pkgsrc-2021Q3-base:1.9 pkgsrc-2021Q2:1.9.0.44 pkgsrc-2021Q2-base:1.9 pkgsrc-2021Q1:1.9.0.42 pkgsrc-2021Q1-base:1.9 pkgsrc-2020Q4:1.9.0.40 pkgsrc-2020Q4-base:1.9 pkgsrc-2020Q3:1.9.0.38 pkgsrc-2020Q3-base:1.9 pkgsrc-2020Q2:1.9.0.34 pkgsrc-2020Q2-base:1.9 pkgsrc-2020Q1:1.9.0.14 pkgsrc-2020Q1-base:1.9 pkgsrc-2019Q4:1.9.0.36 pkgsrc-2019Q4-base:1.9 pkgsrc-2019Q3:1.9.0.32 pkgsrc-2019Q3-base:1.9 pkgsrc-2019Q2:1.9.0.30 pkgsrc-2019Q2-base:1.9 pkgsrc-2019Q1:1.9.0.28 pkgsrc-2019Q1-base:1.9 pkgsrc-2018Q4:1.9.0.26 pkgsrc-2018Q4-base:1.9 pkgsrc-2018Q3:1.9.0.24 pkgsrc-2018Q3-base:1.9 pkgsrc-2018Q2:1.9.0.22 pkgsrc-2018Q2-base:1.9 pkgsrc-2018Q1:1.9.0.20 pkgsrc-2018Q1-base:1.9 pkgsrc-2017Q4:1.9.0.18 pkgsrc-2017Q4-base:1.9 pkgsrc-2017Q3:1.9.0.16 pkgsrc-2017Q3-base:1.9 pkgsrc-2017Q2:1.9.0.12 pkgsrc-2017Q2-base:1.9 pkgsrc-2017Q1:1.9.0.10 pkgsrc-2017Q1-base:1.9 pkgsrc-2016Q4:1.9.0.8 pkgsrc-2016Q4-base:1.9 pkgsrc-2016Q3:1.9.0.6 pkgsrc-2016Q3-base:1.9 pkgsrc-2016Q2:1.9.0.4 pkgsrc-2016Q2-base:1.9 pkgsrc-2016Q1:1.9.0.2 pkgsrc-2016Q1-base:1.9 pkgsrc-2015Q4:1.8.0.30 pkgsrc-2015Q4-base:1.8 pkgsrc-2015Q3:1.8.0.28 pkgsrc-2015Q3-base:1.8 pkgsrc-2015Q2:1.8.0.26 pkgsrc-2015Q2-base:1.8 pkgsrc-2015Q1:1.8.0.24 pkgsrc-2015Q1-base:1.8 pkgsrc-2014Q4:1.8.0.22 pkgsrc-2014Q4-base:1.8 pkgsrc-2014Q3:1.8.0.20 pkgsrc-2014Q3-base:1.8 pkgsrc-2014Q2:1.8.0.18 pkgsrc-2014Q2-base:1.8 pkgsrc-2014Q1:1.8.0.16 pkgsrc-2014Q1-base:1.8 pkgsrc-2013Q4:1.8.0.14 pkgsrc-2013Q4-base:1.8 pkgsrc-2013Q3:1.8.0.12 pkgsrc-2013Q3-base:1.8 pkgsrc-2013Q2:1.8.0.10 pkgsrc-2013Q2-base:1.8 pkgsrc-2013Q1:1.8.0.8 pkgsrc-2013Q1-base:1.8 pkgsrc-2012Q4:1.8.0.6 pkgsrc-2012Q4-base:1.8 pkgsrc-2012Q3:1.8.0.4 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.2 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.7.0.74 pkgsrc-2012Q1-base:1.7 pkgsrc-2011Q4:1.7.0.72 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q3:1.7.0.70 pkgsrc-2011Q3-base:1.7 pkgsrc-2011Q2:1.7.0.68 pkgsrc-2011Q2-base:1.7 pkgsrc-2011Q1:1.7.0.66 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.64 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.62 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.7.0.60 pkgsrc-2010Q2-base:1.7 pkgsrc-2010Q1:1.7.0.58 pkgsrc-2010Q1-base:1.7 pkgsrc-2009Q4:1.7.0.56 pkgsrc-2009Q4-base:1.7 pkgsrc-2009Q3:1.7.0.54 pkgsrc-2009Q3-base:1.7 pkgsrc-2009Q2:1.7.0.52 pkgsrc-2009Q2-base:1.7 pkgsrc-2009Q1:1.7.0.50 pkgsrc-2009Q1-base:1.7 pkgsrc-2008Q4:1.7.0.48 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.46 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.44 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.42 pkgsrc-2008Q2-base:1.7 cwrapper:1.7.0.40 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.4 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.9 date 2015.12.29.19.35.39; author dholland; state Exp; branches; next 1.8; commitid sULAplXvYAwzySOy; 1.8 date 2012.06.03.21.44.59; author wiz; state Exp; branches; next 1.7; 1.7 date 2002.11.19.13.04.38; author salo; 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.03.31.03.03.09; author mycroft; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2001.03.31.02.50.07; author mycroft; state Exp; branches; next 1.2; 1.2 date 2001.03.31.02.41.08; author mycroft; state Exp; branches; next 1.1; 1.1 date 2000.04.02.16.07.05; author pooka; state Exp; branches; next ; 1.4.2.1 date 2002.08.22.11.09.50; author jlam; state Exp; branches; next ; desc @@ 1.9 log @Add patch comment. @ text @$NetBSD: patch-ad,v 1.8 2012/06/03 21:44:59 wiz Exp $ Update default audio device path. --- 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 */ -#ifdef SUNOS4 +#ifndef SOLARIS /* SunOS, NetBSD */ #define SOUNDDEVICE "/dev/sound" -#else /* Solaris, *BSD */ +#else /* Solaris */ #define SOUNDDEVICE "/dev/audio" #endif @ 1.8 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 3 a3 1 $NetBSD: patch-ad,v 1.7 2002/11/19 13:04:38 salo Exp $ @ 1.7 log @Define Solaris specific AUDIO_ENCODING_SLINEAR and AUDIO_ENCODING_ULINEAR. A patch from Jonathan Perkin via PR 18791 @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.6 2002/08/25 19:21:52 jlam Exp $ d3 3 a5 3 --- 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 @@@@ a16 9 +/* 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 @ 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-ad,v 1.4.2.1 2002/08/22 11:09:50 jlam Exp $ d3 3 a5 3 --- drivers/drv_sun.c.orig Sun Jan 13 00:58:57 2002 +++ drivers/drv_sun.c Thu Jul 11 02:12:04 2002 @@@@ -79,9 +79,9 @@@@ d17 9 @ 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-ad,v 1.4 2001/03/31 03:03:09 mycroft Exp $ @ 1.4 log @More cleanup of audio init code. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2001/03/31 02:50:07 mycroft Exp $ d3 3 a5 12 --- drivers/drv_sun.c.orig Mon Feb 14 22:10:21 2000 +++ drivers/drv_sun.c Sat Mar 31 03:01:36 2001 @@@@ -61,7 +61,7 @@@@ #include #endif -#define DEFAULT_FRAGSIZE 12 +#define DEFAULT_FRAGSIZE 13 #if !defined __NetBSD__ && !defined __OpenBSD__ #ifdef HAVE_SUN_AUDIOIO_H @@@@ -72,26 +72,12 @@@@ d12 2 a13 1 #else /* Solaris, *BSD */ a16 50 -/* Compatibility defines, for old *BSD or SunOS systems */ -#ifndef AUDIO_ENCODING_PCM16 -#define AUDIO_ENCODING_PCM16 AUDIO_ENCODING_LINEAR -#endif -#ifndef AUDIO_ENCODING_PCM8 -#define AUDIO_ENCODING_PCM8 AUDIO_ENCODING_LINEAR8 -#endif -#ifndef AUDIO_ENCODING_SLINEAR_LE -#define AUDIO_ENCODING_SLINEAR_LE AUDIO_ENCODING_PCM16 -#endif -#ifndef AUDIO_ENCODING_ULINEAR_LE -#define AUDIO_ENCODING_ULINEAR_LE AUDIO_ENCODING_PCM8 -#endif - /* Compatibility defines, for old *BSD systems */ #ifndef AUDIO_SPEAKER #define AUDIO_SPEAKER 0x01 @@@@ -262,7 +248,7 @@@@ md_mode |= (DMODE_STEREO | DMODE_16BITS); play_precision = 16; play_stereo = 2; - play_encoding = AUDIO_ENCODING_SLINEAR_LE; + play_encoding = AUDIO_ENCODING_LINEAR; } #endif } @@@@ -273,13 +259,7 @@@@ if ((play_precision == 8) && (play_stereo == 1) && (play_rate <= 8000)) play_encoding = AUDIO_ENCODING_ULAW; else -#ifdef SUNOS4 play_encoding = AUDIO_ENCODING_LINEAR; -#else - play_encoding = - (play_precision == - 16) ? AUDIO_ENCODING_SLINEAR_LE : AUDIO_ENCODING_ULINEAR_LE; -#endif } /* get current audio settings if we want to keep the playback output @@@@ -319,7 +299,9 @@@@ } if ((audioinfo.play.precision != play_precision) || (audioinfo.play.channels != play_stereo) || +#if 0 (audioinfo.play.encoding != play_encoding) || +#endif (audioinfo.play.sample_rate != play_rate)) { _mm_errno = MMERR_SUN_INIT; return 1; @ 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-ad,v 1.5 2002/07/13 01:03:35 mycroft Exp $ d3 12 a14 3 --- drivers/drv_sun.c.orig Sun Jan 13 00:58:57 2002 +++ drivers/drv_sun.c Thu Jul 11 02:12:04 2002 @@@@ -79,9 +79,9 @@@@ d21 1 a21 2 -#else /* Solaris, *BSD */ +#else /* Solaris */ d25 50 @ 1.3 log @Samples are stored in the audio buffer in host order, not little-endian. Don't generate static on big-endian machines. (Haven't I fixed this before??) @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.2 2001/03/31 02:41:08 mycroft Exp $ d4 1 a4 1 +++ drivers/drv_sun.c Sat Mar 31 02:48:11 2001 d14 1 a14 1 @@@@ -72,7 +72,7 @@@@ d19 1 a19 1 +#if defined SUNOS4 || defined __NetBSD__ a22 3 @@@@ -85,11 +85,11 @@@@ #ifndef AUDIO_ENCODING_PCM8 #define AUDIO_ENCODING_PCM8 AUDIO_ENCODING_LINEAR8 d24 8 d34 1 a34 3 +#ifndef AUDIO_ENCODING_SLINEAR +#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_PCM16 #endif d37 2 a38 4 +#ifndef AUDIO_ENCODING_ULINEAR +#define AUDIO_ENCODING_ULINEAR AUDIO_ENCODING_PCM8 #endif d40 3 a42 1 @@@@ -262,7 +262,7 @@@@ d47 1 a47 1 + play_encoding = AUDIO_ENCODING_SLINEAR; d51 9 a59 4 @@@@ -278,7 +278,7 @@@@ #else play_encoding = (play_precision == d61 1 a61 2 + 16) ? AUDIO_ENCODING_SLINEAR : AUDIO_ENCODING_ULINEAR; #endif d64 11 @ 1.2 log @Use /dev/sound, not /dev/audio. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1 2000/04/02 16:07:05 pooka Exp $ d4 1 a4 1 +++ drivers/drv_sun.c Sat Mar 31 02:39:24 2001 d23 34 @ 1.1 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 @d1 1 a1 1 $NetBSD$ d3 20 a22 19 *** drivers/drv_sun.c.orig Tue Feb 15 00:10:21 2000 --- drivers/drv_sun.c Sun Apr 2 15:18:28 2000 *************** *** 61,67 **** #include #endif ! #define DEFAULT_FRAGSIZE 12 #if !defined __NetBSD__ && !defined __OpenBSD__ #ifdef HAVE_SUN_AUDIOIO_H --- 61,67 ---- #include #endif ! #define DEFAULT_FRAGSIZE 13 #if !defined __NetBSD__ && !defined __OpenBSD__ #ifdef HAVE_SUN_AUDIOIO_H @