From: Manuel Bachmann <manuel.bachmann@iot.bzh>
Date: Mon, 14 Dec 2015 16:22:51 +0000 (+0000)
Subject: Mention Wayland build requirements in documentation
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=freeglut;a=commitdiff_plain;h=bbab633540758fcd520c94370db9f5fb6bb01bc3

Mention Wayland build requirements in documentation

Following https://github.com/dcnieho/FreeGLUT/issues/38 ;
mention Wayland support in README, Wayland build
instructions and requirements in README.cmake.

Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh>

(cherry picked from commit 18773bcc818714436e3aeb6229b2f84125d6edc4)

(cherry picked from commit 18773bcc818714436e3aeb6229b2f84125d6edc4)

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1780 7f0cb862-5218-0410-a997-914c9d46530a
---

diff --git a/AUTHORS b/AUTHORS
index ec86e1e..6af14c8 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,6 +32,9 @@ John Tsiombikas <nuclear@member.fsf.org>
 Sylvain Beucler
     support for Android, X11/EGL, OpenGL(ES) 2.x, misc fixes
 
+Manuel Bachmann
+    support for Wayland
+
 Diederick C. Niehorster
 Chris Marshall
 Clive McCarthy
diff --git a/README b/README
index fb94976..2ad197d 100644
--- a/README
+++ b/README
@@ -12,7 +12,7 @@ PORTS
 =====
 
 Currently supported platforms:
- - UNIX systems with X11 (such as GNU/Linux, FreeBSD, etc)
+ - UNIX systems with X11 and Wayland (such as GNU/Linux, FreeBSD, etc)
  - MS Windows
  - MacOS X with XQuartz (no native Cocoa support yet)
  - Android (NDK)
diff --git a/README.cmake b/README.cmake
index ffd387e..4b3962d 100644
--- a/README.cmake
+++ b/README.cmake
@@ -40,10 +40,14 @@ How to build freeglut on UNIX
 - Make sure you have the basics for compiling code, such as C compiler
   (e.g., GCC) and the make package.
 - Also make sure you have packages installed that provide the relevant
-  header files for x11 (including xrandr) and opengl (e.g.,
-  libgl1-mesa-dev, libx11-dev and libxrandr-dev on Debian/Ubuntu).
-- Install XInput: libxi-dev / libXi-devel
-- Run 'cmake .' in the freeglut directory to generate the makefile.
+  header files for opengl (e.g., libgl1-mesa-dev on Debian/Ubuntu) and
+  the chosen backend :
+  - X11: x11 (e.g., libx11-dev, libxrandr-devel on Debian/Ubuntu) and
+  XInput (libxi-dev / libXi-devel)
+  - Wayland: wayland (e.g., libwayland-dev and libegl1-mesa-dev on
+  Debian/Ubuntu) and xkbcommon (libxkbcommon-dev /libxkbcommon-devel)
+- Run 'cmake .' (or 'cmake . -DFREEGLUT_WAYLAND=ON' for Wayland) in the
+  freeglut directory to generate the makefile.
 - Run 'make' to build, and 'make install' to install freeglut.
 - If you wish to change any build options run 'ccmake .'
 
@@ -59,6 +63,8 @@ FREEGLUT_BUILD_SHARED_LIBS  [ON, OFF] Build freeglut as a shared library
 FREEGLUT_BUILD_STATIC_LIBS  [ON, OFF] Build freeglut as a static library
 FREEGLUT_GLES               [ON, OFF] Link with GLEs libraries instead
                             of OpenGL
+FREEGLUT_WAYLAND            [ON, OFF] Link with Wayland libraries instead
+                            of X11
 FREEGLUT_PRINT_ERRORS       [ON, OFF] Controls whether errors are
                             default handled or not when user does not
                             provide an error callback