pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/SDL Changes 1.2.8:
details: https://anonhg.NetBSD.org/pkgsrc/rev/b2632c6dc8a5
branches: trunk
changeset: 486921:b2632c6dc8a5
user: adam <adam%pkgsrc.org@localhost>
date: Wed Jan 05 12:05:19 2005 +0000
description:
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
diffstat:
devel/SDL/Makefile | 4 +-
devel/SDL/Makefile.common | 5 +-
devel/SDL/distinfo | 28 +++----
devel/SDL/patches/patch-aa | 22 +++---
devel/SDL/patches/patch-ab | 15 +--
devel/SDL/patches/patch-aj | 30 ++++----
devel/SDL/patches/patch-am | 110 +++++++++++++++----------------
devel/SDL/patches/patch-as | 8 +-
devel/SDL/patches/patch-at | 157 ---------------------------------------------
devel/SDL/patches/patch-au | 67 -------------------
devel/SDL/patches/patch-av | 20 -----
devel/SDL/patches/patch-aw | 64 ------------------
devel/SDL/patches/patch-ba | 14 ++--
devel/SDL/patches/patch-bb | 8 +-
devel/SDL/patches/patch-bc | 8 +-
devel/SDL/patches/patch-bd | 8 +-
16 files changed, 124 insertions(+), 444 deletions(-)
diffs (truncated from 1131 to 300 lines):
diff -r 93ac445cce36 -r b2632c6dc8a5 devel/SDL/Makefile
--- a/devel/SDL/Makefile Wed Jan 05 11:17:36 2005 +0000
+++ b/devel/SDL/Makefile Wed Jan 05 12:05:19 2005 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2004/10/03 00:13:24 tv Exp $
-#
+# $NetBSD: Makefile,v 1.59 2005/01/05 12:05:19 adam Exp $
PKG_INSTALLATION_TYPES= overwrite pkgviews
-PKGREVISION=4
.include "Makefile.common"
.include "../../mk/bsd.pkg.mk"
diff -r 93ac445cce36 -r b2632c6dc8a5 devel/SDL/Makefile.common
--- a/devel/SDL/Makefile.common Wed Jan 05 11:17:36 2005 +0000
+++ b/devel/SDL/Makefile.common Wed Jan 05 12:05:19 2005 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.16 2004/08/24 21:07:04 hubertf Exp $
-#
+# $NetBSD: Makefile.common,v 1.17 2005/01/05 12:05:19 adam Exp $
-DISTNAME= SDL-1.2.7
+DISTNAME= SDL-1.2.8
CATEGORIES= devel games
MASTER_SITES= http://www.libsdl.org/release/
diff -r 93ac445cce36 -r b2632c6dc8a5 devel/SDL/distinfo
--- a/devel/SDL/distinfo Wed Jan 05 11:17:36 2005 +0000
+++ b/devel/SDL/distinfo Wed Jan 05 12:05:19 2005 +0000
@@ -1,21 +1,17 @@
-$NetBSD: distinfo,v 1.33 2004/07/26 20:42:28 dillo Exp $
+$NetBSD: distinfo,v 1.34 2005/01/05 12:05:19 adam Exp $
-SHA1 (SDL-1.2.7.tar.gz) = 1a840c50668f230df9e9163ef1a282d9f3355383
-Size (SDL-1.2.7.tar.gz) = 2470936 bytes
-SHA1 (patch-aa) = a78e6bd1e5c858d51f05d0e121300977eb6bff63
-SHA1 (patch-ab) = 7effcc7f7f1856372692c147521888843810fed5
+SHA1 (SDL-1.2.8.tar.gz) = 26f2104a60a28914b809d3cb77d5790bfdfd024c
+Size (SDL-1.2.8.tar.gz) = 2602449 bytes
+SHA1 (patch-aa) = d96902d3de2eb1f0c4edaa8b174f09ae1a654625
+SHA1 (patch-ab) = 6693545cafa5f5e73fb3f6f34d1a0b59a17872d2
SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
-SHA1 (patch-aj) = bc132adf7f2f81ded884e0bfd29f7f4cedc98f4b
+SHA1 (patch-aj) = bf5173f8a510cfb86a5d48b7afbbaee6c501f3a0
SHA1 (patch-al) = d8b4ee9d33c4b34db87b098f4945018ae995ae99
-SHA1 (patch-am) = dafc020b5ccae6970a1212e6ad2c5fd8531bf72e
+SHA1 (patch-am) = 8ed1ce2ef11210e0fe865ba8f1b315853900f2e4
SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
-SHA1 (patch-as) = 98813c71b10e209df90b5024cf8e6287113563ce
-SHA1 (patch-at) = 5e470473bd9ed1d278b23a06db8af2b346301794
-SHA1 (patch-au) = 7571582ea7654f99f721ef6d1c81a7bee3fb712a
-SHA1 (patch-av) = a19c162dcb85cf0d0d1c1d6ab50651782b60a96f
-SHA1 (patch-aw) = 6f6b2ca8cc499b23f95591f874c436318d2fcf1a
-SHA1 (patch-ba) = 0621af3f2c0abba700c30d7f4809f405a7ffe729
-SHA1 (patch-bb) = 48407d4a2d881cb3427b29682fc7e417023d1b99
-SHA1 (patch-bc) = 40012e55c20e8c10b575a6de0ac4f3f2a35baf15
-SHA1 (patch-bd) = 191e5140254224228d7a8f27af16f88086278849
+SHA1 (patch-as) = f69ca8796afeda35e57c89aa7a161de2de7bf6d8
+SHA1 (patch-ba) = 4c87c3812c9f8bdabb974a6a17f6243cedcc887e
+SHA1 (patch-bb) = a3b7f5e161b4c497a1ad818e2607dfca21288b53
+SHA1 (patch-bc) = 8f34e6d914f9edda1ea494e3970d11b238e47bb8
+SHA1 (patch-bd) = 3d8b20cfe774280d1c8e96405ae26bc23444ee8d
SHA1 (patch-be) = 5f4ba09788f3ca5410067c14b90426f2a831e92b
diff -r 93ac445cce36 -r b2632c6dc8a5 devel/SDL/patches/patch-aa
--- a/devel/SDL/patches/patch-aa Wed Jan 05 11:17:36 2005 +0000
+++ b/devel/SDL/patches/patch-aa Wed Jan 05 12:05:19 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2004/07/13 20:51:58 kristerw Exp $
+$NetBSD: patch-aa,v 1.9 2005/01/05 12:05:19 adam Exp $
---- src/joystick/bsd/SDL_sysjoystick.c.orig 2004-02-18 18:22:01.000000000 +0100
-+++ src/joystick/bsd/SDL_sysjoystick.c 2004-07-13 22:43:44.000000000 +0200
-@@ -60,7 +60,7 @@
+--- src/joystick/bsd/SDL_sysjoystick.c.orig 2004-12-13 07:54:32.000000000 +0000
++++ src/joystick/bsd/SDL_sysjoystick.c
+@@ -60,7 +60,7 @@ static char rcsid =
#include <sys/joystick.h>
#endif
@@ -11,7 +11,7 @@
#include <machine/joystick.h>
#endif
-@@ -238,6 +238,7 @@
+@@ -239,6 +239,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
struct hid_data *hdata;
struct report *rep;
int fd;
@@ -19,7 +19,7 @@
fd = open(path, O_RDONLY);
if (fd == -1) {
-@@ -302,6 +303,8 @@
+@@ -303,6 +304,8 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
joy->nbuttons = 0;
joy->nhats = 0;
joy->nballs = 0;
@@ -28,7 +28,7 @@
while (hid_get_item(hdata, &hitem) > 0) {
char *sp;
-@@ -328,8 +331,7 @@
+@@ -329,8 +332,7 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
unsigned usage = HID_USAGE(hitem.usage);
int joyaxe = usage_to_joyaxe(usage);
if (joyaxe >= 0) {
@@ -38,7 +38,7 @@
} else if (usage == HUG_HAT_SWITCH) {
joy->nhats++;
}
-@@ -347,6 +349,9 @@
+@@ -348,6 +350,9 @@ SDL_SYS_JoystickOpen(SDL_Joystick *joy)
}
}
hid_end_parse(hdata);
@@ -48,7 +48,7 @@
usbend:
/* The poll blocks the event thread. */
-@@ -369,7 +374,7 @@
+@@ -370,7 +375,7 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
int nbutton, naxe = -1;
Sint32 v;
@@ -57,7 +57,7 @@
struct joystick gameport;
static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
-@@ -456,7 +461,8 @@
+@@ -457,7 +462,8 @@ SDL_SYS_JoystickUpdate(SDL_Joystick *joy
} else if (usage == HUG_HAT_SWITCH) {
v = (Sint32)hid_get_data(REP_BUF_DATA(rep),
&hitem);
@@ -67,7 +67,7 @@
}
break;
}
-@@ -529,9 +535,9 @@
+@@ -530,9 +536,9 @@ report_alloc(struct report *r, struct re
#endif
#else
# ifdef USBHID_NEW
diff -r 93ac445cce36 -r b2632c6dc8a5 devel/SDL/patches/patch-ab
--- a/devel/SDL/patches/patch-ab Wed Jan 05 11:17:36 2005 +0000
+++ b/devel/SDL/patches/patch-ab Wed Jan 05 12:05:19 2005 +0000
@@ -1,16 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2002/11/06 19:02:56 atatat Exp $
+$NetBSD: patch-ab,v 1.4 2005/01/05 12:05:19 adam Exp $
-We are similar enough to OpenBSD to use this, especially since it
-makes the graphics/avifile-devel pkg build again.
-
---- include/SDL_syswm.h.orig Sun Aug 25 02:21:49 2002
-+++ include/SDL_syswm.h Mon Nov 4 13:00:07 2002
-@@ -49,7 +49,7 @@
+--- include/SDL_syswm.h.orig 2004-12-13 07:54:31.000000000 +0000
++++ include/SDL_syswm.h
+@@ -49,7 +49,7 @@ typedef struct SDL_SysWMinfo SDL_SysWMin
#else
/* This is the structure for custom window manager events */
-#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__)) && \
+#if (defined(unix) || defined(__unix__) || defined(_AIX) || defined(__OpenBSD__) || defined(__NetBSD__)) && \
- (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX))
+ (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
+ !defined(__QNXNTO__))
/* AIX is unix, of course, but the native compiler CSet doesn't define unix */
- #include <X11/Xlib.h>
diff -r 93ac445cce36 -r b2632c6dc8a5 devel/SDL/patches/patch-aj
--- a/devel/SDL/patches/patch-aj Wed Jan 05 11:17:36 2005 +0000
+++ b/devel/SDL/patches/patch-aj Wed Jan 05 12:05:19 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.19 2004/07/13 20:51:58 kristerw Exp $
+$NetBSD: patch-aj,v 1.20 2005/01/05 12:05:19 adam Exp $
---- configure.in.orig Sun Feb 22 22:31:47 2004
-+++ configure.in Tue Jul 13 22:28:09 2004
-@@ -28,9 +28,9 @@
+--- configure.in.orig 2004-12-13 09:02:08.000000000 +0000
++++ configure.in
+@@ -28,9 +28,9 @@ AC_SUBST(SDL_VERSION)
# 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 @@
+@@ -267,6 +267,8 @@ CheckOSS()
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 @@
+@@ -456,9 +458,9 @@ CheckNAS()
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 @@
+@@ -539,7 +541,7 @@ CheckNASM()
NASMFLAGS="-f aoutb"
;;
*)
@@ -45,7 +45,7 @@
;;
esac
AC_SUBST(NASMFLAGS)
-@@ -943,18 +945,18 @@
+@@ -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
@@ -70,7 +70,7 @@
VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -1125,12 +1127,13 @@
+@@ -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
@@ -88,7 +88,7 @@
SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
SDL_LIBS="$SDL_LIBS $PTH_LIBS"
CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -1171,8 +1174,8 @@
+@@ -1248,8 +1251,8 @@ CheckPTHREAD()
pthread_lib="-pthread"
;;
*-*-netbsd*)
@@ -99,7 +99,7 @@
;;
*-*-openbsd*)
pthread_cflags="-D_REENTRANT"
-@@ -1638,29 +1641,31 @@
+@@ -1724,29 +1727,31 @@ CheckUSBHID()
have_libusbhid=no
have_libusb=no
AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes)
@@ -140,7 +140,7 @@
fi
AC_MSG_CHECKING(for usbhid)
-@@ -1749,6 +1754,26 @@
+@@ -1835,6 +1840,26 @@ CheckUSBHID()
fi
}
@@ -167,7 +167,7 @@
dnl Check for altivec instruction support using gas syntax
CheckAltivec()
{
-@@ -1957,16 +1982,18 @@
+@@ -2043,16 +2068,18 @@ case "$target" in
CheckESD
CheckNAS
CheckX11
@@ -189,7 +189,7 @@
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
-@@ -1975,9 +2002,6 @@
+@@ -2061,9 +2088,6 @@ case "$target" in
fi
# Set up files for the thread library
if test x$enable_threads = xyes; then
@@ -199,7 +199,7 @@
CopyUnixThreadSource
fi
# Set up files for the timer library
-@@ -2606,7 +2630,7 @@
+@@ -2724,7 +2748,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$
# Set runtime shared library paths as needed
diff -r 93ac445cce36 -r b2632c6dc8a5 devel/SDL/patches/patch-am
--- a/devel/SDL/patches/patch-am Wed Jan 05 11:17:36 2005 +0000
+++ b/devel/SDL/patches/patch-am Wed Jan 05 12:05:19 2005 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-am,v 1.14 2004/07/13 20:51:58 kristerw Exp $
+$NetBSD: patch-am,v 1.15 2005/01/05 12:05:19 adam Exp $
---- configure.orig Sun Feb 22 22:32:33 2004
-+++ configure Tue Jul 13 22:33:55 2004
-@@ -463,7 +463,7 @@
+--- configure.orig 2004-12-13 09:04:51.000000000 +0000
++++ configure
+@@ -463,7 +463,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir
sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION
SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu
target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM
mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE
am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM
NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS PTH_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE
TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE
TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE
TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE
HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS
CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS'
Home |
Main Index |
Thread Index |
Old Index