head 1.8; access; symbols pkgsrc-2013Q2:1.8.0.34 pkgsrc-2013Q2-base:1.8 pkgsrc-2012Q4:1.8.0.32 pkgsrc-2012Q4-base:1.8 pkgsrc-2011Q4:1.8.0.30 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q2:1.8.0.28 pkgsrc-2011Q2-base:1.8 pkgsrc-2009Q4:1.8.0.26 pkgsrc-2009Q4-base:1.8 pkgsrc-2008Q4:1.8.0.24 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.22 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.20 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.18 pkgsrc-2008Q2-base:1.8 pkgsrc-2008Q1:1.8.0.16 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.14 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.12 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.10 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.8 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.8.0.6 pkgsrc-2006Q4-base:1.8 pkgsrc-2006Q3:1.8.0.4 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.8.0.2 pkgsrc-2006Q2-base:1.8 pkgsrc-2006Q1:1.7.0.2 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.6.0.12 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.10 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.8 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.6 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.4 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.2 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.5.0.6 pkgsrc-2004Q2-base:1.5 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 netbsd-1-6-1:1.4.0.6 netbsd-1-6-1-base:1.4 netbsd-1-6:1.4.0.8 netbsd-1-6-RELEASE-base:1.4 pkgviews:1.4.0.4 pkgviews-base:1.4 buildlink2:1.4.0.2 buildlink2-base:1.4 netbsd-1-5-PATCH003:1.4 netbsd-1-5-RELEASE:1.1 netbsd-1-4-PATCH003:1.1; locks; strict; comment @# @; 1.8 date 2006.06.12.16.20.44; author wiz; state dead; branches; next 1.7; 1.7 date 2006.02.07.18.15.50; author wiz; state Exp; branches; next 1.6; 1.6 date 2004.07.26.20.42.28; author dillo; state Exp; branches; next 1.5; 1.5 date 2003.06.04.17.53.13; author abs; state Exp; branches; next 1.4; 1.4 date 2001.09.24.14.29.39; author rh; state Exp; branches; next 1.3; 1.3 date 2001.04.17.16.27.23; author rh; state dead; branches; next 1.2; 1.2 date 2000.10.15.07.39.45; author wulf; state Exp; branches; next 1.1; 1.1 date 2000.10.13.20.43.35; author skrll; state Exp; branches; next ; desc @@ 1.8 log @Update to 1.2.10. Package changes: Merge SDL-arts, SDL-esound, and SDL-nas packages back as options, all defaulting to on (add "-arts -esound -nas" to PKG_OPTIONS.SDL to get the previous behaviour of this package). Reason: trying to get and stay in sync with upstream, who decided not to take back the relevant changes. Ok jmmv@@ Also follow upstream w.r.t. library version numbers; bump BUILDLINK_API_DEPENDS for that (no real reason to diverge here). Most patches have been integrated upstream. Changes in 1.2.10: 1.2.10: If SDL_OpenAudio() is passed zero for the desired format fields, the following environment variables will be used to fill them in: SDL_AUDIO_FREQUENCY SDL_AUDIO_FORMAT SDL_AUDIO_CHANNELS SDL_AUDIO_SAMPLES If an environment variable is not specified, it will be set to a reasonable default value. Added support for the SDL_VIDEO_FULLSCREEN_HEAD environment variable, currently supported on X11 Xinerama configurations. Added SDL_GL_SWAP_CONTROL to wait for vsync in OpenGL applications. Added SDL_GL_ACCELERATED_VISUAL to guarantee hardware acceleration. Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set. SDL_SetVideoMode() now accepts 0 for width or height and will use the current video mode (or the desktop mode if no mode has been set.) Added SDL_GetKeyRepeat() Added SDL_config.h, with defaults for various build environments. @ text @$NetBSD: patch-al,v 1.7 2006/02/07 18:15:50 wiz Exp $ --- src/audio/openbsd/SDL_openbsdaudio.c.orig 2004-01-04 17:49:15.000000000 +0100 +++ src/audio/openbsd/SDL_openbsdaudio.c @@@@ -46,8 +46,12 @@@@ #include "SDL_audiodev_c.h" #include "SDL_openbsdaudio.h" -/* The tag name used by OpenBSD audio */ +/* The tag name used by NetBSD/OpenBSD audio */ +#ifdef __NetBSD__ +#define OBSD_DRIVER_NAME "netbsd" +#else #define OBSD_DRIVER_NAME "openbsd" +#endif /* Open the audio device for playback, and don't block if busy */ /* #define USE_BLOCKING_WRITES */ @@@@ -132,7 +136,11 @@@@ static SDL_AudioDevice } AudioBootStrap OPENBSD_AUDIO_bootstrap = { +#ifdef __NetBSD__ + OBSD_DRIVER_NAME, "Native NetBSD audio", +#else OBSD_DRIVER_NAME, "Native OpenBSD audio", +#endif Audio_Available, Audio_CreateDevice }; @@@@ -140,6 +148,7 @@@@ AudioBootStrap OPENBSD_AUDIO_bootstrap = static void OBSD_WaitAudio(_THIS) { +#ifdef __OpenBSD__ /* Check to see if the thread-parent process is still alive */ { static int cnt = 0; /* Note that this only works with thread implementations @@@@ -151,6 +160,7 @@@@ OBSD_WaitAudio(_THIS) } } } +#endif #ifndef USE_BLOCKING_WRITES /* Not necessary when using blocking writes */ /* See if we need to use timed audio synchronization */ @@@@ -262,20 +272,20 @@@@ OBSD_Status(_THIS) return; } - fprintf(stderr," -[play/record info] -buffer size : %d bytes -sample rate : %i Hz -channels : %i -precision : %i-bit -encoding : 0x%x -seek : %i -sample count : %i -EOF count : %i -paused : %s -error occured : %s -waiting : %s -active : %s + fprintf(stderr,"\n\ +[play/record info]\n\ +buffer size : %d bytes\n\ +sample rate : %i Hz\n\ +channels : %i\n\ +precision : %i-bit\n\ +encoding : 0x%x\n\ +seek : %i\n\ +sample count : %i\n\ +EOF count : %i\n\ +paused : %s\n\ +error occured : %s\n\ +waiting : %s\n\ +active : %s\n\ ", info.play.buffer_size, info.play.sample_rate, @@@@ -290,13 +300,13 @@@@ active : %s info.play.waiting ? "yes" : "no", info.play.active ? "yes": "no"); - fprintf(stderr," -[audio info] -monitor_gain : %i -hw block size : %d bytes -hi watermark : %i -lo watermark : %i -audio mode : %s + fprintf(stderr,"\n\ +[audio info]\n\ +monitor_gain : %i\n\ +hw block size : %d bytes\n\ +hi watermark : %i\n\ +lo watermark : %i\n\ +audio mode : %s\n\ ", info.monitor_gain, info.blocksize, @@@@ -388,6 +398,9 @@@@ OBSD_OpenAudio(_THIS, SDL_AudioSpec *spe spec->channels = 1; AUDIO_INITINFO(&info); info.play.sample_rate = spec->freq; + info.blocksize = spec->size; + info.hiwat = 5; + info.lowat = 3; (void)ioctl(audio_fd, AUDIO_SETINFO, &info); (void)ioctl(audio_fd, AUDIO_GETINFO, &info); spec->freq = info.play.sample_rate; @ 1.7 log @Remove some chunks that should not be necessary any longer. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.6 2004/07/26 20:42:28 dillo Exp $ @ 1.6 log @Reduce audio delay in the *BSD audio driver (by configuring audio device with shorter block size and lower water marks). PKGREVISION++ @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- src/audio/openbsd/SDL_openbsdaudio.c.orig 2004-02-18 18:21:59.000000000 +0100 d5 1 a5 9 @@@@ -37,6 +37,7 @@@@ #include #include #include +#include #include "SDL_audio.h" #include "SDL_error.h" @@@@ -46,8 +47,12 @@@@ d19 1 a19 1 @@@@ -132,7 +137,11 @@@@ d31 1 a31 1 @@@@ -140,6 +149,7 @@@@ d39 1 a39 1 @@@@ -151,6 +161,7 @@@@ d47 1 a47 1 @@@@ -262,20 +273,20 @@@@ d82 1 a82 1 @@@@ -290,13 +301,13 @@@@ d103 1 a103 1 @@@@ -388,6 +399,9 @@@@ @ 1.5 log @Correctly escape newlines in strings, to pacify gcc-3.3. No change to generated package, so no version bump. @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.4 2001/09/24 14:29:39 rh Exp $ d3 2 a4 2 --- src/audio/openbsd/SDL_openbsdaudio.c.orig Wed Mar 6 11:23:02 2002 +++ src/audio/openbsd/SDL_openbsdaudio.c Wed Jun 4 17:09:16 2003 d111 10 @ 1.4 log @Add patch missing in previous commit @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- src/audio/openbsd/SDL_openbsdaudio.c.orig Mon Jul 23 04:58:42 2001 +++ src/audio/openbsd/SDL_openbsdaudio.c d55 56 @ 1.3 log @Update SDL to 1.2.0. This closes PR 12684 by Tomasz Luchowski Changes include: 1.2.0: Added initial support for HP-UX (thanks Stephanie) 1.2.0: Added initial support for BSDI (thanks Kurt) 1.2.0: Fixed blitting 32-bit ARGB images to SDL_OPENGLBLIT screens 1.2.0: Fixed automake build dependencies (thanks Markus!) 1.2.0: Added 24 bpp support to software YUV display functions 1.2.0: Don't bomb trying to get DGA mouse on XFree86 4.0 1.2.0: Added initial support for OSF/Tru64 (thanks Anders) 1.1.8: Fixed joystick hat motion on MacOS 1.1.8: Don't detect mouse and keyboard as joystick on MacOS 1.1.8: Check for OpenGL 1.2 before using 16-bit SDL_OPENGLBLIT 1.1.8: Added support for /dev/sound/* in Linux 2.4 1.1.8: Fixed crash when blitting to RLE encoded surfaces 1.1.8: Fixed 8-bit audio on MacOS X 1.1.8: Fixed keyboard handling on MacOS X and MacOS classic 1.1.8: Fixed mouse cursor visibility when switching apps on MacOS 1.1.8: Implemented semaphore support on MacOS X 1.1.8: Worked around broken sem_getvalue() on MacOS X 1.1.8: Fixed 16-bit big-endian audio on MacOS X and MacOS classic 1.1.8: Fixed mutex locking on Linux glibc 2.0 1.1.8: SDL_Quit() removes the parachute signal handlers 1.1.8: Added NAS audio server support (thanks Erik!) 1.1.8: Added SDL_NOFRAME for frameless windows (thanks Andreas) 1.1.8: Added support for resizable windows on MacOS 1.1.8: Added a function to query the surface clip rectangle 1.1.8: Added a function to query the current event filter 1.1.8: The X11 XVideo adapter is now locked (thanks Jeffrey) 1.1.8: Improved the speed of fullscreen OpenGL on Windows 1.1.8: Added ELO touchscreen support for fbcon (thanks Alex) 1.1.8: Added accelerated MacOS X OpenGL support 1.1.8: Surface lock and unlock operations can now be nested 1.1.8: Optimized fillrect for PPC video memory (thanks Mattias) 1.1.8: Work around "blackout" problem with XVideo acceleration 1.1.8: Obtain correct key state on X11 focus (thanks Mattias) 1.1.8: Fixed keyboard handling on the framebuffer console 1.1.8: Added basic support for VGA16 framebuffer console 1.1.8: Open a new virtual terminal if possible on fbcon 1.1.8: Fixed default audio driver on FreeBSD (thanks Maxim) 1.1.8: Fixed joystick crash on Windows (thanks Pete) 1.1.7: Expanded documentation from the SDL Documentation Project 1.1.7: Report X11 client message events if SYSWMEVENTS enabled 1.1.7: Added support for a single hat on Windows joysticks 1.1.7: The gamma ramp routines now take arrays of Uint16 values 1.1.7: Added initial support for QNX RTP (thanks Patrick) 1.1.7: Added ALSA sound driver (thanks Patrick Trainor) 1.1.7: Added aRts UNIX sound driver (thanks Neil Stevens) 1.1.7: Get keyboard modifier state on input focus on Win32 1.1.7: SDL_ConvertSurface() now accepts SDL_RLEACCEL as a flag 1.1.7: Added initial UnixWare 7 support (thanks rr) 1.1.7: Added working YUY -> RGB conversion code (thanks Eugene) 1.1.7: Fixed video initialization crash on IRIX 1.1.7: Fixed MacOS fullscreen palette code (thanks Darrell) 1.1.7: Fixed background brush flicker on Win32 (thanks Gautier) 1.1.7: Fixed incorrect pitch when switching to window on Win32 1.1.7: Fixed memory leak when switching video modes on Win32 1.1.7: Init of fbcon shouldn't automatically set graphics mode @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.2 2000/10/15 07:39:45 wulf Exp $ d3 7 a9 15 --- src/joystick/Makefile.am.orig Wed Aug 23 13:05:26 2000 +++ src/joystick/Makefile.am Sun Oct 15 03:35:25 2000 @@@@ -12,15 +12,7 @@@@ SDL_sysjoystick.h # Include the architecture-specific sources -if TARGET_BEOS -ARCH_SRCS = SDL_bejoystick.cc -else -if TARGET_WIN32 -ARCH_SRCS = SDL_mmjoystick.c -else ARCH_SRCS = SDL_sysjoystick.c -endif -endif d11 5 a15 1 libjoystick_la_SOURCES = $(COMMON_SRCS) $(ARCH_SRCS) d17 38 @ 1.2 log @Updated to SDL-1.1.5 and bugfixes @ text @d1 1 a1 1 $NetBSD: patch-al,v 1.1 2000/10/13 20:43:35 skrll Exp $ @ 1.1 log @Hack build so that automake doesn't use CXX for link stage in libjoystick. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- src/joystick/Makefile.am.orig Fri Oct 13 18:51:25 2000 +++ src/joystick/Makefile.am d10 1 a10 1 -ARCH_SRCS = SDL_sysjoystick.cc @