head 1.26; access; symbols pkgsrc-2013Q2:1.26.0.24 pkgsrc-2013Q2-base:1.26 pkgsrc-2012Q4:1.26.0.22 pkgsrc-2012Q4-base:1.26 pkgsrc-2011Q4:1.26.0.20 pkgsrc-2011Q4-base:1.26 pkgsrc-2011Q2:1.26.0.18 pkgsrc-2011Q2-base:1.26 pkgsrc-2009Q4:1.26.0.16 pkgsrc-2009Q4-base:1.26 pkgsrc-2008Q4:1.26.0.14 pkgsrc-2008Q4-base:1.26 pkgsrc-2008Q3:1.26.0.12 pkgsrc-2008Q3-base:1.26 cube-native-xorg:1.26.0.10 cube-native-xorg-base:1.26 pkgsrc-2008Q2:1.26.0.8 pkgsrc-2008Q2-base:1.26 pkgsrc-2008Q1:1.26.0.6 pkgsrc-2008Q1-base:1.26 pkgsrc-2007Q4:1.26.0.4 pkgsrc-2007Q4-base:1.26 pkgsrc-2007Q3:1.26.0.2 pkgsrc-2007Q3-base:1.26 pkgsrc-2007Q2:1.25.0.10 pkgsrc-2007Q2-base:1.25 pkgsrc-2007Q1:1.25.0.8 pkgsrc-2007Q1-base:1.25 pkgsrc-2006Q4:1.25.0.6 pkgsrc-2006Q4-base:1.25 pkgsrc-2006Q3:1.25.0.4 pkgsrc-2006Q3-base:1.25 pkgsrc-2006Q2:1.25.0.2 pkgsrc-2006Q2-base:1.25 pkgsrc-2006Q1:1.24.0.2 pkgsrc-2006Q1-base:1.24 pkgsrc-2005Q4:1.23.0.4 pkgsrc-2005Q4-base:1.23 pkgsrc-2005Q3:1.23.0.2 pkgsrc-2005Q3-base:1.23 pkgsrc-2005Q2:1.22.0.2 pkgsrc-2005Q2-base:1.22 pkgsrc-2005Q1:1.20.0.2 pkgsrc-2005Q1-base:1.20 pkgsrc-2004Q4:1.19.0.4 pkgsrc-2004Q4-base:1.19 pkgsrc-2004Q3:1.19.0.2 pkgsrc-2004Q3-base:1.19 pkgsrc-2004Q2:1.18.0.2 pkgsrc-2004Q2-base:1.18 pkgsrc-2004Q1:1.17.0.4 pkgsrc-2004Q1-base:1.17 pkgsrc-2003Q4:1.17.0.2 pkgsrc-2003Q4-base:1.17 netbsd-1-6-1:1.15.0.2 netbsd-1-6-1-base:1.15 netbsd-1-6:1.12.0.6 netbsd-1-6-RELEASE-base:1.12 pkgviews:1.12.0.2 pkgviews-base:1.12 buildlink2:1.9.0.2 buildlink2-base:1.12 netbsd-1-5-PATCH003:1.9 netbsd-1-5-PATCH001:1.5 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.26 date 2007.07.25.23.31.09; author wiz; state dead; branches; next 1.25; 1.25 date 2006.06.12.16.20.44; author wiz; state Exp; branches; next 1.24; 1.24 date 2006.02.07.18.15.50; author wiz; state Exp; branches; next 1.23; 1.23 date 2005.09.07.10.15.39; author adam; state Exp; branches; next 1.22; 1.22 date 2005.05.31.17.37.50; author wiz; state Exp; branches; next 1.21; 1.21 date 2005.05.20.20.08.40; author wiz; state Exp; branches; next 1.20; 1.20 date 2005.01.05.12.05.19; author adam; state Exp; branches; next 1.19; 1.19 date 2004.07.13.20.51.58; author kristerw; state Exp; branches; next 1.18; 1.18 date 2004.04.17.00.15.21; author snj; state Exp; branches; next 1.17; 1.17 date 2003.09.04.09.53.33; author drochner; state Exp; branches; next 1.16; 1.16 date 2003.09.03.19.30.57; author drochner; state Exp; branches; next 1.15; 1.15 date 2002.10.31.22.19.50; author jlam; state Exp; branches; next 1.14; 1.14 date 2002.10.13.19.28.58; author kristerw; state Exp; branches; next 1.13; 1.13 date 2002.08.25.19.22.18; author jlam; state Exp; branches; next 1.12; 1.12 date 2002.07.15.23.04.20; author kristerw; state Exp; branches; next 1.11; 1.11 date 2002.07.14.07.28.40; author kristerw; state Exp; branches; next 1.10; 1.10 date 2002.07.13.16.17.33; author wiz; state Exp; branches; next 1.9; 1.9 date 2002.02.14.00.39.46; author wiz; state Exp; branches 1.9.2.1; next 1.8; 1.8 date 2001.09.24.14.28.56; author rh; state Exp; branches; next 1.7; 1.7 date 2001.07.14.15.45.35; author jlam; state Exp; branches; next 1.6; 1.6 date 2001.07.03.06.17.33; author rh; state Exp; branches; next 1.5; 1.5 date 2001.05.05.13.47.13; author rh; state Exp; branches; next 1.4; 1.4 date 2001.04.17.16.27.22; author rh; state Exp; branches; next 1.3; 1.3 date 2000.10.22.16.55.20; author rh; state Exp; 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.06.26.01.09.09; author wiz; state Exp; branches 1.1.1.1; next ; 1.9.2.1 date 2002.08.22.11.10.16; author jlam; state Exp; branches; next ; 1.1.1.1 date 2000.06.26.01.09.09; author wiz; state Exp; branches; next ; desc @@ 1.26 log @Update to 1.2.12: 1.2.12: Added SDL_VIDEO_ALLOW_SCREENSAVER to override SDL's disabling of the screensaver on Mac OS X and X11. Also, many pkgsrc patches were integrated. @ text @$NetBSD: patch-aj,v 1.25 2006/06/12 16:20:44 wiz Exp $ --- configure.in.orig 2006-05-17 03:16:07.000000000 +0000 +++ configure.in @@@@ -512,10 +512,10 @@@@ AC_HELP_STRING([--enable-nas], [support if test x$enable_audio = xyes -a x$enable_nas = xyes; then AC_MSG_CHECKING(for NAS audio support) have_nas=no - if test -r /usr/X11R6/include/audio/audiolib.h; then + if true; then have_nas=yes - NAS_CFLAGS="-I/usr/X11R6/include/" - NAS_LIBS="-L/usr/X11R6/lib -laudio -lXt" + NAS_CFLAGS="" + NAS_LIBS="-laudio -lXt" dnl On IRIX, the NAS includes are in a different directory, dnl and libnas must be explicitly linked in @@@@ -1642,7 +1642,7 @@@@ AC_HELP_STRING([--enable-pthread-sem], [ ;; *-*-netbsd*) pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" - pthread_lib="-L/usr/lib -lpthread" + pthread_lib="-lpthread" ;; *-*-openbsd*) pthread_cflags="-D_REENTRANT" @@@@ -1985,8 +1985,13 @@@@ CheckUSBHID() #if defined(HAVE_USB_H) #include #endif + #ifdef __DragonFly__ + #include + #include + #else #include #include + #endif #if defined(HAVE_USBHID_H) #include #elif defined(HAVE_LIBUSB_H) @ 1.25 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 @d1 1 a1 1 $NetBSD: patch-aj,v 1.24 2006/02/07 18:15:50 wiz Exp $ @ 1.24 log @Remove some chunks that should not be necessary any longer. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.23 2005/09/07 10:15:39 adam Exp $ d3 1 a3 1 --- configure.in.orig 2005-08-28 06:31:18.000000000 +0000 d5 1 a5 23 @@@@ -28,9 +28,9 @@@@ AC_SUBST(SDL_VERSION) # libtool versioning LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION -LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE` -LT_REVISION=$SDL_INTERFACE_AGE -LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE` +LT_CURRENT=$SDL_INTERFACE_AGE +LT_REVISION=$SDL_BINARY_AGE +LT_AGE=0 AC_SUBST(LT_RELEASE) AC_SUBST(LT_CURRENT) @@@@ -267,6 +267,8 @@@@ CheckOSS() AC_MSG_RESULT($have_oss) if test x$have_oss = xyes; then CFLAGS="$CFLAGS -DOSS_SUPPORT" + LDFLAGS="$LDFLAGS $LIBOSSAUDIO" + SDL_LIBS="$SDL_LIBS $LIBOSSAUDIO" AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp" AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la" AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma" @@@@ -456,9 +458,9 @@@@ CheckNAS() d12 8 a19 35 - CFLAGS="$CFLAGS -DNAS_SUPPORT -I/usr/X11R6/include/" + CFLAGS="$CFLAGS -DNAS_SUPPORT" SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt" AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas" AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la" @@@@ -539,7 +541,7 @@@@ CheckNASM() NASMFLAGS="-f aoutb" ;; *) - NASMFLAGS="-f elf" + test -n "$NASMFLAGS" || NASMFLAGS="-f elf" ;; esac AC_SUBST(NASMFLAGS) @@@@ -1202,12 +1204,13 @@@@ CheckPTH() [ --enable-pth use GNU pth library for multi-threading [default=yes]], , enable_pth=yes) if test x$enable_threads = xyes -a x$enable_pth = xyes; then - AC_PATH_PROG(PTH_CONFIG, pth-config, no) - if test "$PTH_CONFIG" = "no"; then + # Use the libpthread version of the pth library. + AC_PATH_PROG(PTHREAD_CONFIG, pthread-config, no) + if test "$PTHREAD_CONFIG" = "no"; then use_pth=no else - PTH_CFLAGS=`$PTH_CONFIG --cflags` - PTH_LIBS=`$PTH_CONFIG --libs --all` + PTH_CFLAGS=`$PTHREAD_CONFIG --cflags` + PTH_LIBS=`$PTHREAD_CONFIG --libs --all` SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS" SDL_LIBS="$SDL_LIBS $PTH_LIBS" CFLAGS="$CFLAGS -DENABLE_PTH" @@@@ -1247,9 +1250,13 @@@@ CheckPTHREAD() pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" pthread_lib="-pthread" a20 4 + *-*-dragonfly*) + pthread_cflags="-D_REENTRANT" + pthread_lib="-pthread" + ;; d22 2 a23 3 - pthread_cflags="-I/usr/pkg/include -D_REENTRANT" - pthread_lib="-L/usr/pkg/lib -lpthread -lsem" + pthread_cflags="-D_REENTRANT" d28 1 a28 56 @@@@ -1723,29 +1730,31 @@@@ CheckUSBHID() have_libusbhid=no have_libusb=no AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes) - AC_CHECK_LIB(usb, hid_init, have_libusb=yes) if test x$have_libusbhid = xyes; then SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid" + + AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes) + AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes) + if test x$have_usbhid_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_USBHID_H" + fi + if test x$have_libusbhid_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H" fi + else + AC_CHECK_LIB(usb, hid_init, have_libusb=yes) if test x$have_libusb = xyes; then SYSTEM_LIBS="$SYSTEM_LIBS -lusb" - fi AC_CHECK_HEADER(usb.h, have_usb_h=yes) - AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes) AC_CHECK_HEADER(libusb.h, have_libusb_h=yes) - AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes) if test x$have_usb_h = xyes; then CFLAGS="$CFLAGS -DHAVE_USB_H" fi - if test x$have_usbhid_h = xyes; then - CFLAGS="$CFLAGS -DHAVE_USBHID_H" - fi if test x$have_libusb_h = xyes; then CFLAGS="$CFLAGS -DHAVE_LIBUSB_H" fi - if test x$have_libusbhid_h = xyes; then - CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H" + fi fi AC_MSG_CHECKING(for usbhid) @@@@ -1755,8 +1764,13 @@@@ CheckUSBHID() #if defined(HAVE_USB_H) #include #endif + #ifdef __DragonFly__ + #include + #include + #else #include #include + #endif #if defined(HAVE_USBHID_H) #include #elif defined(HAVE_LIBUSB_H) @@@@ -1781,8 +1795,13 @@@@ CheckUSBHID() a41 92 @@@@ -1808,8 +1827,13 @@@@ CheckUSBHID() #if defined(HAVE_USB_H) #include #endif + #ifdef __DragonFly__ + #include + #include + #else #include #include + #endif #if defined(HAVE_USBHID_H) #include #elif defined(HAVE_LIBUSB_H) @@@@ -1834,6 +1858,26 @@@@ CheckUSBHID() fi } +dnl Check for the NetBSD machine/joystick.h +CheckMachineJoystick() +{ + if test x$enable_joystick = xyes; then + AC_MSG_CHECKING(whether struct joystick is defined in machine/joystick.h) + have_machine_joystick=no + AC_TRY_COMPILE([ + #include + ],[ + struct joystick t; + ],[ + have_machine_joystick=yes + ]) + AC_MSG_RESULT($have_machine_joystick) + if test x$have_machine_joystick = xyes; then + CFLAGS="$CFLAGS -DHAVE_MACHINE_JOYSTICK" + fi + fi +} + dnl Check for altivec instruction support using gas syntax CheckAltivec() { @@@@ -2013,7 +2057,7 @@@@ case "$target" in COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c) fi ;; - *-*-freebsd*) + *-*-freebsd* | *-*-dragonfly*) ARCH=freebsd CheckDummyVideo CheckDiskAudio @@@@ -2065,17 +2109,19 @@@@ case "$target" in CheckESD CheckNAS CheckX11 + CheckDGA CheckAAlib CheckOpenGL CheckPTHREAD CheckSIGACTION CheckUSBHID CheckRPATH + CheckMachineJoystick # Set up files for the audio library if test x$enable_audio = xyes; then - CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" - AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" - AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" + CFLAGS="$CFLAGS -DOPENBSD_AUDIO_SUPPORT" + AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd" + AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la" fi # Set up files for the cdrom library if test x$enable_cdrom = xyes; then @@@@ -2084,9 +2130,6 @@@@ case "$target" in fi # Set up files for the thread library if test x$enable_threads = xyes; then - if test x$use_pthreads = xyes; then - CFLAGS="$CFLAGS -D_POSIX_THREAD_SYSCALL_SOFT=1" - fi CopyUnixThreadSource fi # Set up files for the timer library @@@@ -2755,7 +2798,7 @@@@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ # Set runtime shared library paths as needed if test "x$enable_rpath" = "xyes"; then - if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then + if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = netbsd; then SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib" fi if test $ARCH = solaris; then @ 1.23 log @Changes 1.2.9: * Added support for direct color 8-bpp surfaces * Altivec optimized blitters * SDL.dll works on Windows 95 again * Dropping a document onto an SDL app passes it as a command line parameter in MacOS X * Fixed crash trying to allocate hardware surfaces on MacOS X * Fixed short read problem with SDL_RWFromMem() * Fixed gcc parse errors in SDL_audio.h on Windows * Added support for Tru64 UNIX 4.X * Improved RISC OS support * Numerous improvements to the Atari port * SDL_OPENGLBLIT is officially obsolete @ text @d1 1 a1 1 $NetBSD$ a47 25 @@@@ -985,18 +987,18 @@@@ CheckAAlib() [ --enable-video-aalib use AAlib video driver [default=no]], , enable_video_aalib=no) if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then + AC_PATH_PROG(AALIB_CONFIG, aalib-config) AC_MSG_CHECKING(for AAlib support) + if test x$AALIB_CONFIG = x; then video_aalib=no - AC_TRY_COMPILE([ - #include - ],[ - ],[ + else + AALIB_LIBS=`$AALIB_CONFIG --libs` video_aalib=yes - ]) + fi AC_MSG_RESULT($video_aalib) if test x$video_aalib = xyes; then CFLAGS="$CFLAGS -DENABLE_AALIB" - SYSTEM_LIBS="$SYSTEM_LIBS -laa" + SYSTEM_LIBS="$SYSTEM_LIBS $AALIB_LIBS" VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib" VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la" @ 1.22 log @Better DragonFlyBSD support from Joerg Sonnenberger. . find USB headers . fix joystick support @ text @d3 1 a3 1 --- configure.in.orig 2004-12-13 10:02:08.000000000 +0100 d107 1 a107 1 @@@@ -1724,29 +1731,31 @@@@ CheckUSBHID() d148 1 a148 1 @@@@ -1756,8 +1765,13 @@@@ CheckUSBHID() d162 1 a162 1 @@@@ -1782,8 +1796,13 @@@@ CheckUSBHID() d176 1 a176 1 @@@@ -1809,8 +1828,13 @@@@ CheckUSBHID() d190 1 a190 1 @@@@ -1835,6 +1859,26 @@@@ CheckUSBHID() d217 1 a217 1 @@@@ -1992,7 +2036,7 @@@@ case "$target" in d226 1 a226 1 @@@@ -2043,16 +2087,18 @@@@ case "$target" in d230 1 a230 1 + CheckDGA d236 2 a237 1 + CheckMachineJoystick d249 1 a249 1 @@@@ -2061,9 +2107,6 @@@@ case "$target" in d259 1 a259 2 @@@@ -2724,7 +2767,7 @@@@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ d262 6 a267 5 -if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then +if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = netbsd; then SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib" fi if test $ARCH = solaris; then @ 1.21 log @Support for DragonFlyBSD, based on patches from Joerg Sonnenberger. @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $ d148 43 a190 1 @@@@ -1835,6 +1844,26 @@@@ CheckUSBHID() d217 1 a217 1 @@@@ -1992,7 +2021,7 @@@@ case "$target" in d226 1 a226 1 @@@@ -2043,16 +2072,18 @@@@ case "$target" in d248 1 a248 1 @@@@ -2061,9 +2092,6 @@@@ case "$target" in d258 1 a258 1 @@@@ -2724,7 +2752,7 @@@@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ @ 1.20 log @Changes 1.2.8: * Fixed compiling under newer versions of gcc * Fixed floating point exception with Linux 2.6 joysticks * Added 4/6 channel surround sound support on ALSA (not 3D audio) * Fixed mouse coordinate inversion on MacOS X * Added a CoreAudio sound driver for MacOS X * Added MacOS X Xcode build environment support * Updated QNX support for QNX6 * Improved Atari port, including OSMesa support * Numerous other bug fixes and platform support improvements @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- configure.in.orig 2004-12-13 09:02:08.000000000 +0000 d91 2 a92 1 @@@@ -1248,8 +1251,8 @@@@ CheckPTHREAD() d95 4 d107 1 a107 1 @@@@ -1724,29 +1727,31 @@@@ CheckUSBHID() d148 1 a148 1 @@@@ -1835,6 +1840,26 @@@@ CheckUSBHID() d175 10 a184 1 @@@@ -2043,16 +2068,18 @@@@ case "$target" in d206 1 a206 1 @@@@ -2061,9 +2088,6 @@@@ case "$target" in d216 1 a216 1 @@@@ -2724,7 +2748,7 @@@@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ @ 1.19 log @Make this package build on NetBSD ports that do not have . @ text @d3 3 a5 3 --- configure.in.orig Sun Feb 22 22:31:47 2004 +++ configure.in Tue Jul 13 22:28:09 2004 @@@@ -28,9 +28,9 @@@@ d18 1 a18 1 @@@@ -267,6 +267,8 @@@@ d27 1 a27 1 @@@@ -422,9 +424,9 @@@@ d39 1 a39 1 @@@@ -505,7 +507,7 @@@@ d48 1 a48 1 @@@@ -943,18 +945,18 @@@@ d73 1 a73 1 @@@@ -1125,12 +1127,13 @@@@ d91 1 a91 1 @@@@ -1171,8 +1174,8 @@@@ d102 1 a102 1 @@@@ -1638,29 +1641,31 @@@@ d143 1 a143 1 @@@@ -1749,6 +1754,26 @@@@ d170 1 a170 1 @@@@ -1957,16 +1982,18 @@@@ d192 1 a192 1 @@@@ -1975,9 +2002,6 @@@@ d202 1 a202 1 @@@@ -2606,7 +2630,7 @@@@ @ 1.18 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 @d3 3 a5 3 --- configure.in.orig 2004-02-22 13:31:47.000000000 -0800 +++ configure.in 2004-04-10 16:05:54.000000000 -0700 @@@@ -28,9 +28,9 @@@@ AC_SUBST(SDL_VERSION) d18 1 a18 1 @@@@ -267,6 +267,8 @@@@ CheckOSS() d27 1 a27 1 @@@@ -422,9 +424,9 @@@@ CheckNAS() d39 1 a39 1 @@@@ -505,7 +507,7 @@@@ CheckNASM() d48 1 a48 1 @@@@ -943,18 +945,18 @@@@ CheckAAlib() d54 2 a55 1 - video_aalib=no a59 4 - video_aalib=yes - ]) + if test x$AALIB_CONFIG = x; then + video_aalib=no d62 2 a63 1 + video_aalib=yes d73 1 a73 1 @@@@ -1125,12 +1127,13 @@@@ CheckPTH() d91 1 a91 1 @@@@ -1171,8 +1174,8 @@@@ CheckPTHREAD() d102 1 a102 1 @@@@ -1638,29 +1641,31 @@@@ CheckUSBHID() d143 28 a170 1 @@@@ -1957,6 +1962,7 @@@@ case "$target" in d178 1 a178 1 @@@@ -1964,9 +1970,9 @@@@ case "$target" in d180 1 d192 1 a192 1 @@@@ -1975,9 +1981,6 @@@@ case "$target" in d202 1 a202 1 @@@@ -2606,7 +2609,7 @@@@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ @ 1.17 log @oops - one modification was just in the generated "configure", not in "configure.in", so it got lost during regen @ text @d3 16 a18 3 --- configure.in.orig 2003-08-30 21:13:18.000000000 +0200 +++ configure.in @@@@ -258,6 +258,8 @@@@ CheckOSS() d27 1 a27 1 @@@@ -413,7 +415,7 @@@@ CheckNAS() d34 2 a35 1 CFLAGS="$CFLAGS -DNAS_SUPPORT" d37 3 a39 1 @@@@ -496,7 +498,7 @@@@ CheckNASM() d48 1 a48 1 @@@@ -933,18 +935,18 @@@@ CheckAAlib() d75 1 a75 1 @@@@ -1115,12 +1117,13 @@@@ CheckPTH() d93 1 a93 1 @@@@ -1161,8 +1164,8 @@@@ CheckPTHREAD() d104 1 a104 1 @@@@ -1600,29 +1603,31 @@@@ CheckUSBHID() d145 1 a145 1 @@@@ -1868,6 +1873,7 @@@@ case "$target" in d153 2 a154 2 @@@@ -1876,9 +1882,9 @@@@ case "$target" in COPY_ARCH_SRC(src/main, linux, SDL_main.c) d166 1 a166 1 @@@@ -1887,9 +1893,6 @@@@ case "$target" in d176 1 a176 1 @@@@ -2543,7 +2546,7 @@@@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ @ 1.16 log @update to 1.2.6 There are many bug fixes and improvements in this release, including MMX and 3DNow! optimized alpha blending, MMX optimized audio mixing, support for OpenGL FSAA, and official QNX support! @ text @d5 10 a14 1 @@@@ -413,7 +413,7 @@@@ CheckNAS() d23 1 a23 1 @@@@ -496,7 +496,7 @@@@ CheckNASM() d32 1 a32 1 @@@@ -933,18 +933,18 @@@@ CheckAAlib() d59 1 a59 1 @@@@ -1115,12 +1115,13 @@@@ CheckPTH() d77 1 a77 1 @@@@ -1161,8 +1162,8 @@@@ CheckPTHREAD() d88 1 a88 1 @@@@ -1600,29 +1601,31 @@@@ CheckUSBHID() d129 1 a129 1 @@@@ -1868,6 +1871,7 @@@@ case "$target" in d137 1 a137 1 @@@@ -1876,9 +1880,9 @@@@ case "$target" in d150 1 a150 1 @@@@ -1887,9 +1891,6 @@@@ case "$target" in d160 1 a160 1 @@@@ -2543,7 +2544,7 @@@@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ @ 1.15 log @Fix the sdl-config script to return the correct libraries for linking against libaa by querying the aalib-config script. Bump the PKGREVISION since this change is user-visible. @ text @d3 1 a3 1 --- configure.in.orig Sun Oct 6 16:34:53 2002 d5 1 a5 2 @@@@ -412,10 +412,7 @@@@ CheckNAS() , enable_nas=yes) d8 1 a8 1 - have_nas=no d10 1 a11 3 - fi AC_MSG_RESULT($have_nas) if test x$have_nas = xyes; then d13 2 a14 1 @@@@ -488,7 +485,7 @@@@ CheckNASM() d23 1 a23 1 @@@@ -925,18 +922,18 @@@@ CheckAAlib() d50 1 a50 1 @@@@ -1104,12 +1101,13 @@@@ CheckPTH() d68 1 a68 1 @@@@ -1150,8 +1148,8 @@@@ CheckPTHREAD() d79 1 a79 1 @@@@ -1566,29 +1564,31 @@@@ CheckUSBHID() d120 1 a120 1 @@@@ -1834,6 +1834,7 @@@@ case "$target" in d128 1 a128 1 @@@@ -1842,9 +1843,9 @@@@ case "$target" in d141 1 a141 1 @@@@ -1853,9 +1854,6 @@@@ case "$target" in d151 1 a151 1 @@@@ -2478,7 +2476,7 @@@@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ @ 1.14 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 @d2 4 a5 3 --- configure.in.orig Sun Oct 13 14:01:53 2002 +++ configure.in Sun Oct 13 20:41:57 2002 @@@@ -412,10 +412,7 @@@@ d16 1 a16 1 @@@@ -488,7 +485,7 @@@@ d25 28 a52 1 @@@@ -1104,12 +1101,13 @@@@ d70 1 a70 1 @@@@ -1150,8 +1148,8 @@@@ d81 1 a81 1 @@@@ -1566,29 +1564,31 @@@@ d122 1 a122 1 @@@@ -1834,6 +1834,7 @@@@ d130 1 a130 1 @@@@ -1842,9 +1843,9 @@@@ d143 17 a159 1 @@@@ -2483,6 +2484,9 @@@@ a161 7 SDL_RLD_FLAGS="-R\${exec_prefix}/lib" +fi +if test $ARCH = netbsd; then + SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib" fi case "$ARCH" in @ 1.13 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. @ text @d1 4 a4 4 $NetBSD: patch-aj,v 1.9.2.1 2002/08/22 11:10:16 jlam Exp $ --- configure.in.orig Thu Nov 8 08:28:00 2001 +++ configure.in Mon Jul 15 23:28:12 2002 @@@@ -374,10 +374,7 @@@@ d15 2 a16 2 @@@@ -429,7 +426,7 @@@@ NASMFLAGS="-f win32" d24 19 a42 1 @@@@ -999,8 +996,8 @@@@ d53 7 a59 13 @@@@ -1281,6 +1278,126 @@@@ VIDEO_DRIVERS="$VIDEO_DRIVERS quartz/libvideo_quartz.la" } +dnl Check for the usbhid(3) library on *BSD +CheckUSBHID() +{ + if test x$enable_joystick = xyes; then + have_libusbhid=no + have_libusb=no + AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes) + if test x$have_libusbhid = xyes; then + SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid" d68 1 a68 1 + fi d71 19 a89 11 + if test x$have_libusb = xyes; then + SYSTEM_LIBS="$SYSTEM_LIBS -lusb" + + AC_CHECK_HEADER(usb.h, have_usb_h=yes) + AC_CHECK_HEADER(libusb.h, have_libusb_h=yes) + if test x$have_usb_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_USB_H" + fi + if test x$have_libusb_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_LIBUSB_H" + fi d91 4 a94 98 + fi + + AC_MSG_CHECKING(for usbhid) + have_usbhid=no + AC_TRY_COMPILE([ + #include + #if defined(HAVE_USB_H) + #include + #endif + #include + #include + #if defined(HAVE_USBHID_H) + #include + #elif defined(HAVE_LIBUSB_H) + #include + #elif defined(HAVE_LIBUSBHID_H) + #include + #endif + ],[ + struct report_desc *repdesc; + struct usb_ctl_report *repbuf; + hid_kind_t hidkind; + ],[ + have_usbhid=yes + ]) + AC_MSG_RESULT($have_usbhid) + + if test x$have_usbhid = xyes; then + AC_MSG_CHECKING(for ucr_data member of usb_ctl_report) + have_usbhid_ucr_data=no + AC_TRY_COMPILE([ + #include + #if defined(HAVE_USB_H) + #include + #endif + #include + #include + #if defined(HAVE_USBHID_H) + #include + #elif defined(HAVE_LIBUSB_H) + #include + #elif defined(HAVE_LIBUSBHID_H) + #include + #endif + ],[ + struct usb_ctl_report buf; + if (buf.ucr_data) { } + ],[ + have_usbhid_ucr_data=yes + ]) + if test x$have_usbhid_ucr_data = xyes; then + CFLAGS="$CFLAGS -DUSBHID_UCR_DATA" + fi + AC_MSG_RESULT($have_usbhid_ucr_data) + + AC_MSG_CHECKING(for new usbhid API) + have_usbhid_new=no + AC_TRY_COMPILE([ + #include + #if defined(HAVE_USB_H) + #include + #endif + #include + #include + #if defined(HAVE_USBHID_H) + #include + #elif defined(HAVE_LIBUSB_H) + #include + #elif defined(HAVE_LIBUSBHID_H) + #include + #endif + ],[ + report_desc_t d; + hid_start_parse(d, 1, 1); + ],[ + have_usbhid_new=yes + ]) + if test x$have_usbhid_new = xyes; then + CFLAGS="$CFLAGS -DUSBHID_NEW" + fi + AC_MSG_RESULT($have_usbhid_new) + + JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd" + JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la" + fi + fi +} + case "$target" in *-*-linux*) ARCH=linux @@@@ -1465,14 +1582,17 @@@@ CheckDummyVideo CheckDiskAudio CheckNASM + CheckOPENBSDAUDIO CheckOSS CheckARTSC d102 1 a102 2 + CheckUSBHID # Set up files for the main() stub d105 7 a111 3 @@@@ -1481,12 +1601,6 @@@@ AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" a112 6 - # Set up files for the joystick library - # (No joystick support yet) - if test x$enable_joystick = xyes; then - JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS dummy" - JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la" - fi d115 3 a117 14 CDROM_SUBDIRS="$CDROM_SUBDIRS openbsd" @@@@ -1770,7 +1884,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) + if test x$use_pthreads = xyes -a x$enable_pthread_sem != xyes; then + COPY_ARCH_SRC(src/thread, generic, SDL_syssem.c) + else COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c) + fi 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) @@@@ -2159,6 +2277,10 @@@@ d119 1 a119 2 fi a121 4 +fi + if test $ARCH = openbsd; then SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS" d123 2 a124 8 @@@@ -2277,6 +2399,7 @@@@ src/joystick/Makefile src/joystick/amigaos/Makefile src/joystick/beos/Makefile +src/joystick/bsd/Makefile src/joystick/darwin/Makefile src/joystick/dummy/Makefile src/joystick/linux/Makefile @ 1.12 log @SDL configure checks if libusb or libusbhid is present on the system, but it tried to use both if both was found (which caused conflicts.) Solves PR 17602. @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @Add USB joystick support (and bump version to 1.2.3nb1). The implementation is taken from the SDL development repository, with some bugfixes from me. Solves PR 17374. @ text @d3 1 a3 1 +++ configure.in Sun Jul 14 06:02:41 2002 d35 1 a35 1 @@@@ -1281,6 +1278,124 @@@@ a45 1 + AC_CHECK_LIB(usb, hid_init, have_libusb=yes) a47 4 + fi + if test x$have_libusb = xyes; then + SYSTEM_LIBS="$SYSTEM_LIBS -lusb" + fi d49 22 a70 15 + AC_CHECK_HEADER(usb.h, have_usb_h=yes) + AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes) + AC_CHECK_HEADER(libusb.h, have_libusb_h=yes) + AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes) + if test x$have_usb_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_USB_H" + fi + if test x$have_usbhid_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_USBHID_H" + fi + if test x$have_libusb_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_LIBUSB_H" + fi + if test x$have_libusbhid_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H" d162 1 a162 1 @@@@ -1465,14 +1580,17 @@@@ d180 1 a180 1 @@@@ -1481,12 +1599,6 @@@@ d193 1 a193 1 @@@@ -1770,7 +1882,11 @@@@ d205 1 a205 1 @@@@ -2159,6 +2275,10 @@@@ d216 1 a216 1 @@@@ -2277,6 +2397,7 @@@@ @ 1.10 log @Remove build dependency on automake by providing patches. Requested and tested by Nick Hudson. @ text @a1 1 d3 1 a3 1 +++ configure.in d10 1 a10 1 - have_nas=yes a11 1 + have_nas=yes d35 126 a160 1 @@@@ -1465,11 +1462,13 @@@@ d174 18 a191 1 @@@@ -1770,7 +1769,11 @@@@ a194 1 - COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c) d198 1 a198 1 + COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c) d203 3 a205 1 @@@@ -2157,6 +2160,10 @@@@ d207 2 a208 2 if test $ARCH = solaris; then SDL_RLD_FLAGS="-R\${exec_prefix}/lib" d211 2 a212 2 +if test $ARCH = netbsd; then + SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib" d214 8 a221 2 if test $ARCH = openbsd; then @ 1.9 log @Update to 1.2.3; based on pkg/15580 by Ben Wong. Relevant changes for NetBSD: * 1.2.3: Added X11 Xinerama support - fullscreen starts on screen 0 * 1.2.3: Added platform independent OpenGL Header - SDL_opengl.h * 1.2.3: Fixed crash when using double-buffering with DGA * 1.2.3: Fixed XVideo on GeForce by using last available adaptor * 1.2.3: Added 640x480 as a scaled resolution for NTSC/PAL output @ text @d3 1 a3 1 --- configure.in.orig Mon Jul 23 15:54:03 2001 d5 1 a5 1 @@@@ -366,10 +366,7 @@@@ d17 1 a17 1 @@@@ -420,7 +417,7 @@@@ d26 1 a26 1 @@@@ -930,8 +927,8 @@@@ d37 1 a37 1 @@@@ -1348,11 +1345,13 @@@@ d51 1 a51 1 @@@@ -1642,7 +1641,11 @@@@ d64 1 a64 1 @@@@ -2021,6 +2024,10 @@@@ @ 1.9.2.1 log @Merge changes from pkgsrc-current into the buildlink2 branch for the packages that have buildlink2.mk files. @ text @d1 5 a5 4 $NetBSD: patch-aj,v 1.12 2002/07/15 23:04:20 kristerw Exp $ --- configure.in.orig Thu Nov 8 08:28:00 2001 +++ configure.in Mon Jul 15 23:28:12 2002 @@@@ -374,10 +374,7 @@@@ d11 1 a11 1 have_nas=yes d13 1 d17 1 a17 1 @@@@ -429,7 +426,7 @@@@ d26 1 a26 1 @@@@ -999,8 +996,8 @@@@ d37 1 a37 128 @@@@ -1281,6 +1278,126 @@@@ VIDEO_DRIVERS="$VIDEO_DRIVERS quartz/libvideo_quartz.la" } +dnl Check for the usbhid(3) library on *BSD +CheckUSBHID() +{ + if test x$enable_joystick = xyes; then + have_libusbhid=no + have_libusb=no + AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes) + if test x$have_libusbhid = xyes; then + SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid" + + AC_CHECK_HEADER(usbhid.h, have_usbhid_h=yes) + AC_CHECK_HEADER(libusbhid.h, have_libusbhid_h=yes) + if test x$have_usbhid_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_USBHID_H" + fi + if test x$have_libusbhid_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H" + fi + else + AC_CHECK_LIB(usb, hid_init, have_libusb=yes) + if test x$have_libusb = xyes; then + SYSTEM_LIBS="$SYSTEM_LIBS -lusb" + + AC_CHECK_HEADER(usb.h, have_usb_h=yes) + AC_CHECK_HEADER(libusb.h, have_libusb_h=yes) + if test x$have_usb_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_USB_H" + fi + if test x$have_libusb_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_LIBUSB_H" + fi + fi + fi + + AC_MSG_CHECKING(for usbhid) + have_usbhid=no + AC_TRY_COMPILE([ + #include + #if defined(HAVE_USB_H) + #include + #endif + #include + #include + #if defined(HAVE_USBHID_H) + #include + #elif defined(HAVE_LIBUSB_H) + #include + #elif defined(HAVE_LIBUSBHID_H) + #include + #endif + ],[ + struct report_desc *repdesc; + struct usb_ctl_report *repbuf; + hid_kind_t hidkind; + ],[ + have_usbhid=yes + ]) + AC_MSG_RESULT($have_usbhid) + + if test x$have_usbhid = xyes; then + AC_MSG_CHECKING(for ucr_data member of usb_ctl_report) + have_usbhid_ucr_data=no + AC_TRY_COMPILE([ + #include + #if defined(HAVE_USB_H) + #include + #endif + #include + #include + #if defined(HAVE_USBHID_H) + #include + #elif defined(HAVE_LIBUSB_H) + #include + #elif defined(HAVE_LIBUSBHID_H) + #include + #endif + ],[ + struct usb_ctl_report buf; + if (buf.ucr_data) { } + ],[ + have_usbhid_ucr_data=yes + ]) + if test x$have_usbhid_ucr_data = xyes; then + CFLAGS="$CFLAGS -DUSBHID_UCR_DATA" + fi + AC_MSG_RESULT($have_usbhid_ucr_data) + + AC_MSG_CHECKING(for new usbhid API) + have_usbhid_new=no + AC_TRY_COMPILE([ + #include + #if defined(HAVE_USB_H) + #include + #endif + #include + #include + #if defined(HAVE_USBHID_H) + #include + #elif defined(HAVE_LIBUSB_H) + #include + #elif defined(HAVE_LIBUSBHID_H) + #include + #endif + ],[ + report_desc_t d; + hid_start_parse(d, 1, 1); + ],[ + have_usbhid_new=yes + ]) + if test x$have_usbhid_new = xyes; then + CFLAGS="$CFLAGS -DUSBHID_NEW" + fi + AC_MSG_RESULT($have_usbhid_new) + + JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd" + JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la" + fi + fi +} + case "$target" in *-*-linux*) ARCH=linux @@@@ -1465,14 +1582,17 @@@@ d51 1 a51 18 + CheckUSBHID # Set up files for the main() stub COPY_ARCH_SRC(src/main, linux, SDL_main.c) # Set up files for the audio library @@@@ -1481,12 +1601,6 @@@@ AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" fi - # Set up files for the joystick library - # (No joystick support yet) - if test x$enable_joystick = xyes; then - JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS dummy" - JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la" - fi # Set up files for the cdrom library if test x$enable_cdrom = xyes; then CDROM_SUBDIRS="$CDROM_SUBDIRS openbsd" @@@@ -1770,7 +1884,11 @@@@ d55 1 d59 1 a59 1 COPY_ARCH_SRC(src/thread, linux, SDL_syssem.c) d64 3 a66 1 @@@@ -2159,6 +2277,10 @@@@ d68 4 a73 4 +if test $ARCH = netbsd; then + SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib" +fi + a74 10 SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS" fi @@@@ -2277,6 +2399,7 @@@@ src/joystick/Makefile src/joystick/amigaos/Makefile src/joystick/beos/Makefile +src/joystick/bsd/Makefile src/joystick/darwin/Makefile src/joystick/dummy/Makefile src/joystick/linux/Makefile @ 1.8 log @Update SDL to 1.2.2. Changes include: * Native NetBSD audio support * Now gets correct keyboard state when starting up on X11 * Improved the DGA 2.0 and framebuffer console drivers * Improved OSS audio driver support, thanks to 4Front Tech. * Improved X11 fullscreen support, works better with KDE @ text @d3 1 a3 1 --- configure.in.orig Mon Jul 23 21:54:03 2001 d37 1 a37 1 @@@@ -1348,6 +1345,7 @@@@ d45 7 a51 1 @@@@ -1642,7 +1640,11 @@@@ d64 1 a64 1 @@@@ -2021,6 +2023,10 @@@@ @ 1.7 log @Reliably detect NAS headers when NAS is enabled, and remove references to /usr/pkg/{include,lib} from the configure script. SDL now really meets the criteria for USE_BUILDLINK_ONLY. @ text @d3 1 a3 1 --- configure.in.orig Mon Jun 18 11:21:38 2001 d5 1 a5 1 @@@@ -354,10 +354,7 @@@@ d17 1 a17 1 @@@@ -410,7 +407,7 @@@@ d26 1 a26 1 @@@@ -889,8 +886,8 @@@@ d37 9 a45 1 @@@@ -1577,7 +1574,11 @@@@ d58 1 a58 1 @@@@ -1956,6 +1957,10 @@@@ @ 1.6 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 @d3 1 a3 1 --- configure.in.orig Mon Jun 18 17:21:38 2001 d5 13 a17 1 @@@@ -410,7 +410,7 @@@@ d26 2 a27 1 @@@@ -890,7 +890,7 @@@@ d30 1 a30 1 pthread_cflags="-I/usr/pkg/include -D_REENTRANT" d32 2 a33 1 + pthread_lib="-L/usr/pkg/lib -lpthread" d37 1 a37 1 @@@@ -1577,7 +1577,11 @@@@ d50 1 a50 1 @@@@ -1956,6 +1960,10 @@@@ @ 1.5 log @Make SDL compile under a.out systems: only use "-f elf" on ELF systems. @ text @d3 1 a3 1 --- configure.in.orig Tue Mar 27 05:39:19 2001 d5 1 a5 1 @@@@ -389,7 +389,7 @@@@ d14 10 a23 1 @@@@ -1199,7 +1199,11 @@@@ d36 1 a36 18 @@@@ -1209,7 +1213,7 @@@@ COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c) fi # NetBSD does not define "unix" - CFLAGS="$CFLAGS -Dunix" + CFLAGS="$CFLAGS -Dunix -D_POSIX_THREAD_SYSCALL_SOFT=1" ;; *-*-openbsd*) ARCH=openbsd @@@@ -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) @@@@ -1788,6 +1793,10 @@@@ d43 1 a43 1 + SDL_RLD_FLAGS="-Wl,-R\${exec_prefix}/lib -Wl,-R\${X11BASE}/lib" d46 1 a46 1 dnl Output the video drivers we use @ 1.4 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 @d5 9 @ 1.3 log @Fix several severe problems that prevented this package from passing its own tests. Bump version to 1.1.5nb1 Changes include: - make multithreading actually work - activate esound backend - /dev/dsp -> /dev/audio - /dev/cdrom -> /dev/cd?a - tons of bugfixes @ text @d3 1 a3 1 --- configure.in.orig Wed Sep 27 08:15:33 2000 d5 1 a5 24 @@@@ -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 @@@@ d18 1 a18 1 @@@@ -937,7 +950,7 @@@@ d27 1 a27 2 @@@@ -1325,6 +1338,7 @@@@ AM_CONDITIONAL(TARGET_SOLARIS, test $ARCH = solaris) d29 1 d35 3 a37 1 @@@@ -1341,6 +1355,10 @@@@ d39 4 a44 4 +if test $ARCH = netbsd; then + SDL_RLD_FLAGS="-Wl,-R\${exec_prefix}/lib -Wl,-R\${X11BASE}/lib" +fi + a45 10 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 @ 1.2 log @Updated to SDL-1.1.5 and bugfixes @ text @d1 1 a1 1 $NetBSD: patch-aj,v 1.1.1.1 2000/06/26 01:09:09 wiz Exp $ d3 3 a5 5 --- configure.in.orig Wed Sep 27 15:45:33 2000 +++ configure.in Mon Oct 2 13:23:58 2000 @@@@ -939,6 +939,51 @@@@ # NetBSD does not define "unix" CFLAGS="$CFLAGS -Dunix" d7 10 a16 12 + *-*-netbsd*) + ARCH=netbsd + CheckESD + CheckX11 + CheckAAlib + CheckOpenGL + CheckPTHREAD + # Set up files for the main() stub + COPY_ARCH_SRC(src/main, linux, SDL_main.c) + # Set up files for the audio library + AUDIO_ARCH=netbsd + AUDIO_ARCH_LIB=$AUDIO_ARCH/libaudio_arch.la d25 23 a47 25 + # Set up files for the joystick library + # (No joystick support yet) + if test x$enable_joystick = xyes; then + COPY_ARCH_SRC(src/joystick, dummy, SDL_sysjoystick.c) + fi + # Set up files for the cdrom library + if test x$enable_cdrom = xyes; then + COPY_ARCH_SRC(src/cdrom, freebsd, SDL_syscdrom.c) + fi + # Set up files for the thread library + if test x$enable_threads = xyes; then + COPY_ARCH_SRC(src/thread, linux, SDL_systhread.c) + 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) + COPY_ARCH_SRC(src/thread, generic, SDL_syssem.c) + 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) + fi + # Set up files for the timer library + if test x$enable_timers = xyes; then + COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c) + fi + ;; d50 1 a50 2 CheckESD @@@@ -1325,6 +1370,7 @@@@ d58 1 a58 1 @@@@ -1341,6 +1387,10 @@@@ d61 1 a61 1 d69 1 a69 1 @@@@ -1395,6 +1445,7 @@@@ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 5 --- configure.in.orig Tue Jun 6 06:36:10 2000 +++ configure.in Fri Jun 23 03:53:52 2000 @@@@ -810,6 +810,51 @@@@ COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c) fi d57 1 a57 1 @@@@ -1147,6 +1192,7 @@@@ d65 12 a76 1 @@@@ -1214,6 +1260,7 @@@@ @ 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 @@