pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/SDL Update to 1.2.10.
details: https://anonhg.NetBSD.org/pkgsrc/rev/18212c657e3b
branches: trunk
changeset: 514456:18212c657e3b
user: wiz <wiz%pkgsrc.org@localhost>
date: Mon Jun 12 16:20:44 2006 +0000
description:
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.
diffstat:
devel/SDL/Makefile | 76 +++-
devel/SDL/Makefile.common | 78 ---
devel/SDL/PLIST | 12 +-
devel/SDL/buildlink3.mk | 6 +-
devel/SDL/distinfo | 26 +-
devel/SDL/options.mk | 28 +
devel/SDL/patches/patch-aa | 127 -----
devel/SDL/patches/patch-ac | 13 -
devel/SDL/patches/patch-ad | 22 -
devel/SDL/patches/patch-aj | 231 +----------
devel/SDL/patches/patch-al | 112 -----
devel/SDL/patches/patch-am | 954 +--------------------------------------------
devel/SDL/patches/patch-ar | 12 -
devel/SDL/patches/patch-as | 12 -
devel/SDL/patches/patch-ba | 113 -----
devel/SDL/patches/patch-bb | 21 -
devel/SDL/patches/patch-bc | 21 -
devel/SDL/patches/patch-bd | 21 -
devel/SDL/patches/patch-da | 13 -
devel/SDL/patches/patch-db | 13 -
devel/SDL/patches/patch-dc | 40 -
devel/SDL/patches/patch-dd | 13 -
22 files changed, 150 insertions(+), 1814 deletions(-)
diffs (truncated from 2126 to 300 lines):
diff -r 8fad3f529e82 -r 18212c657e3b devel/SDL/Makefile
--- a/devel/SDL/Makefile Mon Jun 12 16:16:24 2006 +0000
+++ b/devel/SDL/Makefile Mon Jun 12 16:20:44 2006 +0000
@@ -1,7 +1,77 @@
-# $NetBSD: Makefile,v 1.63 2006/02/05 23:08:39 joerg Exp $
+# $NetBSD: Makefile,v 1.64 2006/06/12 16:20:44 wiz Exp $
+
+DISTNAME= SDL-1.2.10
+CATEGORIES= devel games
+MASTER_SITES= http://www.libsdl.org/release/
-PKGREVISION= 2
+MAINTAINER= wiz%NetBSD.org@localhost
+HOMEPAGE= http://www.libsdl.org/
+COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library
+
+USE_LANGUAGES= c c++
+USE_LIBTOOL= yes
+USE_TOOLS+= gmake
+GNU_CONFIGURE= yes
+PTHREAD_OPTS+= require
PKG_INSTALLATION_TYPES= overwrite pkgviews
-.include "Makefile.common"
+.include "options.mk"
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${MACHINE_ARCH} == "i386"
+. include "../../devel/binutils/buildlink3.mk"
+BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
+NASMFLAGS_ELF= -f elf
+NASMFLAGS_a.out= -f aoutb
+.endif
+
+CONFIGURE_ARGS+= --enable-dlopen
+CONFIGURE_ARGS+= --enable-video-aalib
+CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
+MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
+
+# Pass in LDFLAGS via SYSTEM_LIBS as it's used as the linker options for
+# finding various libraries. This ensure that any unusual -Wl,-R options
+# are noted correctly in the generated sdl-config.
+#
+CONFIGURE_ENV+= SYSTEM_LIBS=${LDFLAGS:M*:Q}
+
+# buildlink passthru the directories required for the Cocoa framework
+# on Darwin if they exist.
+.if ${OPSYS} == "Darwin"
+COCOA_DIRS+= /System /Library /Developer
+. for dir in ${COCOA_DIRS}
+. if exists(${dir})
+BUILDLINK_PASSTHRU_DIRS+= ${dir}
+. endif
+. endfor
+
+# XXX: still necessary after 1.2.10 update?
+SUBST_CLASSES+= links
+SUBST_MESSAGE.links= Fixing linking command.
+SUBST_STAGE.links= pre-configure
+SUBST_FILES.links= src/Makefile.in
+SUBST_SED.links= -e 's,tag=CC --mode=link,tag=CXX --mode=link,g'
+.endif
+
+.include "../../mk/oss.buildlink3.mk"
+
+AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\""
+MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:Q}
+
+# Irix comes with GL, which works fine for SDL
+.if ${OPSYS} != "IRIX"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.endif
+.include "../../graphics/aalib/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+
+.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
+# Let SDL know that we do not have native pthreads and are using GNU pth.
+CONFIGURE_ARGS+= --disable-pthreads
+CONFIGURE_ARGS+= --enable-pth
+.endif
+
.include "../../mk/bsd.pkg.mk"
diff -r 8fad3f529e82 -r 18212c657e3b devel/SDL/Makefile.common
--- a/devel/SDL/Makefile.common Mon Jun 12 16:16:24 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-# $NetBSD: Makefile.common,v 1.29 2006/04/11 22:11:31 minskim Exp $
-
-DISTNAME= SDL-1.2.9
-CATEGORIES= devel games
-MASTER_SITES= http://www.libsdl.org/release/
-
-MAINTAINER= wiz%NetBSD.org@localhost
-HOMEPAGE= http://www.libsdl.org/
-COMMENT= Simple DirectMedia Layer, a cross-platform multimedia library
-
-DISTINFO_FILE= ${.CURDIR}/../../devel/SDL/distinfo
-PATCHDIR= ${.CURDIR}/../../devel/SDL/patches
-
-USE_LANGUAGES= c c++
-USE_LIBTOOL= yes
-USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-PTHREAD_OPTS+= require
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${MACHINE_ARCH} == "i386"
-. include "../../devel/binutils/buildlink3.mk"
-BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
-NASMFLAGS_ELF= -f elf
-NASMFLAGS_a.out= -f aoutb
-.endif
-
-CONFIGURE_ARGS+= --enable-dlopen
-CONFIGURE_ARGS+= --disable-arts
-CONFIGURE_ARGS+= --disable-esd
-CONFIGURE_ARGS+= --disable-nas
-
-CONFIGURE_ARGS+= --enable-video-aalib
-CONFIGURE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
-MAKE_ENV+= NASMFLAGS="${NASMFLAGS_${OBJECT_FMT}}"
-
-# Pass in LDFLAGS via SYSTEM_LIBS as it's used as the linker options for
-# finding various libraries. This ensure that any unusual -Wl,-R options
-# are noted correctly in the generated sdl-config.
-#
-CONFIGURE_ENV+= SYSTEM_LIBS=${LDFLAGS:M*:Q}
-
-# buildlink passthru the directories required for the Cocoa framework
-# on Darwin if they exist.
-.if ${OPSYS} == "Darwin"
-COCOA_DIRS+= /System /Library /Developer
-. for dir in ${COCOA_DIRS}
-. if exists(${dir})
-BUILDLINK_PASSTHRU_DIRS+= ${dir}
-. endif
-. endfor
-
-SUBST_CLASSES+= links
-SUBST_MESSAGE.links= Fixing linking command.
-SUBST_STAGE.links= pre-configure
-SUBST_FILES.links= src/Makefile.in
-SUBST_SED.links= -e 's,tag=CC --mode=link,tag=CXX --mode=link,g'
-.endif
-
-.include "../../mk/oss.buildlink3.mk"
-
-AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\""
-MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:Q}
-
-# Irix comes with GL, which works fine for SDL
-.if ${OPSYS} != "IRIX"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.endif
-.include "../../graphics/aalib/buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "pth"
-# Let SDL know that we do not have native pthreads and are using GNU pth.
-CONFIGURE_ARGS+= --disable-pthreads
-CONFIGURE_ARGS+= --enable-pth
-.endif
diff -r 8fad3f529e82 -r 18212c657e3b devel/SDL/PLIST
--- a/devel/SDL/PLIST Mon Jun 12 16:16:24 2006 +0000
+++ b/devel/SDL/PLIST Mon Jun 12 16:20:44 2006 +0000
@@ -1,10 +1,18 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:23 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/06/12 16:20:44 wiz Exp $
bin/sdl-config
include/SDL/SDL.h
include/SDL/SDL_active.h
include/SDL/SDL_audio.h
include/SDL/SDL_byteorder.h
include/SDL/SDL_cdrom.h
+include/SDL/SDL_config.h
+include/SDL/SDL_config_amiga.h
+include/SDL/SDL_config_dreamcast.h
+include/SDL/SDL_config_macos.h
+include/SDL/SDL_config_macosx.h
+include/SDL/SDL_config_minimal.h
+include/SDL/SDL_config_os2.h
+include/SDL/SDL_config_win32.h
include/SDL/SDL_copying.h
include/SDL/SDL_cpuinfo.h
include/SDL/SDL_endian.h
@@ -20,8 +28,10 @@
include/SDL/SDL_mutex.h
include/SDL/SDL_name.h
include/SDL/SDL_opengl.h
+include/SDL/SDL_platform.h
include/SDL/SDL_quit.h
include/SDL/SDL_rwops.h
+include/SDL/SDL_stdinc.h
include/SDL/SDL_syswm.h
include/SDL/SDL_thread.h
include/SDL/SDL_timer.h
diff -r 8fad3f529e82 -r 18212c657e3b devel/SDL/buildlink3.mk
--- a/devel/SDL/buildlink3.mk Mon Jun 12 16:16:24 2006 +0000
+++ b/devel/SDL/buildlink3.mk Mon Jun 12 16:20:44 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2006/04/06 06:21:43 reed Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2006/06/12 16:20:44 wiz Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
SDL_BUILDLINK3_MK:= ${SDL_BUILDLINK3_MK}+
@@ -11,8 +11,8 @@
BUILDLINK_PACKAGES+= SDL
.if !empty(SDL_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.5nb5
-BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.9nb2
+BUILDLINK_API_DEPENDS.SDL+= SDL>=1.2.5nb5
+BUILDLINK_ABI_DEPENDS.SDL+= SDL>=1.2.10
BUILDLINK_PKGSRCDIR.SDL?= ../../devel/SDL
.endif # SDL_BUILDLINK3_MK
diff -r 8fad3f529e82 -r 18212c657e3b devel/SDL/distinfo
--- a/devel/SDL/distinfo Mon Jun 12 16:16:24 2006 +0000
+++ b/devel/SDL/distinfo Mon Jun 12 16:20:44 2006 +0000
@@ -1,21 +1,7 @@
-$NetBSD: distinfo,v 1.42 2006/02/07 18:15:50 wiz Exp $
+$NetBSD: distinfo,v 1.43 2006/06/12 16:20:44 wiz Exp $
-SHA1 (SDL-1.2.9.tar.gz) = 8140de00e73ccdbdee196fa8fd9952ddb3cc75f1
-RMD160 (SDL-1.2.9.tar.gz) = 9faeeda9cf8f649a2b506e9db7c5cedb4512cfe7
-Size (SDL-1.2.9.tar.gz) = 2688179 bytes
-SHA1 (patch-aa) = f41d0de165d41826a6de2fdf9521d4f41f97221a
-SHA1 (patch-ac) = 8471da99fcd2771e319556c95f6d1295dce002bb
-SHA1 (patch-ad) = 230544c0aa2f8d827a9d49c4962afe2e4936074e
-SHA1 (patch-aj) = 53dad2397355cb0282e449f794f84f5b4a0c3f3d
-SHA1 (patch-al) = a427d5b5a4e18a37d241142df575a71db2483a1e
-SHA1 (patch-am) = a4732f0563fe9bcc3c5329cf794ddf4a717bd5e4
-SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
-SHA1 (patch-as) = c099a77a9643621322fea1d5cf079abcab80a071
-SHA1 (patch-ba) = 4c87c3812c9f8bdabb974a6a17f6243cedcc887e
-SHA1 (patch-bb) = ebf35acf99240be873c64fcac07570e61f50b83e
-SHA1 (patch-bc) = f1eb12c2f9049af6a65bba9fe215ef3dc165fd83
-SHA1 (patch-bd) = cbfd61c48f95094f54a098b9ee921dfe0da96589
-SHA1 (patch-da) = 9a38b1e2fcc0eb4c499c52402e70083f30e7ec96
-SHA1 (patch-db) = 4543d1fe47fa068bcda83eb53d495e0c6085b371
-SHA1 (patch-dc) = 7d0bc4a78ad1a589cb797094e39e3099e2414e99
-SHA1 (patch-dd) = a80c43d5cab4cc83c98dae7449219f68e1dbea88
+SHA1 (SDL-1.2.10.tar.gz) = ad64b3b58b3cf83a28a1c21bedf270da43118f67
+RMD160 (SDL-1.2.10.tar.gz) = e2e73a580638ab29d4b000152ed80999545e9fb5
+Size (SDL-1.2.10.tar.gz) = 2792344 bytes
+SHA1 (patch-aj) = 21b77004d782b5da7973e8ccb8bdd686efca1684
+SHA1 (patch-am) = 0a99757ca6dbed3f46c6ed2a04a3e65d81f92b3b
diff -r 8fad3f529e82 -r 18212c657e3b devel/SDL/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/SDL/options.mk Mon Jun 12 16:20:44 2006 +0000
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2006/06/12 16:20:44 wiz Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.SDL
+PKG_SUPPORTED_OPTIONS= arts esound nas
+PKG_SUGGESTED_OPTIONS= arts esound nas
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Marts)
+CONFIGURE_ARGS+= --enable-arts
+.include "../../audio/arts/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-arts
+.endif
+
+.if !empty(PKG_OPTIONS:Mesound)
+CONFIGURE_ARGS+= --enable-esd
+.include "../../audio/esound/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-esd
+.endif
+
+.if !empty(PKG_OPTIONS:Mnas)
+CONFIGURE_ARGS+= --enable-nas
+.include "../../audio/nas/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-nas
+.endif
diff -r 8fad3f529e82 -r 18212c657e3b devel/SDL/patches/patch-aa
--- a/devel/SDL/patches/patch-aa Mon Jun 12 16:16:24 2006 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2005/05/31 17:37:50 wiz Exp $
-
---- src/joystick/bsd/SDL_sysjoystick.c.orig 2004-12-13 08:54:32.000000000 +0100
-+++ src/joystick/bsd/SDL_sysjoystick.c
-@@ -44,8 +44,13 @@ static char rcsid =
- #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>
Home |
Main Index |
Thread Index |
Old Index