mistake: Revert the files that I did not mean to commit
authorBrandon Schaefer <brandon.schaefer@canonical.com>
Wed, 01 Mar 2017 15:05:54 -0800
changeset 10924abfe0c4d98ac
parent 10923 ab8850aa5e19
child 10925 4de9d54bbc87
mistake: Revert the files that I did not mean to commit
configure
include/SDL_config.h
include/SDL_revision.h
src/video/SDL_video.c
test/configure
     1.1 --- a/configure	Wed Mar 01 14:50:59 2017 -0800
     1.2 +++ b/configure	Wed Mar 01 15:05:54 2017 -0800
     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 @@ -917,7 +916,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 @@ -1170,15 +1168,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 @@ -1316,7 +1305,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 @@ -1469,7 +1458,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 @@ -19221,7 +19209,7 @@
    1.53  main ()
    1.54  {
    1.55  
    1.56 -                    MirWindowAttrib attrib = mir_window_attrib_state
    1.57 +                    MirTouchAction actions = mir_touch_actions
    1.58  
    1.59    ;
    1.60    return 0;
     2.1 --- a/include/SDL_config.h	Wed Mar 01 14:50:59 2017 -0800
     2.2 +++ b/include/SDL_config.h	Wed Mar 01 15:05:54 2017 -0800
     2.3 @@ -1,4 +1,3 @@
     2.4 -/* include/SDL_config.h.  Generated from SDL_config.h.in by configure.  */
     2.5  /*
     2.6    Simple DirectMedia Layer
     2.7    Copyright (C) 1997-2017 Sam Lantinga <slouken@libsdl.org>
     2.8 @@ -23,349 +22,32 @@
     2.9  #ifndef SDL_config_h_
    2.10  #define SDL_config_h_
    2.11  
    2.12 +#include "SDL_platform.h"
    2.13 +
    2.14  /**
    2.15 - *  \file SDL_config.h.in
    2.16 - *
    2.17 - *  This is a set of defines to configure the SDL features
    2.18 + *  \file SDL_config.h
    2.19   */
    2.20  
    2.21 -/* General platform specific identifiers */
    2.22 -#include "SDL_platform.h"
    2.23 +/* Add any platform that doesn't build using the configure system. */
    2.24 +#if defined(__WIN32__)
    2.25 +#include "SDL_config_windows.h"
    2.26 +#elif defined(__WINRT__)
    2.27 +#include "SDL_config_winrt.h"
    2.28 +#elif defined(__MACOSX__)
    2.29 +#include "SDL_config_macosx.h"
    2.30 +#elif defined(__IPHONEOS__)
    2.31 +#include "SDL_config_iphoneos.h"
    2.32 +#elif defined(__ANDROID__)
    2.33 +#include "SDL_config_android.h"
    2.34 +#elif defined(__PSP__)
    2.35 +#include "SDL_config_psp.h"
    2.36 +#else
    2.37 +/* This is a minimal configuration just to get SDL running on new platforms */
    2.38 +#include "SDL_config_minimal.h"
    2.39 +#endif /* platform config */
    2.40  
    2.41 -/* Make sure that this isn't included by Visual C++ */
    2.42 -#ifdef _MSC_VER
    2.43 -#error You should run hg revert SDL_config.h 
    2.44 +#ifdef USING_GENERATED_CONFIG_H
    2.45 +#error Wrong SDL_config.h, check your include path?
    2.46  #endif
    2.47  
    2.48 -/* C language features */
    2.49 -/* #undef const */
    2.50 -/* #undef inline */
    2.51 -/* #undef volatile */
    2.52 -
    2.53 -/* C datatypes */
    2.54 -#ifdef __LP64__
    2.55 -#define SIZEOF_VOIDP 8
    2.56 -#else
    2.57 -#define SIZEOF_VOIDP 4
    2.58 -#endif
    2.59 -#define HAVE_GCC_ATOMICS 1
    2.60 -/* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
    2.61 -
    2.62 -/* #undef HAVE_DDRAW_H */
    2.63 -/* #undef HAVE_DINPUT_H */
    2.64 -/* #undef HAVE_DSOUND_H */
    2.65 -/* #undef HAVE_DXGI_H */
    2.66 -/* #undef HAVE_XINPUT_H */
    2.67 -
    2.68 -/* Comment this if you want to build without any C library requirements */
    2.69 -#define HAVE_LIBC 1
    2.70 -#if HAVE_LIBC
    2.71 -
    2.72 -/* Useful headers */
    2.73 -#define HAVE_ALLOCA_H 1
    2.74 -#define HAVE_SYS_TYPES_H 1
    2.75 -#define HAVE_STDIO_H 1
    2.76 -#define STDC_HEADERS 1
    2.77 -#define HAVE_STDLIB_H 1
    2.78 -#define HAVE_STDARG_H 1
    2.79 -#define HAVE_MALLOC_H 1
    2.80 -#define HAVE_MEMORY_H 1
    2.81 -#define HAVE_STRING_H 1
    2.82 -#define HAVE_STRINGS_H 1
    2.83 -#define HAVE_INTTYPES_H 1
    2.84 -#define HAVE_STDINT_H 1
    2.85 -#define HAVE_CTYPE_H 1
    2.86 -#define HAVE_MATH_H 1
    2.87 -#define HAVE_ICONV_H 1
    2.88 -#define HAVE_SIGNAL_H 1
    2.89 -/* #undef HAVE_ALTIVEC_H */
    2.90 -/* #undef HAVE_PTHREAD_NP_H */
    2.91 -#define HAVE_LIBUDEV_H 1
    2.92 -#define HAVE_DBUS_DBUS_H 1
    2.93 -#define HAVE_IBUS_IBUS_H 1
    2.94 -/* #undef HAVE_FCITX_FRONTEND_H */
    2.95 -#define HAVE_LIBSAMPLERATE_H 1
    2.96 -
    2.97 -/* C library functions */
    2.98 -#define HAVE_MALLOC 1
    2.99 -#define HAVE_CALLOC 1
   2.100 -#define HAVE_REALLOC 1
   2.101 -#define HAVE_FREE 1
   2.102 -#define HAVE_ALLOCA 1
   2.103 -#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
   2.104 -#define HAVE_GETENV 1
   2.105 -#define HAVE_SETENV 1
   2.106 -#define HAVE_PUTENV 1
   2.107 -#define HAVE_UNSETENV 1
   2.108 -#endif
   2.109 -#define HAVE_QSORT 1
   2.110 -#define HAVE_ABS 1
   2.111 -#define HAVE_BCOPY 1
   2.112 -#define HAVE_MEMSET 1
   2.113 -#define HAVE_MEMCPY 1
   2.114 -#define HAVE_MEMMOVE 1
   2.115 -#define HAVE_MEMCMP 1
   2.116 -#define HAVE_STRLEN 1
   2.117 -/* #undef HAVE_STRLCPY */
   2.118 -/* #undef HAVE_STRLCAT */
   2.119 -#define HAVE_STRDUP 1
   2.120 -/* #undef HAVE__STRREV */
   2.121 -/* #undef HAVE__STRUPR */
   2.122 -/* #undef HAVE__STRLWR */
   2.123 -/* #undef HAVE_INDEX */
   2.124 -/* #undef HAVE_RINDEX */
   2.125 -#define HAVE_STRCHR 1
   2.126 -#define HAVE_STRRCHR 1
   2.127 -#define HAVE_STRSTR 1
   2.128 -/* #undef HAVE_ITOA */
   2.129 -/* #undef HAVE__LTOA */
   2.130 -/* #undef HAVE__UITOA */
   2.131 -/* #undef HAVE__ULTOA */
   2.132 -#define HAVE_STRTOL 1
   2.133 -#define HAVE_STRTOUL 1
   2.134 -/* #undef HAVE__I64TOA */
   2.135 -/* #undef HAVE__UI64TOA */
   2.136 -#define HAVE_STRTOLL 1
   2.137 -#define HAVE_STRTOULL 1
   2.138 -#define HAVE_STRTOD 1
   2.139 -#define HAVE_ATOI 1
   2.140 -#define HAVE_ATOF 1
   2.141 -#define HAVE_STRCMP 1
   2.142 -#define HAVE_STRNCMP 1
   2.143 -/* #undef HAVE__STRICMP */
   2.144 -#define HAVE_STRCASECMP 1
   2.145 -/* #undef HAVE__STRNICMP */
   2.146 -#define HAVE_STRNCASECMP 1
   2.147 -/* #undef HAVE_SSCANF */
   2.148 -#define HAVE_VSSCANF 1
   2.149 -/* #undef HAVE_SNPRINTF */
   2.150 -#define HAVE_VSNPRINTF 1
   2.151 -#define HAVE_M_PI /**/
   2.152 -#define HAVE_ATAN 1
   2.153 -#define HAVE_ATAN2 1
   2.154 -#define HAVE_ACOS 1
   2.155 -#define HAVE_ASIN 1
   2.156 -#define HAVE_CEIL 1
   2.157 -#define HAVE_COPYSIGN 1
   2.158 -#define HAVE_COS 1
   2.159 -#define HAVE_COSF 1
   2.160 -#define HAVE_FABS 1
   2.161 -#define HAVE_FLOOR 1
   2.162 -#define HAVE_LOG 1
   2.163 -#define HAVE_POW 1
   2.164 -#define HAVE_SCALBN 1
   2.165 -#define HAVE_SIN 1
   2.166 -#define HAVE_SINF 1
   2.167 -#define HAVE_SQRT 1
   2.168 -#define HAVE_SQRTF 1
   2.169 -#define HAVE_TAN 1
   2.170 -#define HAVE_TANF 1
   2.171 -#define HAVE_FSEEKO 1
   2.172 -#define HAVE_FSEEKO64 1
   2.173 -#define HAVE_SIGACTION 1
   2.174 -#define HAVE_SA_SIGACTION 1
   2.175 -#define HAVE_SETJMP 1
   2.176 -#define HAVE_NANOSLEEP 1
   2.177 -#define HAVE_SYSCONF 1
   2.178 -/* #undef HAVE_SYSCTLBYNAME */
   2.179 -#define HAVE_CLOCK_GETTIME 1
   2.180 -/* #undef HAVE_GETPAGESIZE */
   2.181 -#define HAVE_MPROTECT 1
   2.182 -#define HAVE_ICONV 1
   2.183 -#define HAVE_PTHREAD_SETNAME_NP 1
   2.184 -/* #undef HAVE_PTHREAD_SET_NAME_NP */
   2.185 -#define HAVE_SEM_TIMEDWAIT 1
   2.186 -#define HAVE_GETAUXVAL 1
   2.187 -
   2.188 -#else
   2.189 -#define HAVE_STDARG_H 1
   2.190 -#define HAVE_STDDEF_H 1
   2.191 -#define HAVE_STDINT_H 1
   2.192 -#endif /* HAVE_LIBC */
   2.193 -
   2.194 -/* SDL internal assertion support */
   2.195 -/* #undef SDL_DEFAULT_ASSERT_LEVEL */
   2.196 -
   2.197 -/* Allow disabling of core subsystems */
   2.198 -/* #undef SDL_ATOMIC_DISABLED */
   2.199 -/* #undef SDL_AUDIO_DISABLED */
   2.200 -/* #undef SDL_CPUINFO_DISABLED */
   2.201 -/* #undef SDL_EVENTS_DISABLED */
   2.202 -/* #undef SDL_FILE_DISABLED */
   2.203 -/* #undef SDL_JOYSTICK_DISABLED */
   2.204 -/* #undef SDL_HAPTIC_DISABLED */
   2.205 -/* #undef SDL_LOADSO_DISABLED */
   2.206 -/* #undef SDL_RENDER_DISABLED */
   2.207 -/* #undef SDL_THREADS_DISABLED */
   2.208 -/* #undef SDL_TIMERS_DISABLED */
   2.209 -/* #undef SDL_VIDEO_DISABLED */
   2.210 -/* #undef SDL_POWER_DISABLED */
   2.211 -/* #undef SDL_FILESYSTEM_DISABLED */
   2.212 -
   2.213 -/* Enable various audio drivers */
   2.214 -#define SDL_AUDIO_DRIVER_ALSA 1
   2.215 -#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
   2.216 -/* #undef SDL_AUDIO_DRIVER_ARTS */
   2.217 -/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
   2.218 -#define SDL_AUDIO_DRIVER_PULSEAUDIO 1
   2.219 -#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC "libpulse-simple.so.0"
   2.220 -/* #undef SDL_AUDIO_DRIVER_HAIKU */
   2.221 -/* #undef SDL_AUDIO_DRIVER_BSD */
   2.222 -/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
   2.223 -#define SDL_AUDIO_DRIVER_DISK 1
   2.224 -#define SDL_AUDIO_DRIVER_DUMMY 1
   2.225 -/* #undef SDL_AUDIO_DRIVER_ANDROID */
   2.226 -/* #undef SDL_AUDIO_DRIVER_XAUDIO2 */
   2.227 -/* #undef SDL_AUDIO_DRIVER_DSOUND */
   2.228 -/* #undef SDL_AUDIO_DRIVER_ESD */
   2.229 -/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
   2.230 -/* #undef SDL_AUDIO_DRIVER_NACL */
   2.231 -/* #undef SDL_AUDIO_DRIVER_NAS */
   2.232 -/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
   2.233 -/* #undef SDL_AUDIO_DRIVER_SNDIO */
   2.234 -/* #undef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC */
   2.235 -#define SDL_AUDIO_DRIVER_OSS 1
   2.236 -/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
   2.237 -/* #undef SDL_AUDIO_DRIVER_PAUDIO */
   2.238 -/* #undef SDL_AUDIO_DRIVER_QSA */
   2.239 -/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
   2.240 -/* #undef SDL_AUDIO_DRIVER_WINMM */
   2.241 -/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
   2.242 -/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
   2.243 -/* #undef SDL_AUDIO_DRIVER_EMSCRIPTEN */
   2.244 -
   2.245 -/* Enable various input drivers */
   2.246 -#define SDL_INPUT_LINUXEV 1
   2.247 -#define SDL_INPUT_LINUXKD 1
   2.248 -/* #undef SDL_INPUT_TSLIB */
   2.249 -/* #undef SDL_JOYSTICK_HAIKU */
   2.250 -/* #undef SDL_JOYSTICK_DINPUT */
   2.251 -/* #undef SDL_JOYSTICK_XINPUT */
   2.252 -/* #undef SDL_JOYSTICK_DUMMY */
   2.253 -/* #undef SDL_JOYSTICK_IOKIT */
   2.254 -#define SDL_JOYSTICK_LINUX 1
   2.255 -/* #undef SDL_JOYSTICK_ANDROID */
   2.256 -/* #undef SDL_JOYSTICK_WINMM */
   2.257 -/* #undef SDL_JOYSTICK_USBHID */
   2.258 -/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
   2.259 -/* #undef SDL_JOYSTICK_EMSCRIPTEN */
   2.260 -/* #undef SDL_HAPTIC_DUMMY */
   2.261 -#define SDL_HAPTIC_LINUX 1
   2.262 -/* #undef SDL_HAPTIC_IOKIT */
   2.263 -/* #undef SDL_HAPTIC_DINPUT */
   2.264 -/* #undef SDL_HAPTIC_XINPUT */
   2.265 -
   2.266 -/* Enable various shared object loading systems */
   2.267 -#define SDL_LOADSO_DLOPEN 1
   2.268 -/* #undef SDL_LOADSO_DUMMY */
   2.269 -/* #undef SDL_LOADSO_LDG */
   2.270 -/* #undef SDL_LOADSO_WINDOWS */
   2.271 -
   2.272 -/* Enable various threading systems */
   2.273 -#define SDL_THREAD_PTHREAD 1
   2.274 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
   2.275 -/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
   2.276 -/* #undef SDL_THREAD_WINDOWS */
   2.277 -
   2.278 -/* Enable various timer systems */
   2.279 -/* #undef SDL_TIMER_HAIKU */
   2.280 -/* #undef SDL_TIMER_DUMMY */
   2.281 -#define SDL_TIMER_UNIX 1
   2.282 -/* #undef SDL_TIMER_WINDOWS */
   2.283 -
   2.284 -/* Enable various video drivers */
   2.285 -/* #undef SDL_VIDEO_DRIVER_HAIKU */
   2.286 -/* #undef SDL_VIDEO_DRIVER_COCOA */
   2.287 -/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
   2.288 -/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
   2.289 -#define SDL_VIDEO_DRIVER_DUMMY 1
   2.290 -/* #undef SDL_VIDEO_DRIVER_WINDOWS */
   2.291 -#define SDL_VIDEO_DRIVER_WAYLAND 1
   2.292 -#define SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH 1
   2.293 -#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC "libwayland-client.so.0"
   2.294 -#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL "libwayland-egl.so.1"
   2.295 -#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR "libwayland-cursor.so.0"
   2.296 -#define SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON "libxkbcommon.so.0"
   2.297 -#define SDL_VIDEO_DRIVER_MIR 1
   2.298 -#define SDL_VIDEO_DRIVER_MIR_DYNAMIC "libmirclient.so.9"
   2.299 -#define SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON "libxkbcommon.so.0"
   2.300 -#define SDL_VIDEO_DRIVER_X11 1
   2.301 -/* #undef SDL_VIDEO_DRIVER_RPI */
   2.302 -/* #undef SDL_VIDEO_DRIVER_ANDROID */
   2.303 -/* #undef SDL_VIDEO_DRIVER_EMSCRIPTEN */
   2.304 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
   2.305 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
   2.306 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR "libXcursor.so.1"
   2.307 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "libXinerama.so.1"
   2.308 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "libXi.so.6"
   2.309 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libXrandr.so.2"
   2.310 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "libXss.so.1"
   2.311 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "libXxf86vm.so.1"
   2.312 -#define SDL_VIDEO_DRIVER_X11_XCURSOR 1
   2.313 -#define SDL_VIDEO_DRIVER_X11_XDBE 1
   2.314 -#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
   2.315 -#define SDL_VIDEO_DRIVER_X11_XINPUT2 1
   2.316 -#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1
   2.317 -#define SDL_VIDEO_DRIVER_X11_XRANDR 1
   2.318 -#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
   2.319 -#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
   2.320 -#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1
   2.321 -#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
   2.322 -#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1
   2.323 -#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
   2.324 -/* #undef SDL_VIDEO_DRIVER_NACL */
   2.325 -/* #undef SDL_VIDEO_DRIVER_VIVANTE */
   2.326 -/* #undef SDL_VIDEO_DRIVER_VIVANTE_VDK */
   2.327 -
   2.328 -/* #undef SDL_VIDEO_RENDER_D3D */
   2.329 -/* #undef SDL_VIDEO_RENDER_D3D11 */
   2.330 -#define SDL_VIDEO_RENDER_OGL 1
   2.331 -#define SDL_VIDEO_RENDER_OGL_ES 1
   2.332 -#define SDL_VIDEO_RENDER_OGL_ES2 1
   2.333 -/* #undef SDL_VIDEO_RENDER_DIRECTFB */
   2.334 -
   2.335 -/* Enable OpenGL support */
   2.336 -#define SDL_VIDEO_OPENGL 1
   2.337 -#define SDL_VIDEO_OPENGL_ES 1
   2.338 -#define SDL_VIDEO_OPENGL_ES2 1
   2.339 -/* #undef SDL_VIDEO_OPENGL_BGL */
   2.340 -/* #undef SDL_VIDEO_OPENGL_CGL */
   2.341 -#define SDL_VIDEO_OPENGL_EGL 1
   2.342 -#define SDL_VIDEO_OPENGL_GLX 1
   2.343 -/* #undef SDL_VIDEO_OPENGL_WGL */
   2.344 -/* #undef SDL_VIDEO_OPENGL_OSMESA */
   2.345 -/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
   2.346 -
   2.347 -/* Enable system power support */
   2.348 -#define SDL_POWER_LINUX 1
   2.349 -/* #undef SDL_POWER_WINDOWS */
   2.350 -/* #undef SDL_POWER_MACOSX */
   2.351 -/* #undef SDL_POWER_HAIKU */
   2.352 -/* #undef SDL_POWER_ANDROID */
   2.353 -/* #undef SDL_POWER_EMSCRIPTEN */
   2.354 -/* #undef SDL_POWER_HARDWIRED */
   2.355 -
   2.356 -/* Enable system filesystem support */
   2.357 -/* #undef SDL_FILESYSTEM_HAIKU */
   2.358 -/* #undef SDL_FILESYSTEM_COCOA */
   2.359 -/* #undef SDL_FILESYSTEM_DUMMY */
   2.360 -#define SDL_FILESYSTEM_UNIX 1
   2.361 -/* #undef SDL_FILESYSTEM_WINDOWS */
   2.362 -/* #undef SDL_FILESYSTEM_NACL */
   2.363 -/* #undef SDL_FILESYSTEM_ANDROID */
   2.364 -/* #undef SDL_FILESYSTEM_EMSCRIPTEN */
   2.365 -
   2.366 -/* Enable assembly routines */
   2.367 -#define SDL_ASSEMBLY_ROUTINES 1
   2.368 -/* #undef SDL_ALTIVEC_BLITTERS */
   2.369 -
   2.370 -/* Enable ime support */
   2.371 -#define SDL_USE_IME 1
   2.372 -
   2.373 -/* Enable dynamic udev support */
   2.374 -#define SDL_UDEV_DYNAMIC "libudev.so.1"
   2.375 -
   2.376 -/* Enable dynamic libsamplerate support */
   2.377 -#define SDL_LIBSAMPLERATE_DYNAMIC "libsamplerate.so.0"
   2.378 -
   2.379  #endif /* SDL_config_h_ */
     3.1 --- a/include/SDL_revision.h	Wed Mar 01 14:50:59 2017 -0800
     3.2 +++ b/include/SDL_revision.h	Wed Mar 01 15:05:54 2017 -0800
     3.3 @@ -1,2 +1,2 @@
     3.4 -#define SDL_REVISION "hg-10922:5f4b80b748dd"
     3.5 -#define SDL_REVISION_NUMBER 10922
     3.6 +#define SDL_REVISION "hg-0:aaaaaaaaaaah"
     3.7 +#define SDL_REVISION_NUMBER 0
     4.1 --- a/src/video/SDL_video.c	Wed Mar 01 14:50:59 2017 -0800
     4.2 +++ b/src/video/SDL_video.c	Wed Mar 01 15:05:54 2017 -0800
     4.3 @@ -210,7 +210,6 @@
     4.4  #if SDL_VIDEO_OPENGL
     4.5      /* Ugh, find a way to cache this value! */
     4.6      {
     4.7 -        /*
     4.8          SDL_Window *window;
     4.9          SDL_GLContext context;
    4.10          SDL_bool hasAcceleratedOpenGL = SDL_FALSE;
    4.11 @@ -226,6 +225,7 @@
    4.12                  if (glGetStringFunc) {
    4.13                      vendor = (const char *) glGetStringFunc(GL_VENDOR);
    4.14                  }
    4.15 +                /* Add more vendors here at will... */
    4.16                  if (vendor &&
    4.17                      (SDL_strstr(vendor, "ATI Technologies") ||
    4.18                       SDL_strstr(vendor, "NVIDIA"))) {
    4.19 @@ -235,8 +235,7 @@
    4.20              }
    4.21              SDL_DestroyWindow(window);
    4.22          }
    4.23 -        */
    4.24 -        return 1;//hasAcceleratedOpenGL;
    4.25 +        return hasAcceleratedOpenGL;
    4.26      }
    4.27  #elif SDL_VIDEO_OPENGL_ES || SDL_VIDEO_OPENGL_ES2
    4.28      /* Let's be optimistic about this! */
     5.1 --- a/test/configure	Wed Mar 01 14:50:59 2017 -0800
     5.2 +++ b/test/configure	Wed Mar 01 15:05:54 2017 -0800
     5.3 @@ -637,7 +637,6 @@
     5.4  docdir
     5.5  oldincludedir
     5.6  includedir
     5.7 -runstatedir
     5.8  localstatedir
     5.9  sharedstatedir
    5.10  sysconfdir
    5.11 @@ -718,7 +717,6 @@
    5.12  sysconfdir='${prefix}/etc'
    5.13  sharedstatedir='${prefix}/com'
    5.14  localstatedir='${prefix}/var'
    5.15 -runstatedir='${localstatedir}/run'
    5.16  includedir='${prefix}/include'
    5.17  oldincludedir='/usr/include'
    5.18  docdir='${datarootdir}/doc/${PACKAGE}'
    5.19 @@ -971,15 +969,6 @@
    5.20    | -silent | --silent | --silen | --sile | --sil)
    5.21      silent=yes ;;
    5.22  
    5.23 -  -runstatedir | --runstatedir | --runstatedi | --runstated \
    5.24 -  | --runstate | --runstat | --runsta | --runst | --runs \
    5.25 -  | --run | --ru | --r)
    5.26 -    ac_prev=runstatedir ;;
    5.27 -  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
    5.28 -  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
    5.29 -  | --run=* | --ru=* | --r=*)
    5.30 -    runstatedir=$ac_optarg ;;
    5.31 -
    5.32    -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
    5.33      ac_prev=sbindir ;;
    5.34    -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
    5.35 @@ -1117,7 +1106,7 @@
    5.36  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
    5.37  		datadir sysconfdir sharedstatedir localstatedir includedir \
    5.38  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
    5.39 -		libdir localedir mandir runstatedir
    5.40 +		libdir localedir mandir
    5.41  do
    5.42    eval ac_val=\$$ac_var
    5.43    # Remove trailing slashes.
    5.44 @@ -1270,7 +1259,6 @@
    5.45    --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
    5.46    --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
    5.47    --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
    5.48 -  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
    5.49    --libdir=DIR            object code libraries [EPREFIX/lib]
    5.50    --includedir=DIR        C header files [PREFIX/include]
    5.51    --oldincludedir=DIR     C header files for non-gcc [/usr/include]