X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=docs%2Finstall.html;h=b6a75baeeb9341664213bf622c8d3609fb2e47ec;hb=64b12520a2848913fa78c12f48eaca39f42584c9;hp=9dbfce58b51fddb0acead6f07375df70527e6da8;hpb=17b2825d760fb6a7b643e5f9c067d249a582cfdb;p=mesa.git

diff --git a/docs/install.html b/docs/install.html
index 9dbfce58b51..b6a75baeeb9 100644
--- a/docs/install.html
+++ b/docs/install.html
@@ -22,9 +22,10 @@
   <li><a href="#prereq-general">General prerequisites</a>
   <li><a href="#prereq-dri">For DRI and hardware acceleration</a>
   </ul>
+<li><a href="#meson">Building with meson</a>
 <li><a href="#autoconf">Building with autoconf (Linux/Unix/X11)</a>
 <li><a href="#scons">Building with SCons (Windows/Linux)</a>
-<li><a href="#other">Building for other systems</a>
+<li><a href="#android">Building with AOSP (Android)</a>
 <li><a href="#libs">Library Information</a>
 <li><a href="#pkg-config">Building OpenGL programs with pkg-config</a>
 </ol>
@@ -33,64 +34,112 @@
 <h1 id="prereq-general">1. Prerequisites for building</h1>
 
 <h2>1.1 General</h2>
+
+<p>
+Build system.
+</p>
+
 <ul>
-<li><a href="http://www.python.org/">Python</a> - Python is required.
-Version 2.6.4 or later should work.
+<li><a href="https://mesonbuild.com">meson</a> is recommended when building on *nix platforms.
+<li>Autoconf is another option when building on *nix platforms.
+<li><a href="http://www.scons.org/">SCons</a> is required for building on
+Windows and optional for Linux (it's an alternative to autoconf/automake or meson.)
+</li>
+<li>Android Build system when building as native Android component. Autoconf
+is used when when building ARC.
 </li>
+</ul>
+
+
+<p>
+The following compilers are known to work, if you know of others or you're
+willing to maintain support for other compiler get in touch.
+</p>
+
+<ul>
+<li>GCC 4.2.0 or later (some parts of Mesa may require later versions)
+<li>clang - exact minimum requirement is currently unknown.
+<li>Microsoft Visual Studio 2015 or later is required, for building on Windows.
+</ul>
+
+
+<p>
+Third party/extra tools.
 <br>
-<li><a href="http://www.makotemplates.org/">Python Mako module</a> -
-Python Mako module is required. Version 0.7.3 or later should work.
+<strong>Note</strong>: These should not be required, when building from a release tarball. If
+you think you've spotted a bug let developers know by filing a
+<a href="bugs.html">bug report</a>.
+</p>
+
+
+<ul>
+<li><a href="https://www.python.org/">Python</a> - Python is required.
+When building with scons 2.7 is required.
+When building with meson 3.5 or newer is required.
+When building with autotools 2.7, or 3.5 or later are required.
 </li>
-</br>
-<li><a href="http://www.scons.org/">SCons</a> is required for building on
-Windows and optional for Linux (it's an alternative to autoconf/automake.)
+<li><a href="http://www.makotemplates.org/">Python Mako module</a> -
+Python Mako module is required. Version 0.8.0 or later should work.
 </li>
-<br>
-<li>lex / yacc - for building the GLSL compiler.
-<br>
-<br>
-On Linux systems, flex and bison are used.
-Versions 2.5.35 and 2.4.1, respectively, (or later) should work.
-<br>
-<br>
+<li>lex / yacc - for building the Mesa IR and GLSL compiler.
+<div>
+On Linux systems, flex and bison versions 2.5.35 and 2.4.1, respectively,
+(or later) should work.
 On Windows with MinGW, install flex and bison with:
 <pre>mingw-get install msys-flex msys-bison</pre>
-For MSVC on Windows, you can find flex/bison programs on the
-<a href="ftp://ftp.freedesktop.org/pub/mesa/windows-utils/">Mesa ftp site</a>.
-</li>
+For MSVC on Windows, install
+<a href="http://winflexbison.sourceforge.net/">Win flex-bison</a>.
+</div>
 </ul>
+<p><strong>Note</strong>: Some versions can be buggy (eg. flex 2.6.2) so do try others if things fail.</p>
 
 
-<h3 id="prereq-dri">1.2 For DRI and hardware acceleration</h3>
+<h3 id="prereq-dri">1.2 Requirements</h3>
 
 <p>
-The following are required for DRI-based hardware acceleration with Mesa:
+The requirements depends on the features selected at configure stage.
+Check/install the respective -devel package as prompted by the configure error
+message.
 </p>
 
-<ul>
-<li><a href="http://xorg.freedesktop.org/releases/individual/proto/">
-dri2proto</a> version 2.6 or later
-<li><a href="http://dri.freedesktop.org/libdrm/">libDRM</a>
-version 2.4.33 or later
-<li>Xorg server version 1.5 or later
-<li>Linux 2.6.28 or later
-</ul>
 <p>
-If you're using a fedora distro the following command should install all
-the needed dependencies:
+Here are some common ways to retrieve most/all of the dependencies based on
+the packaging tool used by your distro.
 </p>
+
 <pre>
-  sudo yum install flex bison imake libtool xorg-x11-proto-devel libdrm-devel \
-  gcc-c++ xorg-x11-server-devel libXi-devel libXmu-devel libXdamage-devel git \
-  expat-devel llvm-devel python-mako
+  zypper source-install --build-deps-only Mesa # openSUSE/SLED/SLES
+  yum-builddep mesa # yum Fedora, OpenSuse(?)
+  dnf builddep mesa # dnf Fedora
+  apt-get build-dep mesa # Debian and derivatives
+  ... # others
 </pre>
 
+<h1 id="meson">2. Building with meson</h1>
 
+<p>
+Meson is the latest build system in mesa, it is currently able to build for
+*nix systems like Linux and BSD, and will be able to build for windows as well.
+</p>
 
-<h1 id="autoconf">2. Building with autoconf (Linux/Unix/X11)</h1>
+<p>
+The general approach is:
+</p>
+<pre>
+  meson builddir/
+  ninja -C builddir/
+  sudo ninja -C builddir/ install
+</pre>
+<p>
+Please read the <a href="meson.html">detailed meson instructions</a>
+for more information
+</p>
+
+<h1 id="autoconf">3. Building with autoconf (Linux/Unix/X11)</h1>
 
 <p>
-The primary method to build Mesa on Unix systems is with autoconf.
+Although meson is recommended, another supported way to build on *nix systems
+is with autoconf.
 </p>
 
 <p>
@@ -108,7 +157,7 @@ for more details.
 
 
 
-<h1 id="scons">3. Building with SCons (Windows/Linux)</h1>
+<h1 id="scons">4. Building with SCons (Windows/Linux)</h1>
 
 <p>
 To build Mesa with SCons on Linux or Windows do
@@ -137,25 +186,33 @@ This will create:
 </ul>
 <p>
 Put them all in the same directory to test them.
+
+Additional information is available in <a href="README.WIN32">README.WIN32</a>.
+
 </p>
 
 
 
-<h1 id="other">4. Building for other systems</h1>
+<h1 id="android">5. Building with AOSP (Android)</h1>
 
 <p>
-Documentation for other environments (some may be very out of date):
+Currently one can build Mesa for Android as part of the AOSP project, yet
+your experience might vary.
 </p>
 
-<ul>
-<li><a href="README.VMS">README.VMS</a> - VMS
-<li><a href="README.CYGWIN">README.CYGWIN</a> - Cygwin
-<li><a href="README.WIN32">README.WIN32</a> - Win32
-</ul>
+<p>
+In order to achieve that one should update their local manifest to point to the
+upstream repo, set the appropriate BOARD_GPU_DRIVERS and build the
+libGLES_mesa library.
+</p>
 
+<p>
+FINISHME: Improve on the instructions add references to Rob H repos/Jenkins,
+Android-x86 and/or other resources.
+</p>
 
 
-<h1 id="libs">5. Library Information</h1>
+<h1 id="libs">6. Library Information</h1>
 
 <p>
 When compilation has finished, look in the top-level <code>lib/</code>
@@ -193,7 +250,7 @@ versions of libGL and device drivers.
 </p>
 
 
-<h1 id="pkg-config">6. Building OpenGL programs with pkg-config</h1>
+<h1 id="pkg-config">7. Building OpenGL programs with pkg-config</h1>
 
 <p>
 Running <code>make install</code> will install package configuration files