diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/autoconf.html | 10 | ||||
| -rw-r--r-- | docs/contents.html | 1 | ||||
| -rw-r--r-- | docs/download.html | 18 | ||||
| -rw-r--r-- | docs/faq.html | 4 | ||||
| -rw-r--r-- | docs/glu.html | 46 | ||||
| -rw-r--r-- | docs/install.html | 5 | ||||
| -rw-r--r-- | docs/license.html | 2 | ||||
| -rw-r--r-- | docs/relnotes-9.0.html | 4 | ||||
| -rw-r--r-- | docs/sourcetree.html | 5 |
9 files changed, 17 insertions, 78 deletions
diff --git a/docs/autoconf.html b/docs/autoconf.html index 4fa96c3c67..fa902872cc 100644 --- a/docs/autoconf.html +++ b/docs/autoconf.html @@ -17,10 +17,6 @@ <li><a href="#dri">DRI Driver Options</a></li> <li><a href="#osmesa">OSMesa Driver Options</a></li> </ul> -<li><p><a href="#library">Library Options</a> - <ul> - <li><a href="#glu">GLU</a></li> - </ul> <li><p><a href="#demos">Demo Program Options</a> </ol> @@ -219,12 +215,6 @@ libraries that will be built. More details on the specific GL libraries can be found in the <a href="install.html">basic installation instructions</a>. -<dl> -<dt id="glu">GLU <dd><p> The libGLU library will be built by default -on all drivers. This can be disable with the option -<code>--disable-glu</code>. -</dl> - <h2 id="demos">4. Demo Program Options</h2> diff --git a/docs/contents.html b/docs/contents.html index e7a23a6bca..efd7519193 100644 --- a/docs/contents.html +++ b/docs/contents.html @@ -74,7 +74,6 @@ <li><a href="http://sourceforge.net/projects/mesa3d" target="_parent">SourceForge homepage</a> <li><a href="repository.html" target="MainFrame">Source Code Repository</a> <li><a href="sourcetree.html" target="MainFrame">Source Code Tree</a> -<li><a href="glu.html" target="MainFrame">SGI's GLU</a> <li><a href="utilities.html" target="MainFrame">Utilities</a> <li><a href="helpwanted.html" target="MainFrame">Help Wanted</a> <li><a href="devinfo.html" target="MainFrame">Development Notes</a> diff --git a/docs/download.html b/docs/download.html index 3d543281f4..a1a1baa28f 100644 --- a/docs/download.html +++ b/docs/download.html @@ -69,7 +69,6 @@ docs/ - documentation src/ - source code for libraries src/mesa - sources for the main Mesa library and device drivers src/gallium - sources for Gallium and Gallium drivers -src/glu - libGLU source code src/glx - sources for building libGL with full GLX and DRI support </pre> @@ -80,7 +79,12 @@ instructions</a>. </p> -<h1>Demos and GLUT</h1> +<h1>Demos, GLUT, and GLU</h1> + +<p> +A package of SGI's GLU library is available +<a href="ftp://ftp.freedesktop.org/pub/mesa/glu/" target="_parent">here</a> +</p> <p> A package of Mark Kilgard's GLUT library is available @@ -93,9 +97,13 @@ The Mesa demos collection is available </p> <p> -In the past, GLUT and the Mesa demos were released in conjunction with -Mesa releases. But since GLUT and the demos change infrequently, they -were split off some time ago. +In the past, GLUT, GLU and the Mesa demos were released in conjunction with +Mesa releases. But since GLUT, GLU and the demos change infrequently, they +were split off into their own git repositories: + +<a href="http://cgit.freedesktop.org/mesa/glut/">GLUT</a>, +<a href="http://cgit.freedesktop.org/mesa/glu/">GLU</a> and +<a href="http://cgit.freedesktop.org/mesa/demos/">Demos</a>, </p> diff --git a/docs/faq.html b/docs/faq.html index fa90d5bfe8..80f4a71dc4 100644 --- a/docs/faq.html +++ b/docs/faq.html @@ -226,10 +226,6 @@ Basically you'll want the following: </li><li>/usr/lib/libGL.so.1 - a symlink to libGL.so.1.xyz </li><li>/usr/lib/libGL.so.xyz - the actual OpenGL/Mesa library. xyz denotes the Mesa version number. -</li><li>/usr/lib/libGLU.so - a symlink to libGLU.so.1 -</li><li>/usr/lib/libGLU.so.1 - a symlink to libGLU.so.1.3.xyz -</li><li>/usr/lib/libGLU.so.xyz - the OpenGL Utility library. xyz denotes the Mesa -version number. </li></ul> <p> After installing XFree86/X.org and the DRI drivers, some of these files diff --git a/docs/glu.html b/docs/glu.html deleted file mode 100644 index 3d7cbe50a5..0000000000 --- a/docs/glu.html +++ /dev/null @@ -1,46 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> -<html lang="en"> -<head> - <meta http-equiv="content-type" content="text/html; charset=utf-8"> - <title>SGI GLU</title> - <link rel="stylesheet" type="text/css" href="mesa.css"> -</head> -<body> - -<h1>SGI SI GLU</h1> - -(Silicon Graphics, Inc. Sample Implementation of the OpenGL Utility library) - -<p> -SGI open-sourced their OpenGL Sample Implementation (SI) in January, 2000. -This includes the GLU library. -</p> - -<p> -The SI GLU library implements GLU version 1.3 whereas the original -Mesa GLU library only implemented version 1.2. -We recommend using the SI GLU library instead of Mesa's GLU library -since it's more up-to-date, complete and reliable. -We're no longer developing the original Mesa GLU library. -</p> - -<p> -The SI GLU library code is included in the Mesa distribution. -You don't have to download it separately. -</p> - - -<p> -<b>Olivier Michel</b> has made Linux RPMs of GLU for i386 and PowerPC. -You can download them from the -<a href="http://www.sourceforge.net/project/showfiles.php?group_id=3" -target="_parent">download area</a> under <b>Miscellaneous</b>. -</p> - -<p> -Visit the <a href="http://oss.sgi.com/projects/ogl-sample/" target="_parent"> -OpenGL Sample Implementation home page</a> for more information about the SI. -</p> - -</body> -</html> diff --git a/docs/install.html b/docs/install.html index 948d147f19..c756c2fcd6 100644 --- a/docs/install.html +++ b/docs/install.html @@ -151,9 +151,6 @@ You'll see a set of library files similar to this: lrwxrwxrwx 1 brian users 10 Mar 26 07:53 libGL.so -> libGL.so.1* lrwxrwxrwx 1 brian users 19 Mar 26 07:53 libGL.so.1 -> libGL.so.1.5.060100* -rwxr-xr-x 1 brian users 3375861 Mar 26 07:53 libGL.so.1.5.060100* -lrwxrwxrwx 1 brian users 11 Mar 26 07:53 libGLU.so -> libGLU.so.1* -lrwxrwxrwx 1 brian users 20 Mar 26 07:53 libGLU.so.1 -> libGLU.so.1.3.060100* --rwxr-xr-x 1 brian users 549269 Mar 26 07:53 libGLU.so.1.3.060100* lrwxrwxrwx 1 brian users 14 Mar 26 07:53 libOSMesa.so -> libOSMesa.so.6* lrwxrwxrwx 1 brian users 23 Mar 26 07:53 libOSMesa.so.6 -> libOSMesa.so.6.1.060100* -rwxr-xr-x 1 brian users 23871 Mar 26 07:53 libOSMesa.so.6.1.060100* @@ -162,8 +159,6 @@ lrwxrwxrwx 1 brian users 23 Mar 26 07:53 libOSMesa.so.6 -> libOSM <p> <b>libGL</b> is the main OpenGL library (i.e. Mesa). <br> -<b>libGLU</b> is the OpenGL Utility library. -<br> <b>libOSMesa</b> is the OSMesa (Off-Screen) interface library. </p> diff --git a/docs/license.html b/docs/license.html index f0ac28ccfe..d69c673ced 100644 --- a/docs/license.html +++ b/docs/license.html @@ -95,8 +95,6 @@ Device drivers src/mesa/drivers/* MIT, generally Ext headers include/GL/glext.h Khronos include/GL/glxext.h - -SGI GLU library src/glu/sgi/ SGI Free B </pre> <p> diff --git a/docs/relnotes-9.0.html b/docs/relnotes-9.0.html index 1e3a11b644..ccc0dd587b 100644 --- a/docs/relnotes-9.0.html +++ b/docs/relnotes-9.0.html @@ -82,6 +82,10 @@ The two supported build methods are now autoconf/automake and SCons. <li>Removed Gallium3D - nvfx driver (use nv30 instead)</li> </ul> +<p> +libGLU has been moved into its own repository, found at <a href="http://cgit.freedesktop.org/mesa/glu/">http://cgit.freedesktop.org/mesa/glu/</a> +</p> + </body> </html> diff --git a/docs/sourcetree.html b/docs/sourcetree.html index 42675d9bb5..6a1f039836 100644 --- a/docs/sourcetree.html +++ b/docs/sourcetree.html @@ -146,11 +146,6 @@ each directory. </ul> </ul> <ul> - <li><b>glu</b> - The OpenGL Utility library - <ul> - <li><b>sgi</b> - GLU from SGI - <li><b>mesa</b> - Mesa version of GLU (deprecated) - </ul> <li><b>glx</b> - The GLX library code for building libGL. This is used for direct rendering drivers. It will dynamically load one of the xxx_dri.so drivers. |