pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/SDL Make this package build on NetBSD ports that...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1ddf0211ae90
branches: trunk
changeset: 477975:1ddf0211ae90
user: kristerw <kristerw%pkgsrc.org@localhost>
date: Tue Jul 13 20:51:58 2004 +0000
description:
Make this package build on NetBSD ports that do not have
<machine/joystick.h>.
diffstat:
devel/SDL/distinfo | 8 +-
devel/SDL/patches/patch-aa | 34 ++++++--
devel/SDL/patches/patch-aj | 68 ++++++++++++-----
devel/SDL/patches/patch-am | 169 ++++++++++++++++++++++++++++++++------------
4 files changed, 199 insertions(+), 80 deletions(-)
diffs (truncated from 687 to 300 lines):
diff -r 688ca9be0661 -r 1ddf0211ae90 devel/SDL/distinfo
--- a/devel/SDL/distinfo Tue Jul 13 20:36:28 2004 +0000
+++ b/devel/SDL/distinfo Tue Jul 13 20:51:58 2004 +0000
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.30 2004/07/09 18:19:09 drochner Exp $
+$NetBSD: distinfo,v 1.31 2004/07/13 20:51:58 kristerw Exp $
SHA1 (SDL-1.2.7.tar.gz) = 1a840c50668f230df9e9163ef1a282d9f3355383
Size (SDL-1.2.7.tar.gz) = 2470936 bytes
-SHA1 (patch-aa) = 37c1dbf04636a74b69f07c9f00bffeb0e3dcbe65
+SHA1 (patch-aa) = a78e6bd1e5c858d51f05d0e121300977eb6bff63
SHA1 (patch-ab) = 7effcc7f7f1856372692c147521888843810fed5
SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
-SHA1 (patch-aj) = 02705ec01b70cbfef6520586d799dccd835352dc
+SHA1 (patch-aj) = bc132adf7f2f81ded884e0bfd29f7f4cedc98f4b
SHA1 (patch-al) = 852877c85dd43782dfcf855d43ed6250449aa9fd
-SHA1 (patch-am) = f11ac8c5904c00cf73aedfe3d2c2ffb8c8065550
+SHA1 (patch-am) = dafc020b5ccae6970a1212e6ad2c5fd8531bf72e
SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
SHA1 (patch-as) = 98813c71b10e209df90b5024cf8e6287113563ce
SHA1 (patch-at) = 5e470473bd9ed1d278b23a06db8af2b346301794
diff -r 688ca9be0661 -r 1ddf0211ae90 devel/SDL/patches/patch-aa
--- a/devel/SDL/patches/patch-aa Tue Jul 13 20:36:28 2004 +0000
+++ b/devel/SDL/patches/patch-aa Tue Jul 13 20:51:58 2004 +0000
@@ -1,8 +1,17 @@
-$NetBSD: patch-aa,v 1.7 2004/06/22 09:10:12 dillo Exp $
+$NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $
--- src/joystick/bsd/SDL_sysjoystick.c.orig 2004-02-18 18:22:01.000000000 +0100
-+++ src/joystick/bsd/SDL_sysjoystick.c
-@@ -238,6 +238,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
++++ src/joystick/bsd/SDL_sysjoystick.c 2004-07-13 22:43:44.000000000 +0200
+@@ -60,7 +60,7 @@
+ #include <sys/joystick.h>
+ #endif
+
+-#if defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(HAVE_MACHINE_JOYSTICK) || defined(__OpenBSD__)
+ #include <machine/joystick.h>
+ #endif
+
+@@ -238,6 +238,7 @@
struct hid_data *hdata;
struct report *rep;
int fd;
@@ -10,7 +19,7 @@
fd = open(path, O_RDONLY);
if (fd == -1) {
-@@ -302,6 +303,8 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -302,6 +303,8 @@
joy->nbuttons = 0;
joy->nhats = 0;
joy->nballs = 0;
@@ -19,7 +28,7 @@
while (hid_get_item(hdata, &hitem) > 0) {
char *sp;
-@@ -328,8 +331,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -328,8 +331,7 @@
unsigned usage = HID_USAGE(hitem.usage);
int joyaxe = usage_to_joyaxe(usage);
if (joyaxe >= 0) {
@@ -29,7 +38,7 @@
} else if (usage == HUG_HAT_SWITCH) {
joy->nhats++;
}
-@@ -347,6 +349,9 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
+@@ -347,6 +349,9 @@
}
}
hid_end_parse(hdata);
@@ -39,7 +48,16 @@
usbend:
/* The poll blocks the event thread. */
-@@ -456,7 +461,8 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
+@@ -369,7 +374,7 @@
+ int nbutton, naxe = -1;
+ Sint32 v;
+
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
++#if defined(__FreeBSD__) || defined(HAVE_MACHINE_JOYSTICK) || defined(__OpenBSD__)
+ struct joystick gameport;
+ static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
+
+@@ -456,7 +461,8 @@
} else if (usage == HUG_HAT_SWITCH) {
v = (Sint32)hid_get_data(REP_BUF_DATA(rep),
&hitem);
@@ -49,7 +67,7 @@
}
break;
}
-@@ -529,9 +535,9 @@ report_alloc(struct report *r, struct re
+@@ -529,9 +535,9 @@
#endif
#else
# ifdef USBHID_NEW
diff -r 688ca9be0661 -r 1ddf0211ae90 devel/SDL/patches/patch-aj
--- a/devel/SDL/patches/patch-aj Tue Jul 13 20:36:28 2004 +0000
+++ b/devel/SDL/patches/patch-aj Tue Jul 13 20:51:58 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.18 2004/04/17 00:15:21 snj Exp $
+$NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
---- 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)
+--- configure.in.orig Sun Feb 22 22:31:47 2004
++++ configure.in Tue Jul 13 22:28:09 2004
+@@ -28,9 +28,9 @@
# libtool versioning
LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -15,7 +15,7 @@
AC_SUBST(LT_RELEASE)
AC_SUBST(LT_CURRENT)
-@@ -267,6 +267,8 @@ CheckOSS()
+@@ -267,6 +267,8 @@
AC_MSG_RESULT($have_oss)
if test x$have_oss = xyes; then
CFLAGS="$CFLAGS -DOSS_SUPPORT"
@@ -24,7 +24,7 @@
AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
-@@ -422,9 +424,9 @@ CheckNAS()
+@@ -422,9 +424,9 @@
if test x$enable_audio = xyes -a x$enable_nas = xyes; then
AC_MSG_CHECKING(for NAS audio support)
have_nas=no
@@ -36,7 +36,7 @@
SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
-@@ -505,7 +507,7 @@ CheckNASM()
+@@ -505,7 +507,7 @@
NASMFLAGS="-f aoutb"
;;
*)
@@ -45,24 +45,22 @@
;;
esac
AC_SUBST(NASMFLAGS)
-@@ -943,18 +945,18 @@ CheckAAlib()
+@@ -943,18 +945,18 @@
[ --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)
-- video_aalib=no
++ if test x$AALIB_CONFIG = x; then
+ video_aalib=no
- AC_TRY_COMPILE([
- #include <aalib.h>
- ],[
- ],[
-- video_aalib=yes
-- ])
-+ if test x$AALIB_CONFIG = x; then
-+ video_aalib=no
+ else
+ AALIB_LIBS=`$AALIB_CONFIG --libs`
-+ video_aalib=yes
+ video_aalib=yes
+- ])
+ fi
AC_MSG_RESULT($video_aalib)
if test x$video_aalib = xyes; then
@@ -72,7 +70,7 @@
VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -1125,12 +1127,13 @@ CheckPTH()
+@@ -1125,12 +1127,13 @@
[ --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
@@ -90,7 +88,7 @@
SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
SDL_LIBS="$SDL_LIBS $PTH_LIBS"
CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -1171,8 +1174,8 @@ CheckPTHREAD()
+@@ -1171,8 +1174,8 @@
pthread_lib="-pthread"
;;
*-*-netbsd*)
@@ -101,7 +99,7 @@
;;
*-*-openbsd*)
pthread_cflags="-D_REENTRANT"
-@@ -1638,29 +1641,31 @@ CheckUSBHID()
+@@ -1638,29 +1641,31 @@
have_libusbhid=no
have_libusb=no
AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
@@ -142,7 +140,34 @@
fi
AC_MSG_CHECKING(for usbhid)
-@@ -1957,6 +1962,7 @@ case "$target" in
+@@ -1749,6 +1754,26 @@
+ 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 <machine/joystick.h>
++ ],[
++ 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()
+ {
+@@ -1957,16 +1982,18 @@
CheckESD
CheckNAS
CheckX11
@@ -150,8 +175,9 @@
CheckAAlib
CheckOpenGL
CheckPTHREAD
-@@ -1964,9 +1970,9 @@ case "$target" in
+ CheckSIGACTION
CheckUSBHID
++ CheckMachineJoystick
# Set up files for the audio library
if test x$enable_audio = xyes; then
- CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
@@ -163,7 +189,7 @@
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
-@@ -1975,9 +1981,6 @@ case "$target" in
+@@ -1975,9 +2002,6 @@
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -173,7 +199,7 @@
CopyUnixThreadSource
fi
# Set up files for the timer library
-@@ -2606,7 +2609,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
+@@ -2606,7 +2630,7 @@
# Set runtime shared library paths as needed
diff -r 688ca9be0661 -r 1ddf0211ae90 devel/SDL/patches/patch-am
--- a/devel/SDL/patches/patch-am Tue Jul 13 20:36:28 2004 +0000
+++ b/devel/SDL/patches/patch-am Tue Jul 13 20:51:58 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.13 2004/04/17 00:15:21 snj Exp $
+$NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
---- configure.orig 2004-02-22 13:32:33.000000000 -0800
-+++ configure 2004-04-10 16:06:11.000000000 -0700
-@@ -463,7 +463,7 @@ ac_includes_default="\
+--- configure.orig Sun Feb 22 22:32:33 2004
++++ configure Tue Jul 13 22:33:55 2004
+@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
@@ -11,7 +11,7 @@
ac_subst_files=''
# Initialize some variables set by options.
-@@ -1587,9 +1587,9 @@ SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINO
+@@ -1587,9 +1587,9 @@
# libtool versioning
LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -24,7 +24,7 @@
-@@ -21563,6 +21563,8 @@ rm -f conftest.err conftest.$ac_objext c
+@@ -21563,6 +21563,8 @@
echo "${ECHO_T}$have_oss" >&6
if test x$have_oss = xyes; then
CFLAGS="$CFLAGS -DOSS_SUPPORT"
@@ -33,7 +33,7 @@
AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
Home |
Main Index |
Thread Index |
Old Index