diff options
author | rh <rh> | 2001-04-17 16:27:20 +0000 |
---|---|---|
committer | rh <rh> | 2001-04-17 16:27:20 +0000 |
commit | dab8e827bfd078323b25151b64ee643b1e399dc0 (patch) | |
tree | af7d9c07cd4acd80c387de9f2b92ecc5e3a7fd64 /devel/SDL | |
parent | 1f23d72192bb287d61067b74ea61914b44dad054 (diff) | |
download | pkgsrc-dab8e827bfd078323b25151b64ee643b1e399dc0.tar.gz |
Update SDL to 1.2.0. This closes PR 12684 by Tomasz Luchowski
<zuntum@netbsd.org>
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
Diffstat (limited to 'devel/SDL')
-rw-r--r-- | devel/SDL/Makefile | 11 | ||||
-rw-r--r-- | devel/SDL/distinfo | 22 | ||||
-rw-r--r-- | devel/SDL/patches/patch-ac | 25 | ||||
-rw-r--r-- | devel/SDL/patches/patch-ae | 23 | ||||
-rw-r--r-- | devel/SDL/patches/patch-af | 18 | ||||
-rw-r--r-- | devel/SDL/patches/patch-ag | 22 | ||||
-rw-r--r-- | devel/SDL/patches/patch-ai | 10 | ||||
-rw-r--r-- | devel/SDL/patches/patch-aj | 57 | ||||
-rw-r--r-- | devel/SDL/patches/patch-ak | 22 | ||||
-rw-r--r-- | devel/SDL/patches/patch-al | 20 | ||||
-rw-r--r-- | devel/SDL/patches/patch-an | 18 | ||||
-rw-r--r-- | devel/SDL/patches/patch-ao | 22 | ||||
-rw-r--r-- | devel/SDL/pkg/PLIST | 11 |
13 files changed, 88 insertions, 193 deletions
diff --git a/devel/SDL/Makefile b/devel/SDL/Makefile index 47ddc7456ed..35958d36680 100644 --- a/devel/SDL/Makefile +++ b/devel/SDL/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.10 2001/03/27 03:19:50 hubertf Exp $ +# $NetBSD: Makefile,v 1.11 2001/04/17 16:27:20 rh Exp $ # -DISTNAME= SDL-1.1.6 +DISTNAME= SDL-1.2.0 CATEGORIES= devel games MASTER_SITES= http://www.libsdl.org/release/ @@ -9,9 +9,10 @@ MAINTAINER= wiz@netbsd.org HOMEPAGE= http://www.libsdl.org/ COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library -BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf -BUILD_DEPENDS+= automake-1.4:../../devel/automake -DEPENDS+= pth>=1.3.5:../../devel/pth +BUILD_DEPENDS+= autoconf>=2.13:../../devel/autoconf +BUILD_DEPENDS+= automake>=1.4:../../devel/automake +BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm +DEPENDS+= pth>=1.4.0:../../devel/pth #DEPENDS+= unproven-pthreads>=0.16 DEPENDS+= esound>=0.2.18:../../audio/esound diff --git a/devel/SDL/distinfo b/devel/SDL/distinfo index a86414becf6..93221fb2beb 100644 --- a/devel/SDL/distinfo +++ b/devel/SDL/distinfo @@ -1,21 +1,19 @@ -$NetBSD: distinfo,v 1.1 2001/04/17 11:05:39 agc Exp $ +$NetBSD: distinfo,v 1.2 2001/04/17 16:27:20 rh Exp $ -MD5 (SDL-1.1.6.tar.gz) = e41b349360395feac648bfa6f50a1e77 +SHA1 (SDL-1.2.0.tar.gz) = ba99b4fbf04a7a9622dc6f8d103216abcf17ee19 +Size (SDL-1.2.0.tar.gz) = 1375872 bytes SHA1 (patch-aa) = 43b3532f1939fb6d1ead45297aa34dd5b1f2383d SHA1 (patch-ab) = f04507e6faaa43ff7ae276bd1f6dc10bf42539d9 -SHA1 (patch-ac) = 1789f14789b49447981eb5efbb92ac8611339aa0 +SHA1 (patch-ac) = a1f66a4df82beabbd1e29b3d3ed07c18faa0cdd6 SHA1 (patch-ad) = 04d1327490b71043a81a8576226c6396b9c0783a -SHA1 (patch-ae) = 2d037512af7a9a627a5c9a3aa000f88d80da3d34 -SHA1 (patch-af) = 8573ee9ba2b9ca49c3e138dee4a9e2064faf5f54 -SHA1 (patch-ag) = cc6498f4eb7b0a2266dc738eb52a75887347e757 +SHA1 (patch-ae) = 38e96e34e7e2bc8b6955ad71a25f5a4a2a9ee9b6 +SHA1 (patch-af) = 89d37132bbcecb65082dad3e0a40e15db5e4448c SHA1 (patch-ah) = f509c0c146002cf2525bd9b7c7532fbca7aa4fb6 -SHA1 (patch-ai) = 5c0bc0ce055e6f8b525e74b4482d641439c1f084 -SHA1 (patch-aj) = 3a0cf8c94fda39f105b9a1fbe6f7660b7b43d072 -SHA1 (patch-ak) = f89e1a56b52d866ae6e321b7854d852e8a95f40e -SHA1 (patch-al) = a90bea8ce9cdfa6ea62bd86598a7789cc37a5e21 +SHA1 (patch-ai) = 9c732852520b86e2ffa4b467d4b5220a53c9ecc6 +SHA1 (patch-aj) = 0867b14176c7601df57db3c81176457eb48d4566 +SHA1 (patch-ak) = 657947be674831c98850f044315e4681fe58ea29 SHA1 (patch-am) = 1231a8617f34c5bbdb3c8adc19cba4b0e18bb477 -SHA1 (patch-an) = 8905fb1c8d0550ea89fb4ff873eb4ea3e2da0aa9 -SHA1 (patch-ao) = 5abf03b29e9f5ec60b20d1006c41242c16325f3c +SHA1 (patch-an) = b875bc9e173d69cb5fcc1b4ea3e7039b7633d187 SHA1 (patch-ap) = c93c5d477dffb18fe9e83ce9248ecf5201d256bf SHA1 (patch-aq) = a9f429212c50bdce975322a578f79fa0982820e3 SHA1 (patch-ar) = 4dc9b69aad300332271c7798618ecb7132dfbb09 diff --git a/devel/SDL/patches/patch-ac b/devel/SDL/patches/patch-ac index 339fe21ac56..f3bbebcf551 100644 --- a/devel/SDL/patches/patch-ac +++ b/devel/SDL/patches/patch-ac @@ -1,18 +1,17 @@ -$NetBSD: patch-ac,v 1.2 2000/10/15 07:39:44 wulf Exp $ +$NetBSD: patch-ac,v 1.3 2001/04/17 16:27:21 rh Exp $ ---- src/audio/SDL_audio.c.orig Mon Sep 18 08:59:24 2000 -+++ src/audio/SDL_audio.c Mon Oct 2 13:22:55 2000 -@@ -45,6 +45,9 @@ - #ifdef unix +--- src/audio/SDL_audio.c.orig Wed Mar 21 18:19:56 2001 ++++ src/audio/SDL_audio.c +@@ -40,7 +40,7 @@ + + /* Available audio drivers */ + static AudioBootStrap *bootstrap[] = { +-#if defined(unix) && \ ++#if defined(__NetBSD__) || defined(unix) && \ + !defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \ + && !defined(__bsdi__) &AUDIO_bootstrap, - #endif -+#ifdef __NetBSD__ -+ &AUDIO_bootstrap, -+#endif - #ifdef linux - &DMA_bootstrap, - #endif -@@ -175,7 +178,7 @@ +@@ -185,7 +185,7 @@ /* Select the proper audio driver */ audio = NULL; idx = 0; diff --git a/devel/SDL/patches/patch-ae b/devel/SDL/patches/patch-ae index 42f4bc8dca1..dc432829b84 100644 --- a/devel/SDL/patches/patch-ae +++ b/devel/SDL/patches/patch-ae @@ -1,14 +1,13 @@ -$NetBSD: patch-ae,v 1.2 2000/10/15 07:39:44 wulf Exp $ +$NetBSD: patch-ae,v 1.3 2001/04/17 16:27:21 rh Exp $ ---- src/audio/SDL_sysaudio.h.orig Tue Sep 12 03:52:41 2000 -+++ src/audio/SDL_sysaudio.h Mon Oct 2 13:23:29 2000 -@@ -103,6 +103,9 @@ - #ifdef unix +--- src/audio/SDL_sysaudio.h.orig Wed Mar 21 18:19:56 2001 ++++ src/audio/SDL_sysaudio.h +@@ -99,7 +99,7 @@ + SDL_AudioDevice *(*create)(int devindex); + } AudioBootStrap; + +-#if defined(unix) && \ ++#if defined(__NetBSD__) || defined(unix) && \ + !defined(linux) && !defined(__FreeBSD__) && !defined(__CYGWIN32__) \ + && !defined(__bsdi__) extern AudioBootStrap AUDIO_bootstrap; - #endif -+#ifdef __NetBSD__ -+extern AudioBootStrap AUDIO_bootstrap; -+#endif - #ifdef ENABLE_WINDIB - extern AudioBootStrap WAVEOUT_bootstrap; - #endif diff --git a/devel/SDL/patches/patch-af b/devel/SDL/patches/patch-af index 92e509a7937..0ba84e36bb3 100644 --- a/devel/SDL/patches/patch-af +++ b/devel/SDL/patches/patch-af @@ -1,13 +1,13 @@ -$NetBSD: patch-af,v 1.2 2000/10/15 07:39:45 wulf Exp $ +$NetBSD: patch-af,v 1.3 2001/04/17 16:27:21 rh Exp $ ---- src/audio/Makefile.am.orig Wed Aug 23 13:05:26 2000 -+++ src/audio/Makefile.am Sun Oct 8 00:34:41 2000 -@@ -3,7 +3,7 @@ +--- src/hermes/Makefile.in.orig Tue Apr 17 16:30:45 2001 ++++ src/hermes/Makefile.in +@@ -334,7 +334,7 @@ - noinst_LTLIBRARIES = libaudio.la --EXTRA_SUBDIRS = aix amigaos beos irix linux macos openbsd solaris win32 -+EXTRA_SUBDIRS = aix amigaos beos irix linux macos netbsd openbsd solaris win32 - - SUBDIRS = @AUDIO_ARCH@ + .asm.lo: +- $(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) @NASMFLAGS@ $< ++ $(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(NASM) @NASMFLAGS@ $< + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/devel/SDL/patches/patch-ag b/devel/SDL/patches/patch-ag deleted file mode 100644 index 7a872ed65aa..00000000000 --- a/devel/SDL/patches/patch-ag +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ag,v 1.2 2000/10/15 07:39:45 wulf Exp $ - ---- src/video/SDL_yuv_sw.c.orig Sun Sep 24 10:29:46 2000 -+++ src/video/SDL_yuv_sw.c Mon Oct 2 13:23:42 2000 -@@ -909,7 +909,7 @@ - case SDL_IYUV_OVERLAY: - cpu_mmx = CPU_Flags() & MMX_CPU; - if ( display->format->BytesPerPixel == 2 ) { --#if defined(i386) && defined(__GNUC__) /* inline assembly functions */ -+#if defined(i386) && defined(__GNUC__) && !defined(__NetBSD__) /* inline assembly functions */ - if ( cpu_mmx && (Rmask == 0xF800) && - (Gmask == 0x07E0) && - (Bmask == 0x001F) && -@@ -925,7 +925,7 @@ - #endif - swdata->Display2X = Color16DitherYV12Mod2X; - } else { --#if defined(i386) && defined(__GNUC__) /* inline assembly functions */ -+#if defined(i386) && defined(__GNUC__) && !defined(__NetBSD__) /* inline assembly functions */ - if ( cpu_mmx && (Rmask == 0x00FF0000) && - (Gmask == 0x0000FF00) && - (Bmask == 0x000000FF) && diff --git a/devel/SDL/patches/patch-ai b/devel/SDL/patches/patch-ai index adc3f5bc890..f89d020090c 100644 --- a/devel/SDL/patches/patch-ai +++ b/devel/SDL/patches/patch-ai @@ -1,13 +1,13 @@ -$NetBSD: patch-ai,v 1.2 2000/10/15 07:39:45 wulf Exp $ +$NetBSD: patch-ai,v 1.3 2001/04/17 16:27:22 rh Exp $ ---- include/SDL_syswm.h.orig Thu Jul 27 05:25:52 2000 -+++ include/SDL_syswm.h Mon Oct 2 13:29:35 2000 +--- include/SDL_syswm.h.orig Wed Feb 28 13:35:28 2001 ++++ include/SDL_syswm.h @@ -49,7 +49,7 @@ #else /* This is the structure for custom window manager events */ -#if (defined(unix) || defined(__unix__) || defined(_AIX)) && \ -+#if (defined(unix) || defined(__unix__) || defined(__NetBSD__)|| defined(_AIX)) && \ - !defined(DISABLE_X11) ++#if (defined(unix) || defined(__unix__) || defined(__NetBSD__) || defined(_AIX)) && \ + (!defined(DISABLE_X11) && !defined(__CYGWIN32__)) /* AIX is unix, of course, but the native compiler CSet doesn't define unix */ #include <X11/Xlib.h> diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj index b877dd32533..53d967b7b72 100644 --- a/devel/SDL/patches/patch-aj +++ b/devel/SDL/patches/patch-aj @@ -1,31 +1,8 @@ -$NetBSD: patch-aj,v 1.3 2000/10/22 16:55:20 rh Exp $ +$NetBSD: patch-aj,v 1.4 2001/04/17 16:27:22 rh Exp $ ---- configure.in.orig Wed Sep 27 08:15:33 2000 +--- configure.in.orig Tue Mar 27 05:39:19 2001 +++ configure.in -@@ -903,6 +903,7 @@ - ;; - *-*-netbsd*) - ARCH=netbsd -+ CheckESD - CheckX11 - CheckAAlib - CheckOpenGL -@@ -912,6 +913,14 @@ - # Set up files for the audio library - AUDIO_ARCH=solaris - AUDIO_ARCH_LIB=$AUDIO_ARCH/libaudio_arch.la -+ if test x$enable_audio = xyes; then -+ COPY_ARCH_SRC(src/audio, solaris, SDL_audiodev_c.h) -+ COPY_ARCH_SRC(src/audio, linux, SDL_audiodev.c) -+ COPY_ARCH_SRC(src/audio, linux, SDL_esdaudio.h) -+ COPY_ARCH_SRC(src/audio, linux, SDL_esdaudio.c) -+ COPY_ARCH_SRC(src/audio, solaris, SDL_lowaudio.h) -+ COPY_ARCH_SRC(src/audio, solaris, SDL_sysaudio.c) -+ fi - # Set up files for the joystick library - # (No joystick support yet) - if test x$enable_joystick = xyes; then -@@ -927,7 +936,11 @@ +@@ -1199,7 +1199,11 @@ COPY_ARCH_SRC(src/thread, linux, SDL_systhread_c.h) COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex.c) COPY_ARCH_SRC(src/thread, linux, SDL_sysmutex_c.h) @@ -38,7 +15,7 @@ $NetBSD: patch-aj,v 1.3 2000/10/22 16:55:20 rh Exp $ COPY_ARCH_SRC(src/thread, generic, SDL_syssem_c.h) COPY_ARCH_SRC(src/thread, linux, SDL_syscond.c) COPY_ARCH_SRC(src/thread, generic, SDL_syscond_c.h) -@@ -937,7 +950,7 @@ +@@ -1209,7 +1213,7 @@ COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c) fi # NetBSD does not define "unix" @@ -47,30 +24,22 @@ $NetBSD: patch-aj,v 1.3 2000/10/22 16:55:20 rh Exp $ ;; *-*-openbsd*) ARCH=openbsd -@@ -1325,6 +1338,7 @@ - AM_CONDITIONAL(TARGET_SOLARIS, test $ARCH = solaris) +@@ -1769,6 +1773,7 @@ AM_CONDITIONAL(TARGET_IRIX, test $ARCH = irix) + AM_CONDITIONAL(TARGET_BSDI, test $ARCH = bsdi) AM_CONDITIONAL(TARGET_FREEBSD, test $ARCH = freebsd) +AM_CONDITIONAL(TARGET_NETBSD, test $ARCH = netbsd) AM_CONDITIONAL(TARGET_OPENBSD, test $ARCH = openbsd) AM_CONDITIONAL(TARGET_AIX, test $ARCH = aix) AM_CONDITIONAL(TARGET_WIN32, test $ARCH = win32) -@@ -1341,6 +1355,10 @@ - SDL_RLD_FLAGS="-R\${exec_prefix}/lib" - fi +@@ -1788,6 +1793,10 @@ -+if test $ARCH = netbsd; then -+ SDL_RLD_FLAGS="-Wl,-R\${exec_prefix}/lib -Wl,-R\${X11BASE}/lib" + if test $ARCH = solaris; then + SDL_RLD_FLAGS="-R\${exec_prefix}/lib" +fi + ++if test $ARCH = netbsd; then ++ SDL_RLD_FLAGS="-Wl,-R\${exec_prefix}/lib -Wl,-R\${X11BASE}/lib" + fi + dnl Output the video drivers we use - if test x$enable_video = xtrue; then - if test "$VIDEO_SUBDIRS" = ""; then -@@ -1395,6 +1413,7 @@ - src/audio/irix/Makefile - src/audio/linux/Makefile - src/audio/macos/Makefile -+src/audio/netbsd/Makefile - src/audio/openbsd/Makefile - src/audio/solaris/Makefile - src/audio/win32/Makefile diff --git a/devel/SDL/patches/patch-ak b/devel/SDL/patches/patch-ak index 71fed09fe63..c3dd8009da3 100644 --- a/devel/SDL/patches/patch-ak +++ b/devel/SDL/patches/patch-ak @@ -1,15 +1,15 @@ -$NetBSD: patch-ak,v 1.3 2000/12/27 11:54:33 hubertf Exp $ +$NetBSD: patch-ak,v 1.4 2001/04/17 16:27:22 rh Exp $ ---- sdl-config.in.orig Sun Sep 24 02:59:01 2000 -+++ sdl-config.in Wed Dec 27 12:30:27 2000 +--- sdl-config.in.orig Wed Feb 28 16:53:18 2001 ++++ sdl-config.in @@ -48,8 +48,8 @@ echo $includes -I@includedir@/SDL @SDL_CFLAGS@ ;; - --libs) -- libdirs="-L@libdir@ @SDL_RLD_FLAGS@" -- echo $libdirs @SDL_LIBS@ -+ libdirs="-L@libdir@ -Wl,-R@libdir@ @SDL_RLD_FLAGS@" -+ echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@ - ;; - --static-libs) - libdirs="-L@libdir@ @SDL_RLD_FLAGS@" + @ENABLE_SHARED_TRUE@ --libs) +-@ENABLE_SHARED_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@" +-@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_LIBS@ ++@ENABLE_SHARED_TRUE@ libdirs="-L@libdir@ -Wl,-R@libdir@ @SDL_RLD_FLAGS@" ++@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@ + @ENABLE_SHARED_TRUE@ ;; + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs) + @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs) diff --git a/devel/SDL/patches/patch-al b/devel/SDL/patches/patch-al deleted file mode 100644 index ea5e3820511..00000000000 --- a/devel/SDL/patches/patch-al +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-al,v 1.2 2000/10/15 07:39:45 wulf Exp $ - ---- 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 - - libjoystick_la_SOURCES = $(COMMON_SRCS) $(ARCH_SRCS) - diff --git a/devel/SDL/patches/patch-an b/devel/SDL/patches/patch-an index 162177b4940..f2d4ca16aec 100644 --- a/devel/SDL/patches/patch-an +++ b/devel/SDL/patches/patch-an @@ -1,7 +1,7 @@ -$NetBSD: patch-an,v 1.1 2000/10/22 16:55:20 rh Exp $ +$NetBSD: patch-an,v 1.2 2001/04/17 16:27:23 rh Exp $ ---- src/audio/solaris/SDL_sysaudio.c.orig Sun Sep 24 05:07:32 2000 -+++ src/audio/solaris/SDL_sysaudio.c +--- src/audio/sun/SDL_sunaudio.c.orig Sat Feb 10 08:20:03 2001 ++++ src/audio/sun/SDL_sunaudio.c @@ -52,6 +52,10 @@ #include "SDL_audio_c.h" #include "SDL_timer.h" @@ -13,15 +13,3 @@ $NetBSD: patch-an,v 1.1 2000/10/22 16:55:20 rh Exp $ /* Open the audio device for playback, and don't block if busy */ #define OPEN_FLAGS (O_WRONLY|O_NONBLOCK) -@@ -109,7 +113,11 @@ - } - - AudioBootStrap AUDIO_bootstrap = { -+#ifdef __NetBSD__ -+ "audio", Audio_Available, Audio_CreateDevice -+#else - "dsp", Audio_Available, Audio_CreateDevice -+#endif - }; - - #ifdef DEBUG_AUDIO diff --git a/devel/SDL/patches/patch-ao b/devel/SDL/patches/patch-ao deleted file mode 100644 index 566812d4263..00000000000 --- a/devel/SDL/patches/patch-ao +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2000/10/22 16:55:20 rh Exp $ - ---- src/audio/Makefile.in.orig Fri Aug 4 21:23:52 2000 -+++ src/audio/Makefile.in -@@ -110,7 +110,7 @@ - COMMON_SRCS = SDL_audio.c SDL_audio_c.h SDL_audiocvt.c SDL_audiomem.c SDL_audiomem.h SDL_mixer.c SDL_sysaudio.h SDL_wave.c SDL_wave.h - - --libaudio_la_SOURCES = $(COMMON_SRCS) -+libaudio_la_SOURCES = $(COMMON_SRCS) SDL_esdaudio.c - libaudio_la_LIBADD = @AUDIO_ARCH_LIB@ - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_CLEAN_FILES = -@@ -128,7 +128,7 @@ - libaudio_la_LDFLAGS = - libaudio_la_DEPENDENCIES = - libaudio_la_OBJECTS = SDL_audio.lo SDL_audiocvt.lo SDL_audiomem.lo \ --SDL_mixer.lo SDL_wave.lo -+SDL_mixer.lo SDL_wave.lo SDL_esdaudio.lo - CFLAGS = @CFLAGS@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/devel/SDL/pkg/PLIST b/devel/SDL/pkg/PLIST index 4480d556177..f741202f19c 100644 --- a/devel/SDL/pkg/PLIST +++ b/devel/SDL/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2001/01/04 15:10:26 agc Exp $ +@comment $NetBSD: PLIST,v 1.7 2001/04/17 16:27:24 rh Exp $ bin/sdl-config include/SDL/SDL.h include/SDL/SDL_active.h @@ -9,6 +9,7 @@ include/SDL/SDL_copying.h include/SDL/SDL_endian.h include/SDL/SDL_error.h include/SDL/SDL_events.h +include/SDL/SDL_getenv.h include/SDL/SDL_joystick.h include/SDL/SDL_keyboard.h include/SDL/SDL_keysym.h @@ -28,8 +29,8 @@ include/SDL/close_code.h lib/libSDL.a lib/libSDL.la lib/libSDL.so -lib/libSDL.so.5 -lib/libSDL.so.5.1 +lib/libSDL.so.0 +lib/libSDL.so.0.0 lib/libSDLmain.a man/man3/SDLKey.3 man/man3/SDL_ActiveEvent.3 @@ -92,7 +93,9 @@ man/man3/SDL_GL_SwapBuffers.3 man/man3/SDL_GLattr.3 man/man3/SDL_GetAppState.3 man/man3/SDL_GetAudioStatus.3 +man/man3/SDL_GetClipRect.3 man/man3/SDL_GetCursor.3 +man/man3/SDL_GetEventFilter.3 man/man3/SDL_GetGamma.3 man/man3/SDL_GetGammaRamp.3 man/man3/SDL_GetKeyName.3 @@ -153,6 +156,7 @@ man/man3/SDL_PushEvent.3 man/man3/SDL_Quit.3 man/man3/SDL_QuitEvent.3 man/man3/SDL_QuitSubSystem.3 +man/man3/SDL_RWFromFile.3 man/man3/SDL_Rect.3 man/man3/SDL_RemoveTimer.3 man/man3/SDL_ResizeEvent.3 @@ -184,6 +188,7 @@ man/man3/SDL_UnlockYUVOverlay.3 man/man3/SDL_UpdateRect.3 man/man3/SDL_UpdateRects.3 man/man3/SDL_UserEvent.3 +man/man3/SDL_VideoDriverName.3 man/man3/SDL_VideoInfo.3 man/man3/SDL_VideoModeOK.3 man/man3/SDL_WM_GetCaption.3 |