diff options
Diffstat (limited to 'devel/SDL/patches/patch-aj')
-rw-r--r-- | devel/SDL/patches/patch-aj | 54 |
1 files changed, 48 insertions, 6 deletions
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj index 2eea3e95080..89b76781d4a 100644 --- a/devel/SDL/patches/patch-aj +++ b/devel/SDL/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.21 2005/05/20 20:08:40 wiz Exp $ +$NetBSD: patch-aj,v 1.22 2005/05/31 17:37:50 wiz Exp $ --- configure.in.orig 2004-12-13 10:02:08.000000000 +0100 +++ configure.in @@ -145,7 +145,49 @@ $NetBSD: patch-aj,v 1.21 2005/05/20 20:08:40 wiz Exp $ fi AC_MSG_CHECKING(for usbhid) -@@ -1835,6 +1844,26 @@ CheckUSBHID() +@@ -1756,8 +1765,13 @@ CheckUSBHID() + #if defined(HAVE_USB_H) + #include <usb.h> + #endif ++ #ifdef __DragonFly__ ++ #include <bus/usb/usb.h> ++ #include <bus/usb/usbhid.h> ++ #else + #include <dev/usb/usb.h> + #include <dev/usb/usbhid.h> ++ #endif + #if defined(HAVE_USBHID_H) + #include <usbhid.h> + #elif defined(HAVE_LIBUSB_H) +@@ -1782,8 +1796,13 @@ CheckUSBHID() + #if defined(HAVE_USB_H) + #include <usb.h> + #endif ++ #ifdef __DragonFly__ ++ #include <bus/usb/usb.h> ++ #include <bus/usb/usbhid.h> ++ #else + #include <dev/usb/usb.h> + #include <dev/usb/usbhid.h> ++ #endif + #if defined(HAVE_USBHID_H) + #include <usbhid.h> + #elif defined(HAVE_LIBUSB_H) +@@ -1809,8 +1828,13 @@ CheckUSBHID() + #if defined(HAVE_USB_H) + #include <usb.h> + #endif ++ #ifdef __DragonFly__ ++ #include <bus/usb/usb.h> ++ #include <bus/usb/usbhid.h> ++ #else + #include <dev/usb/usb.h> + #include <dev/usb/usbhid.h> ++ #endif + #if defined(HAVE_USBHID_H) + #include <usbhid.h> + #elif defined(HAVE_LIBUSB_H) +@@ -1835,6 +1859,26 @@ CheckUSBHID() fi } @@ -172,7 +214,7 @@ $NetBSD: patch-aj,v 1.21 2005/05/20 20:08:40 wiz Exp $ dnl Check for altivec instruction support using gas syntax CheckAltivec() { -@@ -1992,7 +2021,7 @@ case "$target" in +@@ -1992,7 +2036,7 @@ case "$target" in COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c) fi ;; @@ -181,7 +223,7 @@ $NetBSD: patch-aj,v 1.21 2005/05/20 20:08:40 wiz Exp $ ARCH=freebsd CheckDummyVideo CheckDiskAudio -@@ -2043,16 +2072,18 @@ case "$target" in +@@ -2043,16 +2087,18 @@ case "$target" in CheckESD CheckNAS CheckX11 @@ -203,7 +245,7 @@ $NetBSD: patch-aj,v 1.21 2005/05/20 20:08:40 wiz Exp $ fi # Set up files for the cdrom library if test x$enable_cdrom = xyes; then -@@ -2061,9 +2092,6 @@ case "$target" in +@@ -2061,9 +2107,6 @@ case "$target" in fi # Set up files for the thread library if test x$enable_threads = xyes; then @@ -213,7 +255,7 @@ $NetBSD: patch-aj,v 1.21 2005/05/20 20:08:40 wiz Exp $ CopyUnixThreadSource fi # Set up files for the timer library -@@ -2724,7 +2752,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ +@@ -2724,7 +2767,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ # Set runtime shared library paths as needed |