diff options
| author | Tobias Hieta <tobias@plexapp.com> | 2013-11-13 11:46:46 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2013-11-13 14:06:09 +0100 |
| commit | f8e771491c0eb5eaf24b50297036f886dee47c8e (patch) | |
| tree | ead791dc42ef4ce7ff6b88d390cb3d9f14b96a44 /tools/depends | |
| parent | 764db2e92bb024d291769228649ad9c8eb167710 (diff) | |
[osx/sdl] - fix possible NPE - fixes #14676
Diffstat (limited to 'tools/depends')
| -rw-r--r-- | tools/depends/target/libsdl/04-fix_external_screen_crash.patch | 11 | ||||
| -rw-r--r-- | tools/depends/target/libsdl/Makefile | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tools/depends/target/libsdl/04-fix_external_screen_crash.patch b/tools/depends/target/libsdl/04-fix_external_screen_crash.patch new file mode 100644 index 0000000000..b474e3a3b3 --- /dev/null +++ b/tools/depends/target/libsdl/04-fix_external_screen_crash.patch @@ -0,0 +1,11 @@ +--- src/video/quartz/SDL_QuartzWindow.m.orig 2013-10-31 04:29:45.000000000 -0700 ++++ src/video/quartz/SDL_QuartzWindow.m 2013-10-31 04:30:05.000000000 -0700 +@@ -87,7 +87,7 @@ + SDL_VideoDevice *this = (SDL_VideoDevice*)current_video; + + /* make sure pixels are fully opaque */ +- if (! ( SDL_VideoSurface->flags & SDL_OPENGL ) ) ++ if ( SDL_VideoSurface && ! ( SDL_VideoSurface->flags & SDL_OPENGL ) ) + QZ_SetPortAlphaOpaque (); + + /* save current visible SDL surface */ diff --git a/tools/depends/target/libsdl/Makefile b/tools/depends/target/libsdl/Makefile index 0a57105356..ff0879cd1e 100644 --- a/tools/depends/target/libsdl/Makefile +++ b/tools/depends/target/libsdl/Makefile @@ -26,6 +26,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) cd $(PLATFORM); patch -p0 < ../01-SDL_SetWidthHeight.patch cd $(PLATFORM); patch -p0 < ../02-OSX_interpretKeyEvents.patch cd $(PLATFORM); patch -p0 < ../03-mavericks-compile.patch + cd $(PLATFORM); patch -p0 < ../04-fix_external_screen_crash.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) |