From eaedc21febeadad4cf0e370f5d97e7bdb4470870 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 5 Apr 2011 09:51:44 +0000 Subject: xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 --- mesalib/docs/download.html | 83 +++++++++++------------------------- mesalib/docs/install.html | 104 +++++++++++---------------------------------- 2 files changed, 49 insertions(+), 138 deletions(-) (limited to 'mesalib/docs') diff --git a/mesalib/docs/download.html b/mesalib/docs/download.html index 3cb9423dd..03fa60b4d 100644 --- a/mesalib/docs/download.html +++ b/mesalib/docs/download.html @@ -21,76 +21,52 @@ When a new release is coming, release candidates (betas) may be found

-Mesa is distributed in several parts: +The Mesa package is named MesaLib-x.y.z.{tar.bz2, tar.gz, zip} where x.y.z +is the version. There are three types of compressed archives.

- -

-If you're not interested in running the demos, you'll only need the first -package. +There's also the MesaGLUT-x.y.z.{tar.bz2, tar.gz, zip} packages which +contain Mark Kilgard's GLUT library. +This is optional. +Most Linux distributions include an implementation of GLUT (such as freeglut).

-

-If you're new to this and not sure what you're doing, grab all three packages. +In the past, the Mesa demos collection was distributed as +MesaDemos-x.y.z.{tar.bz2, tar.gz, zip}. +Now, the + +Mesa demos are distributed separately.

-

-The packages are available in .tar.gz, .tar.bz2 and .zip formats. -Other sites might offer additional package formats. -

Unpacking

-All the packages should be in the same directory prior to unpacking. +To unpack .tar.gz files:

- -

Contents

@@ -106,22 +82,13 @@ bin/ - shell scripts for making shared libraries, etc 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 src/glw - Xt/Motif/OpenGL widget code -If you downloaded and unpacked the MesaDemos.X.Y package: - -
-progs/demos	- original Mesa demos
-progs/xdemos	- GLX OpenGL/Mesa demos
-progs/redbook	- examples from the OpenGL Programming Guide
-progs/samples	- examples from SGI
-progs/images/	- image files
-
- -If you downloaded and unpacked the MesaGLUT.X.Y package: +If you downloaded and unpacked the MesaGLUT.x.y.z package: 
 src/glut	- GLUT library source code
diff --git a/mesalib/docs/install.html b/mesalib/docs/install.html index 3962ea5c9..bfa3bb8f8 100644 --- a/mesalib/docs/install.html +++ b/mesalib/docs/install.html @@ -12,16 +12,16 @@
  1. Unix / X11
  2. Windows -
  3. SCons +
  4. Building with SCons
  5. Other

@@ -31,8 +31,22 @@

1. Unix/X11 Compilation and Installation

- -

1.1 Prerequisites for DRI and hardware acceleration

+ +

1.1 General prerequisites for building

+ + + + + +

1.2 Prerequisites for DRI and hardware acceleration

The following are required for DRI-based hardware acceleration with Mesa: @@ -49,7 +63,7 @@ version 2.4.15 or later -

1.2 Building with Autoconf

+

1.3 Building with Autoconf

Mesa may be built using autoconf. @@ -59,7 +73,7 @@ If that fails the traditional Mesa build system is available. -

1.3 Building with traditional Makefiles

+

1.4 Building with traditional Makefiles

The traditional Mesa build system is based on a collection of pre-defined @@ -126,7 +140,7 @@ Later, if you want to rebuild for a different configuration run -

1.4 The libraries

+

1.5 The libraries

When compilation has finished, look in the top-level lib/ @@ -185,81 +199,11 @@ If you built the DRI hardware drivers, you'll also see the DRI drivers: -rwxr-xr-x 1 brian users 10997120 Jul 21 12:13 unichrome_dri.so - - -

1.5 Running the demos

- -

-If you downloaded/unpacked the MesaDemos-x.y.z.tar.gz archive or -obtained Mesa from CVS, the progs/ directory will contain a -bunch of demonstration programs. -

- -

-Before running a demo, you'll probably have to set two environment variables -to indicate where the libraries are located. For example: -

-

-cd lib/ -
-export LD_LIBRARY_PATH=${PWD} -
-export LIBGL_DRIVERS_PATH=${PWD} (if using DRI drivers) -
-

-Next, change to the Mesa/demos/ directory: +If you built with Gallium support, look in lib/gallium/ for Gallium-based +versions of libGL and device drivers.

-
-cd ../progs/demos -
-

-Run a demo such as gears: -

-
-./gears -
- -

-If this doesn't work, try the Mesa/progs/xdemos/glxinfo program -and see that it prints the expected Mesa version number. -

- -

-If you're using Linux or a similar OS, verify that the demo program is -being linked with the proper library files: -

-
-ldd gears -
- -

-You should see something like this: -

-
-        libglut.so.3 => /home/brian/Mesa/lib/libglut.so.3 (0x40013000)
-        libGLU.so.1 => /home/brian/Mesa/lib/libGLU.so.1 (0x40051000)
-        libGL.so.1 => /home/brian/Mesa/lib/libGL.so.1 (0x400e0000)
-        libc.so.6 => /lib/i686/libc.so.6 (0x42000000)
-        libm.so.6 => /lib/i686/libm.so.6 (0x403da000)
-        libX11.so.6 => /usr/X11R6/lib/libX11.so.6 (0x403fc000)
-        libXmu.so.6 => /usr/X11R6/lib/libXmu.so.6 (0x404da000)
-        libXt.so.6 => /usr/X11R6/lib/libXt.so.6 (0x404f1000)
-        libXi.so.6 => /usr/X11R6/lib/libXi.so.6 (0x40543000)
-        libstdc++.so.5 => /usr/lib/libstdc++.so.5 (0x4054b000)
-        libgcc_s.so.1 => /lib/libgcc_s.so.1 (0x405fd000)
-        libXext.so.6 => /usr/X11R6/lib/libXext.so.6 (0x40605000)
-        libpthread.so.0 => /lib/i686/libpthread.so.0 (0x40613000)
-        /lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0x40000000)
-        libdl.so.2 => /lib/libdl.so.2 (0x40644000)
-        libSM.so.6 => /usr/X11R6/lib/libSM.so.6 (0x40647000)
-        libICE.so.6 => /usr/X11R6/lib/libICE.so.6 (0x40650000)
-
- -

-Retrace your steps if this doesn't look right. -

 -- cgit v1.2.3