Re-enable Mir/Wayland support now that 2.0.3 has been released.
authorBrandon Schaefer <brandon.schaefer@canonical.com>
Tue, 25 Mar 2014 14:33:34 -0700
changeset 8680 eb1281b43b5d
parent 8679 dd52820b7f5c
child 8681 b03d6a506750
Re-enable Mir/Wayland support now that 2.0.3 has been released.
CMakeLists.txt
configure
configure.in
--- a/CMakeLists.txt	Mon Mar 24 22:51:03 2014 -0400
+++ b/CMakeLists.txt	Tue Mar 25 14:33:34 2014 -0700
@@ -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" OFF) #${UNIX_SYS})
-set_option(VIDEO_MIR           "Use Mir video driver" OFF) #${UNIX_SYS})
+set_option(VIDEO_WAYLAND       "Use Wayland video driver" ${UNIX_SYS})
+set_option(VIDEO_MIR           "Use Mir video driver" ${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	Mon Mar 24 22:51:03 2014 -0400
+++ b/configure	Tue Mar 25 14:33:34 2014 -0700
@@ -18688,9 +18688,9 @@
 if test "${enable_video_wayland+set}" = set; then :
   enableval=$enable_video_wayland;
 else
-  enable_video_wayland=no
-fi
- #yes)
+  enable_video_wayland=yes
+fi
+
 
     # 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=no
-fi
- #yes)
+  enable_video_mir=yes
+fi
+
 
     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	Mon Mar 24 22:51:03 2014 -0400
+++ b/configure.in	Tue Mar 25 14:33:34 2014 -0700
@@ -1164,7 +1164,7 @@
 {
     AC_ARG_ENABLE(video-wayland,
 AC_HELP_STRING([--enable-video-wayland], [use Wayland video driver [[default=yes]]]),
-                  ,enable_video_wayland=no) #yes)
+                  ,enable_video_wayland=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=no) #yes)
+                  ,enable_video_mir=yes)
 
     if test x$enable_video = xyes -a x$enable_video_mir = xyes; then
         AC_PATH_PROG(PKG_CONFIG, pkg-config, no)