Temporarily default Wayland and Mir to disabled, for 2.0.2 release.
authorRyan C. Gordon <icculus@icculus.org>
Mon, 03 Feb 2014 11:59:17 -0500
changeset 81616c5d35c8b3dd
parent 8160 71639d445b59
child 8162 b6083d2078c0
Temporarily default Wayland and Mir to disabled, for 2.0.2 release.

We'll flip the default back to enabled right after 2.0.2 is finalized, and
try to declare them stable and ready by 2.0.3.

Those that have an interest in supporting them in 2.0.2 can manually enable
them in the configure script with --enable-video-wayland and/or
--enable-video-mir.
CMakeLists.txt
configure
configure.in
     1.1 --- a/CMakeLists.txt	Mon Feb 03 11:53:21 2014 -0500
     1.2 +++ b/CMakeLists.txt	Mon Feb 03 11:59:17 2014 -0500
     1.3 @@ -231,9 +231,9 @@
     1.4  set_option(RPATH               "Use an rpath when linking SDL" ${UNIX_SYS})
     1.5  set_option(CLOCK_GETTIME       "Use clock_gettime() instead of gettimeofday()" OFF)
     1.6  set_option(INPUT_TSLIB         "Use the Touchscreen library for input" ${UNIX_SYS})
     1.7 -set_option(VIDEO_MIR           "Use Mir video driver" ${UNIX_SYS})
     1.8  set_option(VIDEO_X11           "Use X11 video driver" ${UNIX_SYS})
     1.9 -set_option(VIDEO_WAYLAND       "Use Wayland video driver" ${UNIX_SYS})
    1.10 +set_option(VIDEO_WAYLAND       "Use Wayland video driver" OFF) #${UNIX_SYS})
    1.11 +set_option(VIDEO_MIR           "Use Mir video driver" OFF) #${UNIX_SYS})
    1.12  dep_option(X11_SHARED          "Dynamically load X11 support" ON "VIDEO_X11" OFF)
    1.13  set(SDL_X11_OPTIONS Xcursor Xinerama XInput Xrandr Xscrnsaver XShape Xvm)
    1.14  foreach(_SUB ${SDL_X11_OPTIONS})
     2.1 --- a/configure	Mon Feb 03 11:53:21 2014 -0500
     2.2 +++ b/configure	Mon Feb 03 11:59:17 2014 -0500
     2.3 @@ -18688,9 +18688,9 @@
     2.4  if test "${enable_video_wayland+set}" = set; then :
     2.5    enableval=$enable_video_wayland;
     2.6  else
     2.7 -  enable_video_wayland=yes
     2.8 -fi
     2.9 -
    2.10 +  enable_video_wayland=no
    2.11 +fi
    2.12 + #yes)
    2.13  
    2.14      # Check whether --enable-video-wayland-qt-touch was given.
    2.15  if test "${enable_video_wayland_qt_touch+set}" = set; then :
    2.16 @@ -18842,9 +18842,9 @@
    2.17  if test "${enable_video_mir+set}" = set; then :
    2.18    enableval=$enable_video_mir;
    2.19  else
    2.20 -  enable_video_mir=yes
    2.21 -fi
    2.22 -
    2.23 +  enable_video_mir=no
    2.24 +fi
    2.25 + #yes)
    2.26  
    2.27      if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
    2.28          # Extract the first word of "pkg-config", so it can be a program name with args.
     3.1 --- a/configure.in	Mon Feb 03 11:53:21 2014 -0500
     3.2 +++ b/configure.in	Mon Feb 03 11:59:17 2014 -0500
     3.3 @@ -1164,7 +1164,7 @@
     3.4  {
     3.5      AC_ARG_ENABLE(video-wayland,
     3.6  AC_HELP_STRING([--enable-video-wayland], [use Wayland video driver [[default=yes]]]),
     3.7 -                  ,enable_video_wayland=yes)
     3.8 +                  ,enable_video_wayland=no) #yes)
     3.9  
    3.10      AC_ARG_ENABLE(video-wayland-qt-touch,
    3.11  AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for Wayland video driver [[default=yes]]]),
    3.12 @@ -1246,7 +1246,7 @@
    3.13  {
    3.14      AC_ARG_ENABLE(video-mir,
    3.15  AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]),
    3.16 -                  ,enable_video_mir=yes)
    3.17 +                  ,enable_video_mir=no) #yes)
    3.18  
    3.19      if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
    3.20          AC_PATH_PROG(PKG_CONFIG, pkg-config, no)