Disable Wayland/Mir again for 2.0.3; it's a quick, brown-paper-bag release.
authorRyan C. Gordon <icculus@icculus.org>
Tue, 11 Mar 2014 10:33:51 -0400
changeset 8606 29ffd0d3926b
parent 8605 57faccca4fab
child 8607 ef23c9d08eed
Disable Wayland/Mir again for 2.0.3; it's a quick, brown-paper-bag release. We'll enable it by default for 2.0.4. Hopefully. :) ( http://www.catb.org/jargon/html/B/brown-paper-bag-bug.html )
CMakeLists.txt
configure
configure.in
--- a/CMakeLists.txt	Tue Mar 11 07:17:56 2014 -0700
+++ b/CMakeLists.txt	Tue Mar 11 10:33:51 2014 -0400
@@ -235,8 +235,8 @@
 set_option(CLOCK_GETTIME       "Use clock_gettime() instead of gettimeofday()" OFF)
 set_option(INPUT_TSLIB         "Use the Touchscreen library for input" ${UNIX_SYS})
 set_option(VIDEO_X11           "Use X11 video driver" ${UNIX_SYS})
-set_option(VIDEO_WAYLAND       "Use Wayland video driver" ${UNIX_SYS})
-set_option(VIDEO_MIR           "Use Mir video driver" ${UNIX_SYS})
+set_option(VIDEO_WAYLAND       "Use Wayland video driver" OFF) #${UNIX_SYS})
+set_option(VIDEO_MIR           "Use Mir video driver" OFF) #${UNIX_SYS})
 dep_option(X11_SHARED          "Dynamically load X11 support" ON "VIDEO_X11" OFF)
 set(SDL_X11_OPTIONS Xcursor Xinerama XInput Xrandr Xscrnsaver XShape Xvm)
 foreach(_SUB ${SDL_X11_OPTIONS})
--- a/configure	Tue Mar 11 07:17:56 2014 -0700
+++ b/configure	Tue Mar 11 10:33:51 2014 -0400
@@ -18688,9 +18688,9 @@
 if test "${enable_video_wayland+set}" = set; then :
   enableval=$enable_video_wayland;
 else
-  enable_video_wayland=yes
-fi
-
+  enable_video_wayland=no
+fi
+ #yes)
 
     # Check whether --enable-video-wayland-qt-touch was given.
 if test "${enable_video_wayland_qt_touch+set}" = set; then :
@@ -18842,9 +18842,9 @@
 if test "${enable_video_mir+set}" = set; then :
   enableval=$enable_video_mir;
 else
-  enable_video_mir=yes
-fi
-
+  enable_video_mir=no
+fi
+ #yes)
 
     if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
         # Extract the first word of "pkg-config", so it can be a program name with args.
--- a/configure.in	Tue Mar 11 07:17:56 2014 -0700
+++ b/configure.in	Tue Mar 11 10:33:51 2014 -0400
@@ -1164,7 +1164,7 @@
 {
     AC_ARG_ENABLE(video-wayland,
 AC_HELP_STRING([--enable-video-wayland], [use Wayland video driver [[default=yes]]]),
-                  ,enable_video_wayland=yes)
+                  ,enable_video_wayland=no) #yes)
 
     AC_ARG_ENABLE(video-wayland-qt-touch,
 AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for Wayland video driver [[default=yes]]]),
@@ -1246,7 +1246,7 @@
 {
     AC_ARG_ENABLE(video-mir,
 AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]),
-                  ,enable_video_mir=yes)
+                  ,enable_video_mir=no) #yes)
 
     if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
         AC_PATH_PROG(PKG_CONFIG, pkg-config, no)