update to SDL2 2.0.3, and add a patch from Al Poole to avoid load/unload/load
of symbols to work-around a crash in ld.so - remove BROKEN marker. ok juanfra@
This commit is contained in:
parent
94353612dd
commit
d6e7a677c4
@ -1,12 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.7 2015/08/25 13:18:25 sthen Exp $
|
||||
|
||||
BROKEN= issue with ld.so
|
||||
# $OpenBSD: Makefile,v 1.8 2015/11/03 10:22:46 sthen Exp $
|
||||
|
||||
COMMENT= cross-platform multimedia library
|
||||
|
||||
V= 2.0.2
|
||||
V= 2.0.3
|
||||
DISTNAME= SDL2-${V}
|
||||
REVISION= 3
|
||||
PKGNAME= sdl2-${V}
|
||||
CATEGORIES= devel
|
||||
MASTER_SITES= http://www.libsdl.org/release/
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (SDL2-2.0.2.tar.gz) = WQFX+FqKi1JyOEgWmnTuxsoHq0p1zsFb7t3mSPmA6FA=
|
||||
SIZE (SDL2-2.0.2.tar.gz) = 3812882
|
||||
SHA256 (SDL2-2.0.3.tar.gz) = paaaar+AvM5xP6hzYHc1/nEvRCdqfwSNYKYbsvazyQw=
|
||||
SIZE (SDL2-2.0.3.tar.gz) = 3871267
|
||||
|
29
devel/sdl2/patches/patch-src_video_x11_SDL_x11video_c
Normal file
29
devel/sdl2/patches/patch-src_video_x11_SDL_x11video_c
Normal file
@ -0,0 +1,29 @@
|
||||
$OpenBSD: patch-src_video_x11_SDL_x11video_c,v 1.1 2015/11/03 10:22:46 sthen Exp $
|
||||
|
||||
Avoid loading/unloading/reloading symbols, it crashes ld.so:
|
||||
https://marc.info/?l=openbsd-tech&m=144576799413459&w=2
|
||||
|
||||
--- src/video/x11/SDL_x11video.c.orig Mon Nov 2 11:52:57 2015
|
||||
+++ src/video/x11/SDL_x11video.c Mon Nov 2 11:56:27 2015
|
||||
@@ -311,7 +311,9 @@ X11_Available(void)
|
||||
if (display != NULL) {
|
||||
X11_XCloseDisplay(display);
|
||||
}
|
||||
+#ifndef __OpenBSD__
|
||||
SDL_X11_UnloadSymbols();
|
||||
+#endif
|
||||
}
|
||||
return (display != NULL);
|
||||
}
|
||||
@@ -367,9 +369,11 @@ X11_CreateDevice(int devindex)
|
||||
SDL_VideoData *data;
|
||||
const char *display = NULL; /* Use the DISPLAY environment variable */
|
||||
|
||||
+#ifndef __OpenBSD__
|
||||
if (!SDL_X11_LoadSymbols()) {
|
||||
return NULL;
|
||||
}
|
||||
+#endif
|
||||
|
||||
/* Need for threading gl calls. This is also required for the proprietary
|
||||
nVidia driver to be threaded. */
|
Loading…
Reference in New Issue
Block a user