Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

[depends] - bump libsdl-native and libsdl (target) to 1.2.15 and add the... #3540

Merged
merged 1 commit into from

2 participants

@Memphiz
Owner

... mavericks compile patch on the top.

This fixes compilation on osx 10.9 mavericks.

sdl 1.2.15 uploaded to mirrors already too.

@davilla
Collaborator

jenkins build this please

@davilla davilla merged commit a0f2c4b into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 1, 2013
  1. @Memphiz

    [depends] - bump libsdl-native and libsdl (target) to 1.2.15 and add …

    Memphiz authored
    …the mavericks compile patch on the top
This page is out of date. Refresh to see the latest.
View
0  ...nds/target/libsdl/03-OSX_interpretKeyEvents.patch → ...ive/libsdl-native/02-OSX_interpretKeyEvents.patch
File renamed without changes
View
12 tools/depends/native/libsdl-native/02-mmx.patch
@@ -1,12 +0,0 @@
---- src/video/mmx.h Mon Feb 06 08:28:51 2006 +0000
-+++ src/video/mmx.h Sun Jan 30 13:38:57 2011 -0800
-@@ -355,7 +355,7 @@
-
- #define mmx_r2m(op, reg, mem) \
- __asm__ __volatile__ (#op " %%" #reg ", %0" \
-- : "=X" (mem) \
-+ : "=m" (mem) \
- : /* nothing */ )
-
- #define mmx_r2r(op, regs, regd) \
-
View
12 tools/depends/native/libsdl-native/03-mavericks-compile.patch
@@ -0,0 +1,12 @@
+--- src/video/quartz/SDL_QuartzVideo.h.orig 2013-10-27 16:51:48.000000000 +0100
++++ src/video/quartz/SDL_QuartzVideo.h 2013-10-27 16:52:13.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 */
View
7 tools/depends/native/libsdl-native/Makefile
@@ -1,11 +1,11 @@
include ../../Makefile.include
PREFIX=$(NATIVEPREFIX)
PLATFORM=$(NATIVEPLATFORM)
-DEPS= ../../Makefile.include.in 01-SDL_SetWidthHeight.patch 02-mmx.patch Makefile
+DEPS= ../../Makefile.include.in 01-SDL_SetWidthHeight.patch 02-OSX_interpretKeyEvents.patch 03-mavericks-compile.patch Makefile
# lib name, version
LIBNAME=SDL
-VERSION=1.2.14
+VERSION=1.2.15
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
@@ -24,7 +24,8 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(PLATFORM); patch -p0 < ../01-SDL_SetWidthHeight.patch
- cd $(PLATFORM); patch -p0 < ../02-mmx.patch
+ cd $(PLATFORM); patch -p0 < ../02-OSX_interpretKeyEvents.patch
+ cd $(PLATFORM); patch -p0 < ../03-mavericks-compile.patch
cd $(PLATFORM); $(CONFIGURE)
$(LIBDYLIB): $(PLATFORM)
View
15 tools/depends/target/libsdl/02-OSX_interpretKeyEvents.patch
@@ -0,0 +1,15 @@
+--- src/video/quartz/SDL_QuartzEvents.m 2009-10-13 07:07:14.000000000 +0800
++++ src/video/quartz/SDL_QuartzEvents.m 2013-08-03 09:12:27.000000000 +0800
+@@ -280,7 +280,11 @@
+ the scancode/keysym.
+ */
+ if (SDL_TranslateUNICODE && state == SDL_PRESSED) {
+- [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]];
++ NSResponder *firstResponder = [[NSApp keyWindow] firstResponder];
++ if ([NSStringFromClass([firstResponder class]) isEqual:@"OSXTextInputResponder"])
++ [firstResponder interpretKeyEvents:[NSArray arrayWithObject:event]];
++ else
++ [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]];
+ chars = [ event characters ];
+ numChars = [ chars length ];
+ if (numChars > 0)
View
12 tools/depends/target/libsdl/02-mmx.patch
@@ -1,12 +0,0 @@
---- src/video/mmx.h Mon Feb 06 08:28:51 2006 +0000
-+++ src/video/mmx.h Sun Jan 30 13:38:57 2011 -0800
-@@ -355,7 +355,7 @@
-
- #define mmx_r2m(op, reg, mem) \
- __asm__ __volatile__ (#op " %%" #reg ", %0" \
-- : "=X" (mem) \
-+ : "=m" (mem) \
- : /* nothing */ )
-
- #define mmx_r2r(op, regs, regd) \
-
View
41 tools/depends/target/libsdl/03-mavericks-compile.patch
@@ -0,0 +1,41 @@
+--- src/video/quartz/SDL_QuartzVideo.h 2012-01-19 07:30:06.000000000 +0100
++++ src/video/quartz/SDL_QuartzVideo.h 2013-10-30 16:35:02.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 */
++#ifdef CGDirectPaletteRef
+ 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 */
+--- src/video/quartz/SDL_QuartzVideo.m 2012-01-19 07:30:06.000000000 +0100
++++ src/video/quartz/SDL_QuartzVideo.m 2013-10-30 16:39:21.000000000 +0100
+@@ -336,7 +336,7 @@
+ }
+ #endif
+
+-#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
++#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070) && defined(CGDirectPaletteRef)
+ if (!IS_LION_OR_LATER(this)) {
+ palette = CGPaletteCreateDefaultColorPalette();
+ }
+@@ -1244,7 +1244,7 @@
+ static int QZ_SetColors (_THIS, int first_color, int num_colors,
+ SDL_Color *colors)
+ {
+-#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
++#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070) && defined(CGDirectPaletteRef)
+ /* we shouldn't have an 8-bit mode on Lion! */
+ if (!IS_LION_OR_LATER(this)) {
+ CGTableCount index;
+@@ -1554,7 +1554,7 @@
+ else
+ QZ_UnsetVideoMode (this, TRUE, FALSE);
+
+-#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070)
++#if (MAC_OS_X_VERSION_MIN_REQUIRED < 1070) && defined(CGDirectPaletteRef)
+ if (!IS_LION_OR_LATER(this)) {
+ CGPaletteRelease(palette);
+ }
View
8 tools/depends/target/libsdl/Makefile
@@ -1,9 +1,9 @@
include ../../Makefile.include
-DEPS= ../../Makefile.include 01-SDL_SetWidthHeight.patch 02-mmx.patch Makefile
+DEPS= ../../Makefile.include 01-SDL_SetWidthHeight.patch 02-OSX_interpretKeyEvents.patch 03-mavericks-compile.patch Makefile
# lib name, version
LIBNAME=SDL
-VERSION=1.2.14
+VERSION=1.2.15
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
@@ -24,8 +24,8 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
cd $(PLATFORM); patch -p0 < ../01-SDL_SetWidthHeight.patch
- cd $(PLATFORM); patch -p0 < ../02-mmx.patch
- cd $(PLATFORM); patch -p0 < ../03-OSX_interpretKeyEvents.patch
+ cd $(PLATFORM); patch -p0 < ../02-OSX_interpretKeyEvents.patch
+ cd $(PLATFORM); patch -p0 < ../03-mavericks-compile.patch
cd $(PLATFORM); $(CONFIGURE)
$(LIBDYLIB): $(PLATFORM)
Something went wrong with that request. Please try again.