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.10 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.8 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.6 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.4 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.2 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.6.0.6 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.4 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.2 pkgsrc-2004Q2-base:1.6 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.3.0.8 netbsd-1-6-RELEASE-base:1.3 pkgviews:1.3.0.4 pkgviews-base:1.3 buildlink2:1.3.0.2 buildlink2-base:1.3 netbsd-1-5-PATCH003:1.3 netbsd-1-5-PATCH001:1.2 netbsd-1-5-RELEASE:1.1.1.1 netbsd-1-4-PATCH003:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.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 2005.01.12.22.58.19; author kristerw; state Exp; branches; next 1.6; 1.6 date 2004.04.17.00.15.21; author snj; state dead; branches; next 1.5; 1.5 date 2003.10.27.23.19.46; author kristerw; state Exp; branches; next 1.4; 1.4 date 2002.10.13.19.28.58; author kristerw; state dead; branches; next 1.3; 1.3 date 2001.07.03.06.17.33; author rh; state Exp; branches; next 1.2; 1.2 date 2000.10.15.07.39.44; author wulf; state Exp; branches; next 1.1; 1.1 date 2000.06.26.01.09.09; author wiz; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2000.06.26.01.09.09; author wiz; 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-ad,v 1.7 2005/01/12 22:58:19 kristerw Exp $ --- src/video/SDL_yuv_sw.c.orig Wed Feb 18 18:22:04 2004 +++ src/video/SDL_yuv_sw.c Wed Jan 12 23:43:27 2005 @@@@ -1067,7 +1067,7 @@@@ case SDL_YV12_OVERLAY: case SDL_IYUV_OVERLAY: if ( display->format->BytesPerPixel == 2 ) { -#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT) +#if defined(i386) && defined(__GNUC__) && __GNUC__ > 2 && defined(USE_ASMBLIT) /* inline assembly functions */ if ( SDL_HasMMX() && (Rmask == 0xF800) && (Gmask == 0x07E0) && @@@@ -1089,7 +1089,7 @@@@ swdata->Display2X = Color24DitherYV12Mod2X; } if ( display->format->BytesPerPixel == 4 ) { -#if defined(i386) && defined(__GNUC__) && defined(USE_ASMBLIT) +#if defined(i386) && defined(__GNUC__) && __GNUC__ > 2 && defined(USE_ASMBLIT) /* inline assembly functions */ if ( SDL_HasMMX() && (Rmask == 0x00FF0000) && (Gmask == 0x0000FF00) && @ 1.7 log @GCC 2 does not understand the MMX asm core. Fall back to the C source for GCC 2. @ text @d1 1 a1 1 $NetBSD$ @ 1.6 log @Update to SDL-1.2.7. Changes: * SDL no longer sets a fatal signal handler for SIGPIPE * Fixed modifier key state on MacOS X * Added support for remote XVideo * Fixed static linking on MacOS X * Fixed compiling with broken Linux 2.6 headers * Fixed mouse cursor visibility and focus events on MacOS X * Added support for /dev/joy* on Free/Net/OpenBSD * Fixed problems with CD-ROM audio playback on MacOS X 10.1 * Added dynamic GL library loading to MacOS Carbon support * Added function to create RWops from const memory: SDL_RWFromConstMem() * Fixed build problems with newer versions of automake * Fixed MacOS X libtool framework support * Added CPU feature detection functions to SDL_cpuinfo.h * Fixed illegal instruction crash using 3DNow on Intel processors * Fixed asm issues with mmx.h and gcc 3.3 * Fixed crash calling app defined window proc * Fixed long long constant warnings in GCC 3.3.1 * Fixed joystick open problems on BSD * Fixed X11 mode line crash with only one video mode Fixes PR pkg/22462. Okayed by wiz@@. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.5 2003/10/27 23:19:46 kristerw Exp $ d3 20 a22 78 --- src/video/SDL_blit_A.c.orig Sat Aug 30 21:13:06 2003 +++ src/video/SDL_blit_A.c Mon Oct 27 21:10:22 2003 @@@@ -220,11 +220,11 @@@@ int dstskip = info->d_skip >> 2; Uint8 load[8]; - *(Uint64 *)load = 0x00fefefe00fefefe;/* alpha128 mask */ + *(Uint64 *)load = 0x00fefefe00fefefeULL;/* alpha128 mask */ movq_m2r(*load, mm4); /* alpha128 mask -> mm4 */ - *(Uint64 *)load = 0x0001010100010101;/* !alpha128 mask */ + *(Uint64 *)load = 0x0001010100010101ULL;/* !alpha128 mask */ movq_m2r(*load, mm3); /* !alpha128 mask -> mm3 */ - *(Uint64 *)load = 0xFF000000FF000000;/* dst alpha mask */ + *(Uint64 *)load = 0xFF000000FF000000ULL;/* dst alpha mask */ movq_m2r(*load, mm7); /* dst alpha mask -> mm7 */ while(height--) { DUFFS_LOOP_DOUBLE2( @@@@ -276,10 +276,10 @@@@ alpha, alpha, alpha, alpha}; movq_m2r(*load, mm4); /* alpha -> mm4 */ - *(Uint64 *)load = 0x00FF00FF00FF00FF; + *(Uint64 *)load = 0x00FF00FF00FF00FFULL; movq_m2r(*load, mm3); /* mask -> mm3 */ pand_r2r(mm3, mm4); /* mm4 & mask -> 0A0A0A0A -> mm4 */ - *(Uint64 *)load = 0xFF000000FF000000;/* dst alpha mask */ + *(Uint64 *)load = 0xFF000000FF000000ULL;/* dst alpha mask */ movq_m2r(*load, mm7); /* dst alpha mask -> mm7 */ while(height--) { @@@@ -360,13 +360,13 @@@@ Uint32 alpha = 0; Uint8 load[8]; - *(Uint64 *)load = 0x00FF00FF00FF00FF; + *(Uint64 *)load = 0x00FF00FF00FF00FFULL; movq_m2r(*load, mm3); /* mask -> mm2 */ - *(Uint64 *)load = 0x00FF000000000000; + *(Uint64 *)load = 0x00FF000000000000ULL; movq_m2r(*load, mm7); /* dst alpha mask -> mm2 */ - *(Uint64 *)load = 0x00FFFFFF00FFFFFF; + *(Uint64 *)load = 0x00FFFFFF00FFFFFFULL; movq_m2r(*load, mm0); /* alpha 255 mask -> mm0 */ - *(Uint64 *)load = 0xFF000000FF000000; + *(Uint64 *)load = 0xFF000000FF000000ULL; movq_m2r(*load, mm6); /* alpha 255 !mask -> mm6 */ while(height--) { DUFFS_LOOP4({ @@@@ -792,11 +792,11 @@@@ punpcklwd_r2r(mm0, mm0); /* 0A0A0A0A -> mm0 */ /* Setup the 565 color channel masks */ - *(Uint64 *)load = 0xF800F800F800F800; + *(Uint64 *)load = 0xF800F800F800F800ULL; movq_m2r(*load, mm1); /* MASKRED -> mm1 */ - *(Uint64 *)load = 0x07E007E007E007E0; + *(Uint64 *)load = 0x07E007E007E007E0ULL; movq_m2r(*load, mm4); /* MASKGREEN -> mm4 */ - *(Uint64 *)load = 0x001F001F001F001F; + *(Uint64 *)load = 0x001F001F001F001FULL; movq_m2r(*load, mm7); /* MASKBLUE -> mm7 */ while(height--) { DUFFS_LOOP_QUATRO2( @@@@ -942,11 +942,11 @@@@ punpcklwd_r2r(mm0, mm0); /* 0A0A0A0A -> mm0 */ /* Setup the 555 color channel masks */ - *(Uint64 *)load = 0x7C007C007C007C00; + *(Uint64 *)load = 0x7C007C007C007C00ULL; movq_m2r(*load, mm1); /* MASKRED -> mm1 */ - *(Uint64 *)load = 0x03E003E003E003E0; + *(Uint64 *)load = 0x03E003E003E003E0ULL; movq_m2r(*load, mm4); /* MASKGREEN -> mm4 */ - *(Uint64 *)load = 0x001F001F001F001F; + *(Uint64 *)load = 0x001F001F001F001FULL; movq_m2r(*load, mm7); /* MASKBLUE -> mm7 */ while(height--) { DUFFS_LOOP_QUATRO2( @ 1.5 log @Make SDL compile with gcc 3.3 too, by applying patches provided by Marc Recht in response to PR pkg/23268. @ text @d1 1 a1 1 $NetBSD$ @ 1.4 log @Update SDL to version 1.2.5. This update consists of numerous bugfixes. See http://www.libsdl.org/release/changes-1.2.html for a full list. @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.3 2001/07/03 06:17:33 rh Exp $ d3 78 a80 10 --- src/audio/SDL_audiomem.c.orig Thu Apr 26 18:50:17 2001 +++ src/audio/SDL_audiomem.c @@@@ -35,6 +35,7 @@@@ #include #include #include +#include #endif #include "SDL_audiomem.h" @ 1.3 log @Update SDL to 1.2.1. Changes include: * Added Linux PlayStation 2 Graphics Synthesizer support * Added an audio driver that writes to disk * Mouse wheel sends mouse button (4/5) events on Windows * Added MacOS X Project Builder projects * Added initial support for Quartz video * Disabled Linux /dev/event joystick interface by default * Added native OpenBSD audio driver * Added detection of Open Sound System on Solaris x86 * Added initial support for Nano-X * Fixed endian detection on IA64 architectures * Added --disable-dga configure option to disable DGA * Fixed stuck keys when changing the video mode * Fixed double-mouse event bug on Windows using OpenGL * Fixed 320x200 video mode on framebuffer console * Improved robustness for the ELO touchpad * Added support for building under Cygwin on Windows * Added a dummy video driver for benchmarking * Fixed fullscreen cursor offset bug on BeOS @ text @d1 1 a1 1 $NetBSD$ @ 1.2 log @Updated to SDL-1.1.5 and bugfixes @ text @d1 1 a1 1 $NetBSD: patch-ad,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $ d3 3 a5 3 --- src/audio/SDL_audiomem.c.orig Sun Sep 24 12:37:32 2000 +++ src/audio/SDL_audiomem.c Mon Oct 2 13:25:47 2000 @@@@ -34,6 +34,7 @@@@ a9 2 #else #include d11 2 @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 4 --- src/audio/SDL_audiomem.c.orig Thu Mar 16 16:20:37 2000 +++ src/audio/SDL_audiomem.c Fri Jun 23 03:53:50 2000 @@@@ -33,6 +33,7 @@@@ #include d8 1 @ 1.1.1.1 log @Initial import of SDL, a multimedia library mainly for games. Currently using pth instead of 'real' pthreads, and some parts (mainly audio and obviously thread support) don't work correctly because of that (unproven-pthreads misses pthread_cancel & friends to make it work), but there are some programs that do. @ text @@