Fri Sep 14 13:20:20 2012 UTC ()
Add comments to patches.


(wiz)
diff -r1.62 -r1.63 pkgsrc/devel/SDL/distinfo
diff -r1.14 -r1.15 pkgsrc/devel/SDL/patches/patch-aa
diff -r1.16 -r1.17 pkgsrc/devel/SDL/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/devel/SDL/patches/patch-src_audio_sun_SDL__sunaudio.c
cvs diff -r1.62 -r1.63 pkgsrc/devel/SDL/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/SDL/distinfo 2012/02/20 14:57:06 1.62
+++ pkgsrc/devel/SDL/distinfo 2012/09/14 13:20:20 1.63
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.62 2012/02/20 14:57:06 jdc Exp $ 1$NetBSD: distinfo,v 1.63 2012/09/14 13:20:20 wiz Exp $
2 2
3SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c 3SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c
4RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3 4RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3
5Size (SDL-1.2.15.tar.gz) = 3920622 bytes 5Size (SDL-1.2.15.tar.gz) = 3920622 bytes
6SHA1 (patch-aa) = 5a3b922c1ad64837d2bc1461723e4f34622b481f 6SHA1 (patch-aa) = 759e3e439671a0edda5d5bbd5e9fc0d0a8e15a19
7SHA1 (patch-ac) = a5a04b04bffd24787282de3fa719809ba63193dd 7SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef364e2d960e46284563
8SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = e2bbc5577a397e418c3fb565428b8fc558089802 8SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30
9SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = e1595611542f3ffaebfe32ee611596c18c06be5e 9SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = e1595611542f3ffaebfe32ee611596c18c06be5e
10SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 356a8817cc41dde5e24cb23f032215931f85a84b 10SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 356a8817cc41dde5e24cb23f032215931f85a84b
11SHA1 (patch-src_video_x11_SDL_x11video.c) = 624fbb7e701d6de6ec93096beea7c085125934aa 11SHA1 (patch-src_video_x11_SDL_x11video.c) = 624fbb7e701d6de6ec93096beea7c085125934aa
cvs diff -r1.14 -r1.15 pkgsrc/devel/SDL/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/SDL/patches/patch-aa 2006/10/08 18:40:23 1.14
+++ pkgsrc/devel/SDL/patches/patch-aa 2012/09/14 13:20:20 1.15
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-aa,v 1.14 2006/10/08 18:40:23 ben Exp $ 1$NetBSD: patch-aa,v 1.15 2012/09/14 13:20:20 wiz Exp $
 2
 3Try to dlopen the libraries straight from the directories they are in.
2 4
3--- src/loadso/dlopen/SDL_sysloadso.c.orig 2006-05-01 01:02:37.000000000 -0700 5--- src/loadso/dlopen/SDL_sysloadso.c.orig 2006-05-01 01:02:37.000000000 -0700
4+++ src/loadso/dlopen/SDL_sysloadso.c 6+++ src/loadso/dlopen/SDL_sysloadso.c
5@@ -31,9 +31,32 @@ 7@@ -31,9 +31,32 @@
6  8
7 #include "SDL_loadso.h" 9 #include "SDL_loadso.h"
8  10
9+static void *get_dlopen_handle(const char *sofile) 11+static void *get_dlopen_handle(const char *sofile)
10+{ 12+{
11+ static const char * const libdirs[] = { 13+ static const char * const libdirs[] = {
12+ PREFIX "/lib/", 14+ PREFIX "/lib/",
13+ X11BASE "/lib/", 15+ X11BASE "/lib/",
14+ }; 16+ };
cvs diff -r1.16 -r1.17 pkgsrc/devel/SDL/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/devel/SDL/patches/patch-ac 2009/09/02 21:19:54 1.16
+++ pkgsrc/devel/SDL/patches/patch-ac 2012/09/14 13:20:20 1.17
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: patch-ac,v 1.16 2009/09/02 21:19:54 wiz Exp $ 1$NetBSD: patch-ac,v 1.17 2012/09/14 13:20:20 wiz Exp $
 2
 3Avoid full library name for libGL (including version number) since
 4it differs between NetBSD's X and pkgsrc.
2 5
3--- src/video/x11/SDL_x11gl.c.orig 2007-12-31 04:48:13.000000000 +0000 6--- src/video/x11/SDL_x11gl.c.orig 2007-12-31 04:48:13.000000000 +0000
4+++ src/video/x11/SDL_x11gl.c 7+++ src/video/x11/SDL_x11gl.c
5@@ -35,6 +35,9 @@ 8@@ -35,6 +35,9 @@
6 #define DEFAULT_OPENGL "libGL.so.3" 9 #define DEFAULT_OPENGL "libGL.so.3"
7 #elif defined(__OpenBSD__) 10 #elif defined(__OpenBSD__)
8 #define DEFAULT_OPENGL "libGL.so.4.0" 11 #define DEFAULT_OPENGL "libGL.so.4.0"
9+#elif defined(__NetBSD__) 12+#elif defined(__NetBSD__)
10+/* pkgsrc is .1, base system is .2 */ 13+/* pkgsrc is .1, base system is .2 */
11+#define DEFAULT_OPENGL "libGL.so" 14+#define DEFAULT_OPENGL "libGL.so"
12 #else 15 #else
13 #define DEFAULT_OPENGL "libGL.so.1" 16 #define DEFAULT_OPENGL "libGL.so.1"
14 #endif 17 #endif
cvs diff -r1.1 -r1.2 pkgsrc/devel/SDL/patches/patch-src_audio_sun_SDL__sunaudio.c (expand / switch to unified diff)

--- pkgsrc/devel/SDL/patches/patch-src_audio_sun_SDL__sunaudio.c 2011/12/29 10:00:50 1.1
+++ pkgsrc/devel/SDL/patches/patch-src_audio_sun_SDL__sunaudio.c 2012/09/14 13:20:20 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-src_audio_sun_SDL__sunaudio.c,v 1.1 2011/12/29 10:00:50 jmcneill Exp $ 1$NetBSD: patch-src_audio_sun_SDL__sunaudio.c,v 1.2 2012/09/14 13:20:20 wiz Exp $
 2
 3Use AUDIO_GETBUFINFO when available (jmcneill@).
2 4
3--- src/audio/sun/SDL_sunaudio.c.orig 2009-10-12 23:07:14.000000000 +0000 5--- src/audio/sun/SDL_sunaudio.c.orig 2009-10-12 23:07:14.000000000 +0000
4+++ src/audio/sun/SDL_sunaudio.c 6+++ src/audio/sun/SDL_sunaudio.c
5@@ -47,6 +47,10 @@ 7@@ -47,6 +47,10 @@
6 /* Open the audio device for playback, and don't block if busy */ 8 /* Open the audio device for playback, and don't block if busy */
7 #define OPEN_FLAGS (O_WRONLY|O_NONBLOCK) 9 #define OPEN_FLAGS (O_WRONLY|O_NONBLOCK)
8  10
9+#if defined(AUDIO_GETINFO) && !defined(AUDIO_GETBUFINFO)  11+#if defined(AUDIO_GETINFO) && !defined(AUDIO_GETBUFINFO)
10+#define AUDIO_GETBUFINFO AUDIO_GETINFO 12+#define AUDIO_GETBUFINFO AUDIO_GETINFO
11+#endif 13+#endif
12+ 14+
13 /* Audio driver functions */ 15 /* Audio driver functions */
14 static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec); 16 static int DSP_OpenAudio(_THIS, SDL_AudioSpec *spec);