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