pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Update to SDL-1.2.7.
details: https://anonhg.NetBSD.org/pkgsrc/rev/a4386a0fe875
branches: trunk
changeset: 473165:a4386a0fe875
user: snj <snj%pkgsrc.org@localhost>
date: Sat Apr 17 00:15:21 2004 +0000
description:
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@.
diffstat:
audio/SDL-arts/PLIST | 4 +-
audio/SDL-esound/PLIST | 4 +-
audio/SDL-nas/PLIST | 4 +-
devel/SDL/Makefile.common | 4 +-
devel/SDL/PLIST | 5 +-
devel/SDL/distinfo | 24 +-
devel/SDL/patches/patch-ac | 13 -
devel/SDL/patches/patch-ad | 80 ---
devel/SDL/patches/patch-ag | 13 -
devel/SDL/patches/patch-aj | 48 +-
devel/SDL/patches/patch-am | 1070 +++++++++++++++++++++++++++++++------------
devel/SDL/patches/patch-ap | 13 -
devel/SDL/patches/patch-ar | 10 +-
devel/SDL/patches/patch-as | 21 +-
devel/SDL/patches/patch-bb | 37 +-
devel/SDL/patches/patch-bc | 39 +-
devel/SDL/patches/patch-bd | 33 +-
17 files changed, 883 insertions(+), 539 deletions(-)
diffs (truncated from 1781 to 300 lines):
diff -r 676e3aaef611 -r a4386a0fe875 audio/SDL-arts/PLIST
--- a/audio/SDL-arts/PLIST Fri Apr 16 23:59:32 2004 +0000
+++ b/audio/SDL-arts/PLIST Sat Apr 17 00:15:21 2004 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/03 19:31:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/17 00:15:21 snj Exp $
lib/libaudio_arts.la
lib/libaudio_arts.so
lib/libaudio_arts.so.0
-lib/libaudio_arts.so.0.6
+lib/libaudio_arts.so.0.7
diff -r 676e3aaef611 -r a4386a0fe875 audio/SDL-esound/PLIST
--- a/audio/SDL-esound/PLIST Fri Apr 16 23:59:32 2004 +0000
+++ b/audio/SDL-esound/PLIST Sat Apr 17 00:15:21 2004 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/03 19:31:02 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/17 00:15:21 snj Exp $
lib/libaudio_esd.la
lib/libaudio_esd.so
lib/libaudio_esd.so.0
-lib/libaudio_esd.so.0.6
+lib/libaudio_esd.so.0.7
diff -r 676e3aaef611 -r a4386a0fe875 audio/SDL-nas/PLIST
--- a/audio/SDL-nas/PLIST Fri Apr 16 23:59:32 2004 +0000
+++ b/audio/SDL-nas/PLIST Sat Apr 17 00:15:21 2004 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/03 19:31:03 drochner Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/04/17 00:15:21 snj Exp $
lib/libaudio_nas.la
lib/libaudio_nas.so
lib/libaudio_nas.so.0
-lib/libaudio_nas.so.0.6
+lib/libaudio_nas.so.0.7
diff -r 676e3aaef611 -r a4386a0fe875 devel/SDL/Makefile.common
--- a/devel/SDL/Makefile.common Fri Apr 16 23:59:32 2004 +0000
+++ b/devel/SDL/Makefile.common Sat Apr 17 00:15:21 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.11 2004/02/14 13:55:19 jlam Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/04/17 00:15:21 snj Exp $
#
-DISTNAME= SDL-1.2.6
+DISTNAME= SDL-1.2.7
CATEGORIES= devel games
MASTER_SITES= http://www.libsdl.org/release/
diff -r 676e3aaef611 -r a4386a0fe875 devel/SDL/PLIST
--- a/devel/SDL/PLIST Fri Apr 16 23:59:32 2004 +0000
+++ b/devel/SDL/PLIST Sat Apr 17 00:15:21 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2003/09/03 19:30:51 drochner Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/04/17 00:15:21 snj Exp $
bin/sdl-config
include/SDL/SDL.h
include/SDL/SDL_active.h
@@ -6,6 +6,7 @@
include/SDL/SDL_byteorder.h
include/SDL/SDL_cdrom.h
include/SDL/SDL_copying.h
+include/SDL/SDL_cpuinfo.h
include/SDL/SDL_endian.h
include/SDL/SDL_error.h
include/SDL/SDL_events.h
@@ -33,7 +34,7 @@
lib/libSDL.la
lib/libSDL.so
lib/libSDL.so.0
-lib/libSDL.so.0.6
+lib/libSDL.so.0.7
lib/libSDLmain.a
man/man3/SDLKey.3
man/man3/SDL_ActiveEvent.3
diff -r 676e3aaef611 -r a4386a0fe875 devel/SDL/distinfo
--- a/devel/SDL/distinfo Fri Apr 16 23:59:32 2004 +0000
+++ b/devel/SDL/distinfo Sat Apr 17 00:15:21 2004 +0000
@@ -1,21 +1,17 @@
-$NetBSD: distinfo,v 1.26 2004/01/10 13:57:12 recht Exp $
+$NetBSD: distinfo,v 1.27 2004/04/17 00:15:21 snj Exp $
-SHA1 (SDL-1.2.6.tar.gz) = 6f64b79427ea279e5ae18ea07d9fe353fd138422
-Size (SDL-1.2.6.tar.gz) = 2042700 bytes
+SHA1 (SDL-1.2.7.tar.gz) = 1a840c50668f230df9e9163ef1a282d9f3355383
+Size (SDL-1.2.7.tar.gz) = 2470936 bytes
SHA1 (patch-aa) = 4511f3af35b824d8e1425b571a8c12e44e8ef46c
SHA1 (patch-ab) = 7effcc7f7f1856372692c147521888843810fed5
-SHA1 (patch-ac) = 0af2dde942c1f32c6fce937eb3d886773f0a7674
-SHA1 (patch-ad) = be83c13f11dfd0b94e598965065ef94a9daca0bb
SHA1 (patch-af) = f5e824addf308f9c467de02e3b262afbc0ef77c0
-SHA1 (patch-ag) = cd2fd8958b86e12c9d2786fe200c6ab44d8d40e1
-SHA1 (patch-aj) = 7bcfe591659e60dcdbd6c966f4347270ed3f14f5
+SHA1 (patch-aj) = 02705ec01b70cbfef6520586d799dccd835352dc
SHA1 (patch-al) = 852877c85dd43782dfcf855d43ed6250449aa9fd
-SHA1 (patch-am) = 6e72e1c4c3894cc9ffad5ba61aab07de0d9f3fea
-SHA1 (patch-ap) = c477500c2540719c40253b30de1f389c8ed50334
-SHA1 (patch-ar) = 1a78f0bcb6a8f65f71af23accb2a9780331f275b
-SHA1 (patch-as) = a53286d5e0a2cab7e0a1d80baf3b76681f996b7a
+SHA1 (patch-am) = f11ac8c5904c00cf73aedfe3d2c2ffb8c8065550
+SHA1 (patch-ar) = 61e759bb3eb05890160573dfe63431792f1823bd
+SHA1 (patch-as) = 98813c71b10e209df90b5024cf8e6287113563ce
SHA1 (patch-ba) = 0621af3f2c0abba700c30d7f4809f405a7ffe729
-SHA1 (patch-bb) = 1918b2e247f9fbbe583fd1111c94dc3a58bfd929
-SHA1 (patch-bc) = 8a47e8899f203d56f9855aea6516c4369ab327fe
-SHA1 (patch-bd) = c5e714b59212202c4889c129eb2b140660474816
+SHA1 (patch-bb) = 48407d4a2d881cb3427b29682fc7e417023d1b99
+SHA1 (patch-bc) = 40012e55c20e8c10b575a6de0ac4f3f2a35baf15
+SHA1 (patch-bd) = 191e5140254224228d7a8f27af16f88086278849
SHA1 (patch-be) = 5f4ba09788f3ca5410067c14b90426f2a831e92b
diff -r 676e3aaef611 -r a4386a0fe875 devel/SDL/patches/patch-ac
--- a/devel/SDL/patches/patch-ac Fri Apr 16 23:59:32 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2004/01/10 13:57:12 recht Exp $
-
---- src/video/mmx.h.orig 2003-08-22 07:51:19.000000000 +0200
-+++ src/video/mmx.h 2004-01-10 14:24:56.000000000 +0100
-@@ -353,7 +353,7 @@
- #define mmx_m2r(op, mem, reg) \
- __asm__ __volatile__ (#op " %0, %%" #reg \
- : /* nothing */ \
-- : "X" (mem))
-+ : "m" (mem))
-
- #define mmx_r2m(op, reg, mem) \
- __asm__ __volatile__ (#op " %%" #reg ", %0" \
diff -r 676e3aaef611 -r a4386a0fe875 devel/SDL/patches/patch-ad
--- a/devel/SDL/patches/patch-ad Fri Apr 16 23:59:32 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2003/10/27 23:19:46 kristerw Exp $
-
---- src/video/SDL_blit_A.c.orig Sat Aug 30 21:13:06 2003
-+++ src/video/SDL_blit_A.c Mon Oct 27 21:10:22 2003
-@@ -220,11 +220,11 @@
- int dstskip = info->d_skip >> 2;
- Uint8 load[8];
-
-- *(Uint64 *)load = 0x00fefefe00fefefe;/* alpha128 mask */
-+ *(Uint64 *)load = 0x00fefefe00fefefeULL;/* alpha128 mask */
- movq_m2r(*load, mm4); /* alpha128 mask -> mm4 */
-- *(Uint64 *)load = 0x0001010100010101;/* !alpha128 mask */
-+ *(Uint64 *)load = 0x0001010100010101ULL;/* !alpha128 mask */
- movq_m2r(*load, mm3); /* !alpha128 mask -> mm3 */
-- *(Uint64 *)load = 0xFF000000FF000000;/* dst alpha mask */
-+ *(Uint64 *)load = 0xFF000000FF000000ULL;/* dst alpha mask */
- movq_m2r(*load, mm7); /* dst alpha mask -> mm7 */
- while(height--) {
- DUFFS_LOOP_DOUBLE2(
-@@ -276,10 +276,10 @@
- alpha, alpha, alpha, alpha};
-
- movq_m2r(*load, mm4); /* alpha -> mm4 */
-- *(Uint64 *)load = 0x00FF00FF00FF00FF;
-+ *(Uint64 *)load = 0x00FF00FF00FF00FFULL;
- movq_m2r(*load, mm3); /* mask -> mm3 */
- pand_r2r(mm3, mm4); /* mm4 & mask -> 0A0A0A0A -> mm4 */
-- *(Uint64 *)load = 0xFF000000FF000000;/* dst alpha mask */
-+ *(Uint64 *)load = 0xFF000000FF000000ULL;/* dst alpha mask */
- movq_m2r(*load, mm7); /* dst alpha mask -> mm7 */
-
- while(height--) {
-@@ -360,13 +360,13 @@
- Uint32 alpha = 0;
- Uint8 load[8];
-
-- *(Uint64 *)load = 0x00FF00FF00FF00FF;
-+ *(Uint64 *)load = 0x00FF00FF00FF00FFULL;
- movq_m2r(*load, mm3); /* mask -> mm2 */
-- *(Uint64 *)load = 0x00FF000000000000;
-+ *(Uint64 *)load = 0x00FF000000000000ULL;
- movq_m2r(*load, mm7); /* dst alpha mask -> mm2 */
-- *(Uint64 *)load = 0x00FFFFFF00FFFFFF;
-+ *(Uint64 *)load = 0x00FFFFFF00FFFFFFULL;
- movq_m2r(*load, mm0); /* alpha 255 mask -> mm0 */
-- *(Uint64 *)load = 0xFF000000FF000000;
-+ *(Uint64 *)load = 0xFF000000FF000000ULL;
- movq_m2r(*load, mm6); /* alpha 255 !mask -> mm6 */
- while(height--) {
- DUFFS_LOOP4({
-@@ -792,11 +792,11 @@
- punpcklwd_r2r(mm0, mm0); /* 0A0A0A0A -> mm0 */
-
- /* Setup the 565 color channel masks */
-- *(Uint64 *)load = 0xF800F800F800F800;
-+ *(Uint64 *)load = 0xF800F800F800F800ULL;
- movq_m2r(*load, mm1); /* MASKRED -> mm1 */
-- *(Uint64 *)load = 0x07E007E007E007E0;
-+ *(Uint64 *)load = 0x07E007E007E007E0ULL;
- movq_m2r(*load, mm4); /* MASKGREEN -> mm4 */
-- *(Uint64 *)load = 0x001F001F001F001F;
-+ *(Uint64 *)load = 0x001F001F001F001FULL;
- movq_m2r(*load, mm7); /* MASKBLUE -> mm7 */
- while(height--) {
- DUFFS_LOOP_QUATRO2(
-@@ -942,11 +942,11 @@
- punpcklwd_r2r(mm0, mm0); /* 0A0A0A0A -> mm0 */
-
- /* Setup the 555 color channel masks */
-- *(Uint64 *)load = 0x7C007C007C007C00;
-+ *(Uint64 *)load = 0x7C007C007C007C00ULL;
- movq_m2r(*load, mm1); /* MASKRED -> mm1 */
-- *(Uint64 *)load = 0x03E003E003E003E0;
-+ *(Uint64 *)load = 0x03E003E003E003E0ULL;
- movq_m2r(*load, mm4); /* MASKGREEN -> mm4 */
-- *(Uint64 *)load = 0x001F001F001F001F;
-+ *(Uint64 *)load = 0x001F001F001F001FULL;
- movq_m2r(*load, mm7); /* MASKBLUE -> mm7 */
- while(height--) {
- DUFFS_LOOP_QUATRO2(
diff -r 676e3aaef611 -r a4386a0fe875 devel/SDL/patches/patch-ag
--- a/devel/SDL/patches/patch-ag Fri Apr 16 23:59:32 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2003/09/03 19:30:56 drochner Exp $
-
---- src/hermes/Makefile.am.orig 2003-08-30 21:13:04.000000000 +0200
-+++ src/hermes/Makefile.am
-@@ -7,7 +7,7 @@ STRIP_FPIC = sh $(top_srcdir)/strip_fPIC
- SUFFIXES = .asm
-
- .asm.lo:
-- $(LIBTOOL) --mode=compile $(STRIP_FPIC) $(NASM) @NASMFLAGS@ $< -o $*.o
-+ $(LIBTOOL) --tag=CC --mode=compile $(STRIP_FPIC) $(NASM) @NASMFLAGS@ $< -o $*.o
-
- ###########################################################################
-
diff -r 676e3aaef611 -r a4386a0fe875 devel/SDL/patches/patch-aj
--- a/devel/SDL/patches/patch-aj Fri Apr 16 23:59:32 2004 +0000
+++ b/devel/SDL/patches/patch-aj Sat Apr 17 00:15:21 2004 +0000
@@ -1,8 +1,21 @@
-$NetBSD: patch-aj,v 1.17 2003/09/04 09:53:33 drochner Exp $
+$NetBSD: patch-aj,v 1.18 2004/04/17 00:15:21 snj Exp $
---- configure.in.orig 2003-08-30 21:13:18.000000000 +0200
-+++ configure.in
-@@ -258,6 +258,8 @@ CheckOSS()
+--- 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)
+
+ # 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"
@@ -11,16 +24,19 @@
AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp"
AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la"
AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma"
-@@ -413,7 +415,7 @@ CheckNAS()
+@@ -422,9 +424,9 @@ CheckNAS()
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
- CFLAGS="$CFLAGS -DNAS_SUPPORT"
+- CFLAGS="$CFLAGS -DNAS_SUPPORT -I/usr/X11R6/include/"
++ CFLAGS="$CFLAGS -DNAS_SUPPORT"
SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt"
-@@ -496,7 +498,7 @@ CheckNASM()
+ AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas"
+ AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la"
+@@ -505,7 +507,7 @@ CheckNASM()
NASMFLAGS="-f aoutb"
;;
*)
@@ -29,7 +45,7 @@
;;
esac
AC_SUBST(NASMFLAGS)
-@@ -933,18 +935,18 @@ CheckAAlib()
+@@ -943,18 +945,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
@@ -56,7 +72,7 @@
VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib"
VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la"
-@@ -1115,12 +1117,13 @@ CheckPTH()
+@@ -1125,12 +1127,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
@@ -74,7 +90,7 @@
SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
SDL_LIBS="$SDL_LIBS $PTH_LIBS"
CFLAGS="$CFLAGS -DENABLE_PTH"
-@@ -1161,8 +1164,8 @@ CheckPTHREAD()
Home |
Main Index |
Thread Index |
Old Index