Browse Source

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.
Ryan C. Gordon 11 years ago
parent
commit
0d9443d3a2
3 changed files with 8 additions and 8 deletions
  1. 2 2
      CMakeLists.txt
  2. 4 4
      configure
  3. 2 2
      configure.in

+ 2 - 2
CMakeLists.txt

@@ -231,9 +231,9 @@ set_option(SNDIO               "Support the sndio audio API" ${UNIX_SYS})
 set_option(RPATH               "Use an rpath when linking SDL" ${UNIX_SYS})
 set_option(RPATH               "Use an rpath when linking SDL" ${UNIX_SYS})
 set_option(CLOCK_GETTIME       "Use clock_gettime() instead of gettimeofday()" OFF)
 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(INPUT_TSLIB         "Use the Touchscreen library for input" ${UNIX_SYS})
-set_option(VIDEO_MIR           "Use Mir video driver" ${UNIX_SYS})
 set_option(VIDEO_X11           "Use X11 video driver" ${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_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)
 dep_option(X11_SHARED          "Dynamically load X11 support" ON "VIDEO_X11" OFF)
 set(SDL_X11_OPTIONS Xcursor Xinerama XInput Xrandr Xscrnsaver XShape Xvm)
 set(SDL_X11_OPTIONS Xcursor Xinerama XInput Xrandr Xscrnsaver XShape Xvm)
 foreach(_SUB ${SDL_X11_OPTIONS})
 foreach(_SUB ${SDL_X11_OPTIONS})

+ 4 - 4
configure

@@ -18688,9 +18688,9 @@ CheckWayland()
 if test "${enable_video_wayland+set}" = set; then :
 if test "${enable_video_wayland+set}" = set; then :
   enableval=$enable_video_wayland;
   enableval=$enable_video_wayland;
 else
 else
-  enable_video_wayland=yes
+  enable_video_wayland=no
 fi
 fi
-
+ #yes)
 
 
     # Check whether --enable-video-wayland-qt-touch was given.
     # Check whether --enable-video-wayland-qt-touch was given.
 if test "${enable_video_wayland_qt_touch+set}" = set; then :
 if test "${enable_video_wayland_qt_touch+set}" = set; then :
@@ -18842,9 +18842,9 @@ CheckMir()
 if test "${enable_video_mir+set}" = set; then :
 if test "${enable_video_mir+set}" = set; then :
   enableval=$enable_video_mir;
   enableval=$enable_video_mir;
 else
 else
-  enable_video_mir=yes
+  enable_video_mir=no
 fi
 fi
-
+ #yes)
 
 
     if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
     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.
         # Extract the first word of "pkg-config", so it can be a program name with args.

+ 2 - 2
configure.in

@@ -1164,7 +1164,7 @@ CheckWayland()
 {
 {
     AC_ARG_ENABLE(video-wayland,
     AC_ARG_ENABLE(video-wayland,
 AC_HELP_STRING([--enable-video-wayland], [use Wayland video driver [[default=yes]]]),
 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_ARG_ENABLE(video-wayland-qt-touch,
 AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for Wayland video driver [[default=yes]]]),
 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_ARG_ENABLE(video-mir,
 AC_HELP_STRING([--enable-video-mir], [use Mir video driver [[default=yes]]]),
 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
     if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
         AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
         AC_PATH_PROG(PKG_CONFIG, pkg-config, no)