Commit b2fcdfca71a3df617afff191290254f75469b279
2014-03-11T10:33:51
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 )
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d3544a..75a8937 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -235,8 +235,8 @@ set_option(RPATH "Use an rpath when linking SDL" ${UNIX_SYS})
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})
diff --git a/configure b/configure
index e9d54a7..1999cf9 100755
--- a/configure
+++ b/configure
@@ -18688,9 +18688,9 @@ CheckWayland()
if test "${enable_video_wayland+set}" = set; then :
enableval=$enable_video_wayland;
else
- enable_video_wayland=yes
+ 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 @@ CheckMir()
if test "${enable_video_mir+set}" = set; then :
enableval=$enable_video_mir;
else
- enable_video_mir=yes
+ 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.
diff --git a/configure.in b/configure.in
index 0261a7a..3d8a2de 100644
--- a/configure.in
+++ b/configure.in
@@ -1164,7 +1164,7 @@ CheckWayland()
{
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 @@ CheckMir()
{
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)