diff options
Diffstat (limited to 'devel/SDL/patches/patch-aj')
| -rw-r--r-- | devel/SDL/patches/patch-aj | 57 |
1 files changed, 13 insertions, 44 deletions
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 |