Fix building on newer OS X. Courtesy of Jan Danielsson.

This commit is contained in:
adam 2014-04-14 19:27:46 +00:00
parent 18f175e8f7
commit 81eb353c95
2 changed files with 18 additions and 1 deletions

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.64 2014/03/24 20:29:01 asau Exp $
$NetBSD: distinfo,v 1.65 2014/04/14 19:27:46 adam Exp $
SHA1 (SDL-1.2.15.tar.gz) = 0c5f193ced810b0d7ce3ab06d808cbb5eef03a2c
RMD160 (SDL-1.2.15.tar.gz) = d4802a090cb4a24eeb0c8ce5690802f596d394c3
@ -7,6 +7,7 @@ SHA1 (patch-aa) = 759e3e439671a0edda5d5bbd5e9fc0d0a8e15a19
SHA1 (patch-ac) = 8b2dddff9ad449b19b35ef364e2d960e46284563
SHA1 (patch-src_audio_sun_SDL__sunaudio.c) = 4b492b40d39e6444037dfda55766e4a149cc6c30
SHA1 (patch-src_joystick_bsd_SDL__sysjoystick.c) = 4ea0136f231729129b82e5f7ee4b9eaf68a13876
SHA1 (patch-src_video_quartz_SDL__QuartzVideo.h) = 19d952bade06dbd646e94f42139c38436969b1a8
SHA1 (patch-src_video_wscons_SDL__wsconsevents.c) = e1595611542f3ffaebfe32ee611596c18c06be5e
SHA1 (patch-src_video_wscons_SDL__wsconsvideo.c) = 356a8817cc41dde5e24cb23f032215931f85a84b
SHA1 (patch-src_video_x11_SDL_x11video.c) = 624fbb7e701d6de6ec93096beea7c085125934aa

View file

@ -0,0 +1,16 @@
$NetBSD: patch-src_video_quartz_SDL__QuartzVideo.h,v 1.1 2014/04/14 19:27:46 adam Exp $
Fix building on newer OS X.
--- src/video/quartz/SDL_QuartzVideo.h.orig 2014-04-14 07:38:30.000000000 +0000
+++ src/video/quartz/SDL_QuartzVideo.h
@@ -91,7 +91,9 @@ typedef struct SDL_PrivateVideoData {
CGDirectDisplayID display; /* 0 == main display (only support single display) */
const void *mode; /* current mode of the display */
const void *save_mode; /* original mode of the display */
+#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
CGDirectPaletteRef palette; /* palette of an 8-bit display */
+#endif
NSOpenGLContext *gl_context; /* OpenGL rendering context */
NSGraphicsContext *nsgfx_context; /* Cocoa graphics context */
Uint32 width, height, bpp; /* frequently used data about the display */