From b86e8562b1ddca2a8bc29f22a79451a041bf5293 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 3 Sep 2012 09:54:39 +0200 Subject: mesa xkeyboard-config git update 3 sep 2012 --- mesalib/docs/autoconf.html | 10 --------- mesalib/docs/contents.html | 1 - mesalib/docs/download.html | 18 ++++++++++++----- mesalib/docs/faq.html | 4 ---- mesalib/docs/glu.html | 46 ------------------------------------------ mesalib/docs/install.html | 5 ----- mesalib/docs/license.html | 2 -- mesalib/docs/relnotes-9.0.html | 18 +++++++++++++++-- mesalib/docs/sourcetree.html | 5 ----- 9 files changed, 29 insertions(+), 80 deletions(-) delete mode 100644 mesalib/docs/glu.html (limited to 'mesalib/docs') diff --git a/mesalib/docs/autoconf.html b/mesalib/docs/autoconf.html index 4fa96c3c6..fa902872c 100644 --- a/mesalib/docs/autoconf.html +++ b/mesalib/docs/autoconf.html @@ -17,10 +17,6 @@
  • DRI Driver Options
  • OSMesa Driver Options
    • -

  • Library Options -

  • Demo Program Options @@ -219,12 +215,6 @@ libraries that will be built. More details on the specific GL libraries can be found in the basic installation instructions. -

    -
    GLU

    The libGLU library will be built by default -on all drivers. This can be disable with the option ---disable-glu. -

    -

    4. Demo Program Options

    diff --git a/mesalib/docs/contents.html b/mesalib/docs/contents.html index e7a23a6bc..efd751919 100644 --- a/mesalib/docs/contents.html +++ b/mesalib/docs/contents.html @@ -74,7 +74,6 @@
  • SourceForge homepage
  • Source Code Repository
  • Source Code Tree -
  • SGI's GLU
  • Utilities
  • Help Wanted
  • Development Notes diff --git a/mesalib/docs/download.html b/mesalib/docs/download.html index 3d543281f..a1a1baa28 100644 --- a/mesalib/docs/download.html +++ b/mesalib/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 @@ -80,7 +79,12 @@ instructions.

    -

    Demos and GLUT

    +

    Demos, GLUT, and GLU

    + +

    +A package of SGI's GLU library is available +here +

    A package of Mark Kilgard's GLUT library is available @@ -93,9 +97,13 @@ The Mesa demos collection is available

    -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: + +GLUT, +GLU and +Demos,

    diff --git a/mesalib/docs/faq.html b/mesalib/docs/faq.html index fa90d5bfe..80f4a71dc 100644 --- a/mesalib/docs/faq.html +++ b/mesalib/docs/faq.html @@ -226,10 +226,6 @@ Basically you'll want the following:
  • /usr/lib/libGL.so.1 - a symlink to libGL.so.1.xyz
  • /usr/lib/libGL.so.xyz - the actual OpenGL/Mesa library. xyz denotes the Mesa version number. -
  • /usr/lib/libGLU.so - a symlink to libGLU.so.1 -
  • /usr/lib/libGLU.so.1 - a symlink to libGLU.so.1.3.xyz -
  • /usr/lib/libGLU.so.xyz - the OpenGL Utility library. xyz denotes the Mesa -version number.

    • After installing XFree86/X.org and the DRI drivers, some of these files diff --git a/mesalib/docs/glu.html b/mesalib/docs/glu.html deleted file mode 100644 index 3d7cbe50a..000000000 --- a/mesalib/docs/glu.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - - SGI GLU - - - - -

    SGI SI GLU

    - -(Silicon Graphics, Inc. Sample Implementation of the OpenGL Utility library) - -

    -SGI open-sourced their OpenGL Sample Implementation (SI) in January, 2000. -This includes the GLU library. -

    - -

    -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. -

    - -

    -The SI GLU library code is included in the Mesa distribution. -You don't have to download it separately. -

    - - -

    -Olivier Michel has made Linux RPMs of GLU for i386 and PowerPC. -You can download them from the -download area under Miscellaneous. -

    - -

    -Visit the -OpenGL Sample Implementation home page for more information about the SI. -

    - - - diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html index 948d147f1..c756c2fcd 100644 --- a/mesalib/docs/install.html +++ b/mesalib/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

    libGL is the main OpenGL library (i.e. Mesa).
    -libGLU is the OpenGL Utility library. -
    libOSMesa is the OSMesa (Off-Screen) interface library.

    diff --git a/mesalib/docs/license.html b/mesalib/docs/license.html index f0ac28ccf..d69c673ce 100644 --- a/mesalib/docs/license.html +++ b/mesalib/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

    diff --git a/mesalib/docs/relnotes-9.0.html b/mesalib/docs/relnotes-9.0.html index 164c8e91d..ccc0dd587 100644 --- a/mesalib/docs/relnotes-9.0.html +++ b/mesalib/docs/relnotes-9.0.html @@ -37,10 +37,14 @@ Note: some of the new features are only available with certain drivers.