summaryrefslogtreecommitdiff
path: root/devel/sdl20/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/sdl20/files')
-rw-r--r--devel/sdl20/files/patch-clang35
-rw-r--r--devel/sdl20/files/patch-configure41
2 files changed, 0 insertions, 76 deletions
diff --git a/devel/sdl20/files/patch-clang b/devel/sdl20/files/patch-clang
deleted file mode 100644
index 193aff4155a7..000000000000
--- a/devel/sdl20/files/patch-clang
+++ /dev/null
@@ -1,35 +0,0 @@
-https://hg.libsdl.org/SDL/rev/b48d8a98e261 regressed Clang 3.9 + -O2 builds.
-<X11/Xmd.h> defines BOOL as unsigned char while <X11/Xdefs.h> defines Bool as int.
-
-(gdb) bt
-#0 0x000000080120025d in X11_InitXinput2Multitouch (_this=0x802000000)
- at .../SDL2-2.0.6/src/video/x11/SDL_x11xinput2.c:206
-#1 0x00000008011fccf9 in X11_VideoInit (_this=<optimized out>)
- at .../SDL2-2.0.6/src/video/x11/SDL_x11video.c:451
-#2 0x00000008011e9641 in SDL_VideoInit_REAL (driver_name=<optimized out>)
- at .../SDL2-2.0.6/src/video/SDL_video.c:532
-#3 0x0000000801161cec in SDL_InitSubSystem_REAL (flags=<optimized out>)
- at .../SDL2-2.0.6/src/SDL.c:170
-
---- src/video/x11/SDL_x11keyboard.c.orig 2017-09-22 18:51:01 UTC
-+++ src/video/x11/SDL_x11keyboard.c
-@@ -266,7 +266,7 @@ X11_InitKeyboard(_THIS)
- int best_distance;
- int best_index;
- int distance;
-- BOOL xkb_repeat = 0;
-+ Bool xkb_repeat = 0;
-
- X11_XAutoRepeatOn(data->display);
-
---- src/video/x11/SDL_x11sym.h.orig 2017-09-22 18:51:01 UTC
-+++ src/video/x11/SDL_x11sym.h
-@@ -180,7 +180,7 @@ SDL_X11_SYM(Status,XkbGetUpdatedMap,(Display* a,unsign
- SDL_X11_SYM(XkbDescPtr,XkbGetMap,(Display* a,unsigned int b,unsigned int c),(a,b,c),return)
- SDL_X11_SYM(void,XkbFreeClientMap,(XkbDescPtr a,unsigned int b, Bool c),(a,b,c),)
- SDL_X11_SYM(void,XkbFreeKeyboard,(XkbDescPtr a,unsigned int b, Bool c),(a,b,c),)
--SDL_X11_SYM(BOOL,XkbSetDetectableAutoRepeat,(Display* a, BOOL b, BOOL* c),(a,b,c),return)
-+SDL_X11_SYM(Bool,XkbSetDetectableAutoRepeat,(Display* a, Bool b, Bool* c),(a,b,c),return)
- #endif
-
- #if NeedWidePrototypes
diff --git a/devel/sdl20/files/patch-configure b/devel/sdl20/files/patch-configure
deleted file mode 100644
index 83308d6cf121..000000000000
--- a/devel/sdl20/files/patch-configure
+++ /dev/null
@@ -1,41 +0,0 @@
---- configure.orig 2017-10-23 19:27:45 UTC
-+++ configure
-@@ -24567,9 +24567,9 @@ if test x$video_wayland = xyes; then
- WAYLAND_CORE_PROTOCOL_SOURCE='$(gen)/wayland-protocol.c'
- WAYLAND_CORE_PROTOCOL_HEADER='$(gen)/wayland-client-protocol.h'
- WAYLAND_PROTOCOLS_UNSTABLE_SOURCES=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\
-- sed 's,[^ ]\+,\\$(gen)/&-protocol.c,g'`
-+ sed -E 's,[^ ]+,\\$(gen)/&-protocol.c,g'`
- WAYLAND_PROTOCOLS_UNSTABLE_HEADERS=`echo $WAYLAND_PROTOCOLS_UNSTABLE |\
-- sed 's,[^ ]\+,\\$(gen)/&-client-protocol.h,g'`
-+ sed -E 's,[^ ]+,\\$(gen)/&-client-protocol.h,g'`
- GEN_SOURCES="$GEN_SOURCES $WAYLAND_CORE_PROTOCOL_SOURCE $WAYLAND_PROTOCOLS_UNSTABLE_SOURCES"
- GEN_HEADERS="$GEN_HEADERS $WAYLAND_CORE_PROTOCOL_HEADER $WAYLAND_PROTOCOLS_UNSTABLE_HEADERS"
-
-@@ -24588,20 +24588,20 @@ $WAYLAND_CORE_PROTOCOL_HEADER: $WAYLAND_CORE_PROTOCOL_
- \$(RUN_CMD_CC)\$(LIBTOOL) --tag=CC --mode=compile \$(CC) \$(CFLAGS) \$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \$< -o \$@"
-
- WAYLAND_PROTOCOLS_CLIENT_HEADER_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
-- do echo ; echo \$p | sed\
-- "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-client-protocol.h: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
-+ do echo ; echo \$p | sed -E\
-+ "s,^([a-z\\-]+)-unstable-(v[0-9]+)\$,\\$(gen)/&-client-protocol.h: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
- \\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
- \\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) client-header \\$< \\$@," ; done`
-
- WAYLAND_PROTOCOLS_CODE_UNSTABLE_DEPENDS=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
-- do echo ; echo \$p | sed\
-- "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\$(gen)/&-protocol.c: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
-+ do echo ; echo \$p | sed -E\
-+ "s,^([a-z\\-]+)-unstable-(v[0-9]+)\$,\\$(gen)/&-protocol.c: $WAYLAND_PROTOCOLS_DIR/unstable/\1/&.xml\\\\
- \\$(SHELL) \\$(auxdir)/mkinstalldirs \\$(gen)\\\\
- \\$(RUN_CMD_GEN)\\$(WAYLAND_SCANNER) code \\$< \\$@," ; done`
-
- WAYLAND_PROTOCOLS_OBJECTS_UNSTABLE=`for p in $WAYLAND_PROTOCOLS_UNSTABLE;\
-- do echo ; echo \$p | sed\
-- "s,^\\([a-z\\-]\\+\\)-unstable-\\(v[0-9]\+\\)\$,\\\$(objects)/&-protocol.lo: \\$(gen)/&-protocol.c \\$(gen)/&-client-protocol.h\\\\
-+ do echo ; echo \$p | sed -E\
-+ "s,^([a-z\\-]+)-unstable-(v[0-9]+)\$,\\\$(objects)/&-protocol.lo: \\$(gen)/&-protocol.c \\$(gen)/&-client-protocol.h\\\\
- \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@," ; done`
-
- WAYLAND_PROTOCOLS_DEPENDS="