From b2fcdfca71a3df617afff191290254f75469b279 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Tue, 11 Mar 2014 10:33:51 -0400 Subject: [PATCH] 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 | 4 ++-- configure | 8 ++++---- configure.in | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d3544a219439..75a89378b8371 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 e9d54a75a0ed0..1999cf9a24b08 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 0261a7a103a97..3d8a2de23f026 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)