[vlc-commits] contrib: Unbreak sdl with osx 10.7 and later

[Luca Barbato]

vlc | branch: master | Luca Barbato <lu_zero at gentoo.org> | Wed Mar  5 12:33:52 2014 +0000| [2d6e30b59732b36ae4e75874fe440db59eacbfa6] | committer: Jean-Baptiste Kempf

contrib: Unbreak sdl with osx 10.7 and later

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2d6e30b59732b36ae4e75874fe440db59eacbfa6
---

 contrib/src/sdl/direct_palette_ref.diff |   12 ++++++++++++
 contrib/src/sdl/rules.mak               |    1 +
 2 files changed, 13 insertions(+)

diff --git a/contrib/src/sdl/direct_palette_ref.diff b/contrib/src/sdl/direct_palette_ref.diff
new file mode 100644
index 0000000..9932b7e
--- /dev/null
+++ b/contrib/src/sdl/direct_palette_ref.diff
@@ -0,0 +1,12 @@
+--- sdl/src/video/quartz/SDL_QuartzVideo.h.orig	2014-03-05 14:09:28.000000000 +0100
++++ sdl/src/video/quartz/SDL_QuartzVideo.h	2014-03-05 14:09:45.000000000 +0100
+@@ -91,7 +91,9 @@
+     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 */
diff --git a/contrib/src/sdl/rules.mak b/contrib/src/sdl/rules.mak
index 044e79d..e55d78c 100644
--- a/contrib/src/sdl/rules.mak
+++ b/contrib/src/sdl/rules.mak
@@ -15,6 +15,7 @@ $(TARBALLS)/SDL-$(SDL_VERSION).tar.gz:
 
 sdl: SDL-$(SDL_VERSION).tar.gz .sum-sdl
 	$(UNPACK)
+	$(APPLY) $(SRC)/sdl/direct_palette_ref.diff
 	$(MOVE)
 
 SDLCONF := $(HOSTCONF) \