wayland: Fix bug 3814 -Wmissing-field-initializers
authorBrandon Schaefer <brandon.schaefer@canonical.com>
Fri, 29 Sep 2017 10:07:37 -0700
changeset 115522603f41d6a7e
parent 11551 a09c3f87a12f
child 11553 b89649d1a7a5
wayland: Fix bug 3814 -Wmissing-field-initializers
configure
configure.in
include/SDL_config.h
include/SDL_revision.h
src/core/linux/SDL_udev.c
src/loadso/dlopen/SDL_sysloadso.c
src/video/SDL_egl.c
src/video/wayland/SDL_waylandevents.c
src/video/wayland/SDL_waylandvideo.c
test/configure
test/testgl2.c
     1.1 --- a/configure	Fri Sep 29 07:44:30 2017 -0700
     1.2 +++ b/configure	Fri Sep 29 10:07:37 2017 -0700
     1.3 @@ -745,6 +745,7 @@
     1.4  docdir
     1.5  oldincludedir
     1.6  includedir
     1.7 +runstatedir
     1.8  localstatedir
     1.9  sharedstatedir
    1.10  sysconfdir
    1.11 @@ -922,6 +923,7 @@
    1.12  sysconfdir='${prefix}/etc'
    1.13  sharedstatedir='${prefix}/com'
    1.14  localstatedir='${prefix}/var'
    1.15 +runstatedir='${localstatedir}/run'
    1.16  includedir='${prefix}/include'
    1.17  oldincludedir='/usr/include'
    1.18  docdir='${datarootdir}/doc/${PACKAGE}'
    1.19 @@ -1174,6 +1176,15 @@
    1.20    | -silent | --silent | --silen | --sile | --sil)
    1.21      silent=yes ;;
    1.22  
    1.23 +  -runstatedir | --runstatedir | --runstatedi | --runstated \
    1.24 +  | --runstate | --runstat | --runsta | --runst | --runs \
    1.25 +  | --run | --ru | --r)
    1.26 +    ac_prev=runstatedir ;;
    1.27 +  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
    1.28 +  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
    1.29 +  | --run=* | --ru=* | --r=*)
    1.30 +    runstatedir=$ac_optarg ;;
    1.31 +
    1.32    -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    1.33      ac_prev=sbindir ;;
    1.34    -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
    1.35 @@ -1311,7 +1322,7 @@
    1.36  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
    1.37  		datadir sysconfdir sharedstatedir localstatedir includedir \
    1.38  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
    1.39 -		libdir localedir mandir
    1.40 +		libdir localedir mandir runstatedir
    1.41  do
    1.42    eval ac_val=\$$ac_var
    1.43    # Remove trailing slashes.
    1.44 @@ -1464,6 +1475,7 @@
    1.45    --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
    1.46    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    1.47    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
    1.48 +  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
    1.49    --libdir=DIR            object code libraries [EPREFIX/lib]
    1.50    --includedir=DIR        C header files [PREFIX/include]
    1.51    --oldincludedir=DIR     C header files for non-gcc [/usr/include]
    1.52 @@ -19104,6 +19116,7 @@
    1.53  
    1.54  CheckWayland()
    1.55  {
    1.56 +    EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall -Wmissing-field-initializers"
    1.57      # Check whether --enable-video-wayland was given.
    1.58  if test "${enable_video_wayland+set}" = set; then :
    1.59    enableval=$enable_video_wayland;
     2.1 --- a/configure.in	Fri Sep 29 07:44:30 2017 -0700
     2.2 +++ b/configure.in	Fri Sep 29 10:07:37 2017 -0700
     2.3 @@ -1366,6 +1366,7 @@
     2.4  dnl Check for Wayland
     2.5  CheckWayland()
     2.6  {
     2.7 +    EXTRA_CFLAGS="$EXTRA_CFLAGS -Wall -Wmissing-field-initializers"
     2.8      AC_ARG_ENABLE(video-wayland,
     2.9  AC_HELP_STRING([--enable-video-wayland], [use Wayland video driver [[default=yes]]]),
    2.10                    ,enable_video_wayland=yes)
     3.1 --- a/include/SDL_config.h	Fri Sep 29 07:44:30 2017 -0700
     3.2 +++ b/include/SDL_config.h	Fri Sep 29 10:07:37 2017 -0700
     3.3 @@ -1,3 +1,4 @@
     3.4 +/* include/SDL_config.h.  Generated from SDL_config.h.in by configure.  */
     3.5  /*
     3.6    Simple DirectMedia Layer
     3.7    Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
     3.8 @@ -22,32 +23,371 @@
     3.9  #ifndef SDL_config_h_
    3.10  #define SDL_config_h_
    3.11  
    3.12 +/**
    3.13 + *  \file SDL_config.h.in
    3.14 + *
    3.15 + *  This is a set of defines to configure the SDL features
    3.16 + */
    3.17 +
    3.18 +/* General platform specific identifiers */
    3.19  #include "SDL_platform.h"
    3.20  
    3.21 -/**
    3.22 - *  \file SDL_config.h
    3.23 - */
    3.24 -
    3.25 -/* Add any platform that doesn't build using the configure system. */
    3.26 -#if defined(__WIN32__)
    3.27 -#include "SDL_config_windows.h"
    3.28 -#elif defined(__WINRT__)
    3.29 -#include "SDL_config_winrt.h"
    3.30 -#elif defined(__MACOSX__)
    3.31 -#include "SDL_config_macosx.h"
    3.32 -#elif defined(__IPHONEOS__)
    3.33 -#include "SDL_config_iphoneos.h"
    3.34 -#elif defined(__ANDROID__)
    3.35 -#include "SDL_config_android.h"
    3.36 -#elif defined(__PSP__)
    3.37 -#include "SDL_config_psp.h"
    3.38 -#else
    3.39 -/* This is a minimal configuration just to get SDL running on new platforms */
    3.40 -#include "SDL_config_minimal.h"
    3.41 -#endif /* platform config */
    3.42 -
    3.43 -#ifdef USING_GENERATED_CONFIG_H
    3.44 -#error Wrong SDL_config.h, check your include path?
    3.45 +/* Make sure that this isn't included by Visual C++ */
    3.46 +#ifdef _MSC_VER
    3.47 +#error You should run hg revert SDL_config.h 
    3.48  #endif
    3.49  
    3.50 +/* C language features */
    3.51 +/* #undef const */
    3.52 +/* #undef inline */
    3.53 +/* #undef volatile */
    3.54 +
    3.55 +/* C datatypes */
    3.56 +#ifdef __LP64__
    3.57 +#define SIZEOF_VOIDP 8
    3.58 +#else
    3.59 +#define SIZEOF_VOIDP 4
    3.60 +#endif
    3.61 +#define HAVE_GCC_ATOMICS 1
    3.62 +/* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
    3.63 +
    3.64 +/* Comment this if you want to build without any C library requirements */
    3.65 +#define HAVE_LIBC 1
    3.66 +#if HAVE_LIBC
    3.67 +
    3.68 +/* Useful headers */
    3.69 +#define STDC_HEADERS 1
    3.70 +#define HAVE_ALLOCA_H 1
    3.71 +#define HAVE_CTYPE_H 1
    3.72 +#define HAVE_FLOAT_H 1
    3.73 +#define HAVE_ICONV_H 1
    3.74 +#define HAVE_INTTYPES_H 1
    3.75 +#define HAVE_LIMITS_H 1
    3.76 +#define HAVE_MALLOC_H 1
    3.77 +#define HAVE_MATH_H 1
    3.78 +#define HAVE_MEMORY_H 1
    3.79 +#define HAVE_SIGNAL_H 1
    3.80 +#define HAVE_STDARG_H 1
    3.81 +#define HAVE_STDINT_H 1
    3.82 +#define HAVE_STDIO_H 1
    3.83 +#define HAVE_STDLIB_H 1
    3.84 +#define HAVE_STRINGS_H 1
    3.85 +#define HAVE_STRING_H 1
    3.86 +#define HAVE_SYS_TYPES_H 1
    3.87 +#define HAVE_WCHAR_H 1
    3.88 +/* #undef HAVE_PTHREAD_NP_H */
    3.89 +
    3.90 +/* C library functions */
    3.91 +#define HAVE_MALLOC 1
    3.92 +#define HAVE_CALLOC 1
    3.93 +#define HAVE_REALLOC 1
    3.94 +#define HAVE_FREE 1
    3.95 +#define HAVE_ALLOCA 1
    3.96 +#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
    3.97 +#define HAVE_GETENV 1
    3.98 +#define HAVE_SETENV 1
    3.99 +#define HAVE_PUTENV 1
   3.100 +#define HAVE_UNSETENV 1
   3.101 +#endif
   3.102 +#define HAVE_QSORT 1
   3.103 +#define HAVE_ABS 1
   3.104 +#define HAVE_BCOPY 1
   3.105 +#define HAVE_MEMSET 1
   3.106 +#define HAVE_MEMCPY 1
   3.107 +#define HAVE_MEMMOVE 1
   3.108 +#define HAVE_MEMCMP 1
   3.109 +#define HAVE_WCSLEN 1
   3.110 +/* #undef HAVE_WCSLCPY */
   3.111 +/* #undef HAVE_WCSLCAT */
   3.112 +#define HAVE_WCSCMP 1
   3.113 +#define HAVE_STRLEN 1
   3.114 +/* #undef HAVE_STRLCPY */
   3.115 +/* #undef HAVE_STRLCAT */
   3.116 +#define HAVE_STRDUP 1
   3.117 +/* #undef HAVE__STRREV */
   3.118 +/* #undef HAVE__STRUPR */
   3.119 +/* #undef HAVE__STRLWR */
   3.120 +/* #undef HAVE_INDEX */
   3.121 +/* #undef HAVE_RINDEX */
   3.122 +#define HAVE_STRCHR 1
   3.123 +#define HAVE_STRRCHR 1
   3.124 +#define HAVE_STRSTR 1
   3.125 +/* #undef HAVE_ITOA */
   3.126 +/* #undef HAVE__LTOA */
   3.127 +/* #undef HAVE__UITOA */
   3.128 +/* #undef HAVE__ULTOA */
   3.129 +#define HAVE_STRTOL 1
   3.130 +#define HAVE_STRTOUL 1
   3.131 +/* #undef HAVE__I64TOA */
   3.132 +/* #undef HAVE__UI64TOA */
   3.133 +#define HAVE_STRTOLL 1
   3.134 +#define HAVE_STRTOULL 1
   3.135 +#define HAVE_STRTOD 1
   3.136 +#define HAVE_ATOI 1
   3.137 +#define HAVE_ATOF 1
   3.138 +#define HAVE_STRCMP 1
   3.139 +#define HAVE_STRNCMP 1
   3.140 +/* #undef HAVE__STRICMP */
   3.141 +#define HAVE_STRCASECMP 1
   3.142 +/* #undef HAVE__STRNICMP */
   3.143 +#define HAVE_STRNCASECMP 1
   3.144 +/* #undef HAVE_SSCANF */
   3.145 +#define HAVE_VSSCANF 1
   3.146 +/* #undef HAVE_SNPRINTF */
   3.147 +#define HAVE_VSNPRINTF 1
   3.148 +#define HAVE_M_PI /**/
   3.149 +#define HAVE_ATAN 1
   3.150 +#define HAVE_ATAN2 1
   3.151 +#define HAVE_ACOS 1
   3.152 +#define HAVE_ASIN 1
   3.153 +#define HAVE_CEIL 1
   3.154 +#define HAVE_COPYSIGN 1
   3.155 +#define HAVE_COS 1
   3.156 +#define HAVE_COSF 1
   3.157 +#define HAVE_FABS 1
   3.158 +#define HAVE_FLOOR 1
   3.159 +#define HAVE_LOG 1
   3.160 +#define HAVE_POW 1
   3.161 +#define HAVE_SCALBN 1
   3.162 +#define HAVE_SIN 1
   3.163 +#define HAVE_SINF 1
   3.164 +#define HAVE_SQRT 1
   3.165 +#define HAVE_SQRTF 1
   3.166 +#define HAVE_TAN 1
   3.167 +#define HAVE_TANF 1
   3.168 +#define HAVE_FOPEN64 1
   3.169 +#define HAVE_FSEEKO 1
   3.170 +#define HAVE_FSEEKO64 1
   3.171 +#define HAVE_SIGACTION 1
   3.172 +#define HAVE_SA_SIGACTION 1
   3.173 +#define HAVE_SETJMP 1
   3.174 +#define HAVE_NANOSLEEP 1
   3.175 +#define HAVE_SYSCONF 1
   3.176 +/* #undef HAVE_SYSCTLBYNAME */
   3.177 +#define HAVE_CLOCK_GETTIME 1
   3.178 +/* #undef HAVE_GETPAGESIZE */
   3.179 +#define HAVE_MPROTECT 1
   3.180 +#define HAVE_ICONV 1
   3.181 +#define HAVE_PTHREAD_SETNAME_NP 1
   3.182 +/* #undef HAVE_PTHREAD_SET_NAME_NP */
   3.183 +#define HAVE_SEM_TIMEDWAIT 1
   3.184 +#define HAVE_GETAUXVAL 1
   3.185 +#define HAVE_POLL 1
   3.186 +
   3.187 +#else
   3.188 +#define HAVE_STDARG_H 1
   3.189 +#define HAVE_STDDEF_H 1
   3.190 +#define HAVE_STDINT_H 1
   3.191 +#endif /* HAVE_LIBC */
   3.192 +
   3.193 +/* #undef HAVE_ALTIVEC_H */
   3.194 +#define HAVE_LIBUDEV_H 1
   3.195 +#define HAVE_DBUS_DBUS_H 1
   3.196 +#define HAVE_IBUS_IBUS_H 1
   3.197 +/* #undef HAVE_FCITX_FRONTEND_H */
   3.198 +#define HAVE_LIBSAMPLERATE_H 1
   3.199 +
   3.200 +/* #undef HAVE_DDRAW_H */
   3.201 +/* #undef HAVE_DINPUT_H */
   3.202 +/* #undef HAVE_DSOUND_H */
   3.203 +/* #undef HAVE_DXGI_H */
   3.204 +/* #undef HAVE_XINPUT_H */
   3.205 +/* #undef HAVE_XINPUT_GAMEPAD_EX */
   3.206 +/* #undef HAVE_XINPUT_STATE_EX */
   3.207 +
   3.208 +/* SDL internal assertion support */
   3.209 +/* #undef SDL_DEFAULT_ASSERT_LEVEL */
   3.210 +
   3.211 +/* Allow disabling of core subsystems */
   3.212 +/* #undef SDL_ATOMIC_DISABLED */
   3.213 +/* #undef SDL_AUDIO_DISABLED */
   3.214 +/* #undef SDL_CPUINFO_DISABLED */
   3.215 +/* #undef SDL_EVENTS_DISABLED */
   3.216 +/* #undef SDL_FILE_DISABLED */
   3.217 +/* #undef SDL_JOYSTICK_DISABLED */
   3.218 +/* #undef SDL_HAPTIC_DISABLED */
   3.219 +/* #undef SDL_LOADSO_DISABLED */
   3.220 +/* #undef SDL_RENDER_DISABLED */
   3.221 +/* #undef SDL_THREADS_DISABLED */
   3.222 +/* #undef SDL_TIMERS_DISABLED */
   3.223 +/* #undef SDL_VIDEO_DISABLED */
   3.224 +/* #undef SDL_POWER_DISABLED */
   3.225 +/* #undef SDL_FILESYSTEM_DISABLED */
   3.226 +
   3.227 +/* Enable various audio drivers */
   3.228 +#define SDL_AUDIO_DRIVER_ALSA 1
   3.229 +#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
   3.230 +/* #undef SDL_AUDIO_DRIVER_ANDROID */
   3.231 +/* #undef SDL_AUDIO_DRIVER_ARTS */
   3.232 +/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
   3.233 +/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
   3.234 +#define SDL_AUDIO_DRIVER_DISK 1
   3.235 +/* #undef SDL_AUDIO_DRIVER_DSOUND */
   3.236 +#define SDL_AUDIO_DRIVER_DUMMY 1
   3.237 +/* #undef SDL_AUDIO_DRIVER_EMSCRIPTEN */
   3.238 +/* #undef SDL_AUDIO_DRIVER_ESD */
   3.239 +/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
   3.240 +/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
   3.241 +/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
   3.242 +/* #undef SDL_AUDIO_DRIVER_HAIKU */
   3.243 +#define SDL_AUDIO_DRIVER_JACK 1
   3.244 +#define SDL_AUDIO_DRIVER_JACK_DYNAMIC "libjack.so.0"
   3.245 +/* #undef SDL_AUDIO_DRIVER_NACL */
   3.246 +/* #undef SDL_AUDIO_DRIVER_NAS */
   3.247 +/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
   3.248 +/* #undef SDL_AUDIO_DRIVER_NETBSD */
   3.249 +#define SDL_AUDIO_DRIVER_OSS 1
   3.250 +/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
   3.251 +/* #undef SDL_AUDIO_DRIVER_PAUDIO */
   3.252 +#define SDL_AUDIO_DRIVER_PULSEAUDIO 1
   3.253 +#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC "libpulse-simple.so.0"
   3.254 +/* #undef SDL_AUDIO_DRIVER_QSA */
   3.255 +#define SDL_AUDIO_DRIVER_SNDIO 1
   3.256 +/* #undef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC */
   3.257 +/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
   3.258 +/* #undef SDL_AUDIO_DRIVER_WASAPI */
   3.259 +/* #undef SDL_AUDIO_DRIVER_WINMM */
   3.260 +/* #undef SDL_AUDIO_DRIVER_XAUDIO2 */
   3.261 +
   3.262 +/* Enable various input drivers */
   3.263 +#define SDL_INPUT_LINUXEV 1
   3.264 +#define SDL_INPUT_LINUXKD 1
   3.265 +/* #undef SDL_INPUT_TSLIB */
   3.266 +/* #undef SDL_JOYSTICK_HAIKU */
   3.267 +/* #undef SDL_JOYSTICK_DINPUT */
   3.268 +/* #undef SDL_JOYSTICK_XINPUT */
   3.269 +/* #undef SDL_JOYSTICK_DUMMY */
   3.270 +/* #undef SDL_JOYSTICK_IOKIT */
   3.271 +#define SDL_JOYSTICK_LINUX 1
   3.272 +/* #undef SDL_JOYSTICK_ANDROID */
   3.273 +/* #undef SDL_JOYSTICK_WINMM */
   3.274 +/* #undef SDL_JOYSTICK_USBHID */
   3.275 +/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
   3.276 +/* #undef SDL_JOYSTICK_EMSCRIPTEN */
   3.277 +/* #undef SDL_HAPTIC_DUMMY */
   3.278 +#define SDL_HAPTIC_LINUX 1
   3.279 +/* #undef SDL_HAPTIC_IOKIT */
   3.280 +/* #undef SDL_HAPTIC_DINPUT */
   3.281 +/* #undef SDL_HAPTIC_XINPUT */
   3.282 +
   3.283 +/* Enable various shared object loading systems */
   3.284 +#define SDL_LOADSO_DLOPEN 1
   3.285 +/* #undef SDL_LOADSO_DUMMY */
   3.286 +/* #undef SDL_LOADSO_LDG */
   3.287 +/* #undef SDL_LOADSO_WINDOWS */
   3.288 +
   3.289 +/* Enable various threading systems */
   3.290 +#define SDL_THREAD_PTHREAD 1
   3.291 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
   3.292 +/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
   3.293 +/* #undef SDL_THREAD_WINDOWS */
   3.294 +
   3.295 +/* Enable various timer systems */
   3.296 +/* #undef SDL_TIMER_HAIKU */
   3.297 +/* #undef SDL_TIMER_DUMMY */
   3.298 +#define SDL_TIMER_UNIX 1
   3.299 +/* #undef SDL_TIMER_WINDOWS */
   3.300 +
   3.301 +/* Enable various video drivers */
   3.302 +/* #undef SDL_VIDEO_DRIVER_HAIKU */
   3.303 +/* #undef SDL_VIDEO_DRIVER_COCOA */
   3.304 +/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
   3.305 +/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
   3.306 +#define SDL_VIDEO_DRIVER_DUMMY 1
   3.307 +/* #undef SDL_VIDEO_DRIVER_WINDOWS */
   3.308 +#define SDL_VIDEO_DRIVER_WAYLAND 1
   3.309 +#define SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH 1
   3.310 +#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC "libwayland-client.so.0"
   3.311 +#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL "libwayland-egl.so.1"
   3.312 +#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR "libwayland-cursor.so.0"
   3.313 +#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON "libxkbcommon.so.0"
   3.314 +/* #undef SDL_VIDEO_DRIVER_MIR */
   3.315 +/* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC */
   3.316 +/* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON */
   3.317 +#define SDL_VIDEO_DRIVER_X11 1
   3.318 +/* #undef SDL_VIDEO_DRIVER_RPI */
   3.319 +/* #undef SDL_VIDEO_DRIVER_KMSDRM */
   3.320 +/* #undef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC */
   3.321 +/* #undef SDL_VIDEO_DRIVER_KMSDRM_DYNAMIC_GBM */
   3.322 +/* #undef SDL_VIDEO_DRIVER_ANDROID */
   3.323 +/* #undef SDL_VIDEO_DRIVER_EMSCRIPTEN */
   3.324 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
   3.325 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
   3.326 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR "libXcursor.so.1"
   3.327 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "libXinerama.so.1"
   3.328 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "libXi.so.6"
   3.329 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libXrandr.so.2"
   3.330 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "libXss.so.1"
   3.331 +#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "libXxf86vm.so.1"
   3.332 +#define SDL_VIDEO_DRIVER_X11_XCURSOR 1
   3.333 +#define SDL_VIDEO_DRIVER_X11_XDBE 1
   3.334 +#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
   3.335 +#define SDL_VIDEO_DRIVER_X11_XINPUT2 1
   3.336 +#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1
   3.337 +#define SDL_VIDEO_DRIVER_X11_XRANDR 1
   3.338 +#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
   3.339 +#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
   3.340 +#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1
   3.341 +#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
   3.342 +#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1
   3.343 +#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
   3.344 +/* #undef SDL_VIDEO_DRIVER_NACL */
   3.345 +/* #undef SDL_VIDEO_DRIVER_VIVANTE */
   3.346 +/* #undef SDL_VIDEO_DRIVER_VIVANTE_VDK */
   3.347 +/* #undef SDL_VIDEO_DRIVER_QNX */
   3.348 +
   3.349 +/* #undef SDL_VIDEO_RENDER_D3D */
   3.350 +/* #undef SDL_VIDEO_RENDER_D3D11 */
   3.351 +#define SDL_VIDEO_RENDER_OGL 1
   3.352 +/* #undef SDL_VIDEO_RENDER_OGL_ES */
   3.353 +#define SDL_VIDEO_RENDER_OGL_ES2 1
   3.354 +/* #undef SDL_VIDEO_RENDER_DIRECTFB */
   3.355 +
   3.356 +/* Enable OpenGL support */
   3.357 +#define SDL_VIDEO_OPENGL 1
   3.358 +/* #undef SDL_VIDEO_OPENGL_ES */
   3.359 +#define SDL_VIDEO_OPENGL_ES2 1
   3.360 +/* #undef SDL_VIDEO_OPENGL_BGL */
   3.361 +/* #undef SDL_VIDEO_OPENGL_CGL */
   3.362 +#define SDL_VIDEO_OPENGL_EGL 1
   3.363 +#define SDL_VIDEO_OPENGL_GLX 1
   3.364 +/* #undef SDL_VIDEO_OPENGL_WGL */
   3.365 +/* #undef SDL_VIDEO_OPENGL_OSMESA */
   3.366 +/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
   3.367 +
   3.368 +/* Enable Vulkan support */
   3.369 +#define SDL_VIDEO_VULKAN 1
   3.370 +
   3.371 +/* Enable system power support */
   3.372 +#define SDL_POWER_LINUX 1
   3.373 +/* #undef SDL_POWER_WINDOWS */
   3.374 +/* #undef SDL_POWER_MACOSX */
   3.375 +/* #undef SDL_POWER_HAIKU */
   3.376 +/* #undef SDL_POWER_ANDROID */
   3.377 +/* #undef SDL_POWER_EMSCRIPTEN */
   3.378 +/* #undef SDL_POWER_HARDWIRED */
   3.379 +
   3.380 +/* Enable system filesystem support */
   3.381 +/* #undef SDL_FILESYSTEM_HAIKU */
   3.382 +/* #undef SDL_FILESYSTEM_COCOA */
   3.383 +/* #undef SDL_FILESYSTEM_DUMMY */
   3.384 +#define SDL_FILESYSTEM_UNIX 1
   3.385 +/* #undef SDL_FILESYSTEM_WINDOWS */
   3.386 +/* #undef SDL_FILESYSTEM_NACL */
   3.387 +/* #undef SDL_FILESYSTEM_ANDROID */
   3.388 +/* #undef SDL_FILESYSTEM_EMSCRIPTEN */
   3.389 +
   3.390 +/* Enable assembly routines */
   3.391 +#define SDL_ASSEMBLY_ROUTINES 1
   3.392 +/* #undef SDL_ALTIVEC_BLITTERS */
   3.393 +
   3.394 +/* Enable ime support */
   3.395 +#define SDL_USE_IME 1
   3.396 +
   3.397 +/* Enable dynamic udev support */
   3.398 +#define SDL_UDEV_DYNAMIC "libudev.so.1"
   3.399 +
   3.400 +/* Enable dynamic libsamplerate support */
   3.401 +#define SDL_LIBSAMPLERATE_DYNAMIC "libsamplerate.so.0"
   3.402 +
   3.403  #endif /* SDL_config_h_ */
     4.1 --- a/include/SDL_revision.h	Fri Sep 29 07:44:30 2017 -0700
     4.2 +++ b/include/SDL_revision.h	Fri Sep 29 10:07:37 2017 -0700
     4.3 @@ -1,2 +1,2 @@
     4.4 -#define SDL_REVISION "hg-0:aaaaaaaaaaah"
     4.5 -#define SDL_REVISION_NUMBER 0
     4.6 +#define SDL_REVISION "hg-11511:833d4fbb3d76"
     4.7 +#define SDL_REVISION_NUMBER 11511
     5.1 --- a/src/core/linux/SDL_udev.c	Fri Sep 29 07:44:30 2017 -0700
     5.2 +++ b/src/core/linux/SDL_udev.c	Fri Sep 29 10:07:37 2017 -0700
     5.3 @@ -167,6 +167,7 @@
     5.4  SDL_UDEV_Quit(void)
     5.5  {
     5.6      SDL_UDEV_CallbackList *item;
     5.7 +    printf("We do indeed get here\n");
     5.8      
     5.9      if (_this == NULL) {
    5.10          return;
     6.1 --- a/src/loadso/dlopen/SDL_sysloadso.c	Fri Sep 29 07:44:30 2017 -0700
     6.2 +++ b/src/loadso/dlopen/SDL_sysloadso.c	Fri Sep 29 10:07:37 2017 -0700
     6.3 @@ -47,6 +47,7 @@
     6.4      }
     6.5  #endif
     6.6  
     6.7 +    printf("SOFILE: %s\n", sofile);
     6.8      handle = dlopen(sofile, RTLD_NOW|RTLD_LOCAL);
     6.9      loaderror = (char *) dlerror();
    6.10      if (handle == NULL) {
     7.1 --- a/src/video/SDL_egl.c	Fri Sep 29 07:44:30 2017 -0700
     7.2 +++ b/src/video/SDL_egl.c	Fri Sep 29 10:07:37 2017 -0700
     7.3 @@ -177,6 +177,8 @@
     7.4      if (egl_extstr != NULL) {
     7.5          ext_start = egl_extstr;
     7.6  
     7.7 +        printf("%s\n", ext_start);
     7.8 +
     7.9          while (*ext_start) {
    7.10              ext_start = SDL_strstr(ext_start, ext);
    7.11              if (ext_start == NULL) {
     8.1 --- a/src/video/wayland/SDL_waylandevents.c	Fri Sep 29 07:44:30 2017 -0700
     8.2 +++ b/src/video/wayland/SDL_waylandevents.c	Fri Sep 29 10:07:37 2017 -0700
     8.3 @@ -366,6 +366,10 @@
     8.4      pointer_handle_motion,
     8.5      pointer_handle_button,
     8.6      pointer_handle_axis,
     8.7 +    NULL, /* frame */
     8.8 +    NULL, /* axis_source */
     8.9 +    NULL, /* axis_stop */
    8.10 +    NULL, /* axis_discrete */
    8.11  };
    8.12  
    8.13  static void
    8.14 @@ -428,7 +432,9 @@
    8.15      touch_handler_up,
    8.16      touch_handler_motion,
    8.17      touch_handler_frame,
    8.18 -    touch_handler_cancel
    8.19 +    touch_handler_cancel,
    8.20 +    NULL, /* shape */
    8.21 +    NULL, /* orientation */
    8.22  };
    8.23  
    8.24  static void
    8.25 @@ -564,6 +570,7 @@
    8.26      keyboard_handle_leave,
    8.27      keyboard_handle_key,
    8.28      keyboard_handle_modifiers,
    8.29 +    NULL, /* repeat_info */
    8.30  };
    8.31  
    8.32  static void
    8.33 @@ -608,6 +615,7 @@
    8.34  
    8.35  static const struct wl_seat_listener seat_listener = {
    8.36      seat_handle_capabilities,
    8.37 +    NULL, /* name */
    8.38  };
    8.39  
    8.40  static void
     9.1 --- a/src/video/wayland/SDL_waylandvideo.c	Fri Sep 29 07:44:30 2017 -0700
     9.2 +++ b/src/video/wayland/SDL_waylandvideo.c	Fri Sep 29 10:07:37 2017 -0700
     9.3 @@ -344,7 +344,8 @@
     9.4  }
     9.5  
     9.6  static const struct wl_registry_listener registry_listener = {
     9.7 -    display_handle_global
     9.8 +    display_handle_global,
     9.9 +    NULL, /* global_remove */
    9.10  };
    9.11  
    9.12  int
    10.1 --- a/test/configure	Fri Sep 29 07:44:30 2017 -0700
    10.2 +++ b/test/configure	Fri Sep 29 10:07:37 2017 -0700
    10.3 @@ -637,6 +637,7 @@
    10.4  docdir
    10.5  oldincludedir
    10.6  includedir
    10.7 +runstatedir
    10.8  localstatedir
    10.9  sharedstatedir
   10.10  sysconfdir
   10.11 @@ -717,6 +718,7 @@
   10.12  sysconfdir='${prefix}/etc'
   10.13  sharedstatedir='${prefix}/com'
   10.14  localstatedir='${prefix}/var'
   10.15 +runstatedir='${localstatedir}/run'
   10.16  includedir='${prefix}/include'
   10.17  oldincludedir='/usr/include'
   10.18  docdir='${datarootdir}/doc/${PACKAGE}'
   10.19 @@ -969,6 +971,15 @@
   10.20    | -silent | --silent | --silen | --sile | --sil)
   10.21      silent=yes ;;
   10.22  
   10.23 +  -runstatedir | --runstatedir | --runstatedi | --runstated \
   10.24 +  | --runstate | --runstat | --runsta | --runst | --runs \
   10.25 +  | --run | --ru | --r)
   10.26 +    ac_prev=runstatedir ;;
   10.27 +  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
   10.28 +  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
   10.29 +  | --run=* | --ru=* | --r=*)
   10.30 +    runstatedir=$ac_optarg ;;
   10.31 +
   10.32    -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
   10.33      ac_prev=sbindir ;;
   10.34    -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
   10.35 @@ -1106,7 +1117,7 @@
   10.36  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
   10.37  		datadir sysconfdir sharedstatedir localstatedir includedir \
   10.38  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
   10.39 -		libdir localedir mandir
   10.40 +		libdir localedir mandir runstatedir
   10.41  do
   10.42    eval ac_val=\$$ac_var
   10.43    # Remove trailing slashes.
   10.44 @@ -1259,6 +1270,7 @@
   10.45    --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   10.46    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   10.47    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
   10.48 +  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   10.49    --libdir=DIR            object code libraries [EPREFIX/lib]
   10.50    --includedir=DIR        C header files [PREFIX/include]
   10.51    --oldincludedir=DIR     C header files for non-gcc [/usr/include]
    11.1 --- a/test/testgl2.c	Fri Sep 29 07:44:30 2017 -0700
    11.2 +++ b/test/testgl2.c	Fri Sep 29 10:07:37 2017 -0700
    11.3 @@ -261,6 +261,8 @@
    11.4      state->gl_blue_size = 5;
    11.5      state->gl_depth_size = 16;
    11.6      state->gl_double_buffer = 1;
    11.7 +    state->gl_major_version = 3;
    11.8 +    state->gl_minor_version = 3;
    11.9      if (fsaa) {
   11.10          state->gl_multisamplebuffers = 1;
   11.11          state->gl_multisamplesamples = fsaa;