From eb425b409922751fab69720e213809ff67c5bd8f Mon Sep 17 00:00:00 2001 From: Krejzi Date: Tue, 17 Jul 2012 20:17:38 +0000 Subject: [PATCH] MesaLib 8.0.4 git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10421 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 2 +- introduction/welcome/changelog.xml | 3 + x/installing/mesalib.xml | 207 +++++++++++++++++++---------- 3 files changed, 144 insertions(+), 68 deletions(-) diff --git a/general.ent b/general.ent index 79acd0037b..1514e7841d 100644 --- a/general.ent +++ b/general.ent @@ -634,7 +634,7 @@ $Date$ - + diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index a50df32fae..eddccd235d 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -52,6 +52,9 @@ [krejzi] - Split some of the Xorg Drivers into separate packages and merge Additional Drivers on the same page. + + [krejzi] - MesaLib 8.0.4. + diff --git a/x/installing/mesalib.xml b/x/installing/mesalib.xml index 412cc4f014..9678245e3f 100644 --- a/x/installing/mesalib.xml +++ b/x/installing/mesalib.xml @@ -6,10 +6,10 @@ - + - - + + ]> @@ -29,8 +29,10 @@ Introduction to MesaLib - Mesa is an OpenGL compatible 3D graphics - library. + + Mesa is an OpenGL compatible 3D graphics + library. + &lfs71_checked; @@ -71,12 +73,15 @@ Additional Downloads - Required patch: + + Required patch: + + + + Recommended patch: + + (Needed if testing the Xorg installation per BLFS instructions) - Recommended patch: - (Needed if testing the Xorg installation per BLFS instructions) @@ -89,19 +94,20 @@ , and - + - Optional - - and + Recommended + - The libxml2 - Python module must have been built - during the installation of libxml2 - or else MesaLib build will fail. + + The libxml2 + Python module must have been built + during the installation of libxml2 + or else MesaLib build will fail. + User Notes: @@ -112,45 +118,58 @@ Installation of MesaLib - Unlike other packages, the - MesaLib-&mesalib-version;.tar.bz2 - archive will extract to the - Mesa-&mesalib-version; - directory. + + + Unlike other packages, the + MesaLib-&mesalib-version;.tar.bz2 + archive will extract to the + Mesa-&mesalib-version; + directory. + + - Install MesaLib by running the following - commands: + + Install MesaLib by running the following + commands: + sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure && patch -Np1 -i ../MesaLib-&mesalib-version;-add_xdemos-2.patch && patch -Np1 -i ../MesaLib-&mesalib-version;-llvm-3.1-fixes-1.patch && ./configure --prefix=$XORG_PREFIX \ - --enable-shared-dricore \ + --enable-texture-float \ + --enable-gles1 \ + --enable-gles2 \ --enable-xa \ - --with-gallium-drivers="nouveau,svga,swrast" && + --enable-shared-glapi \ + --enable-shared-dricore \ + --enable-glx-tls \ + --with-gallium-drivers="nouveau,r300,r600,svga,swrast" && make - This package does not come with a test suite. + + This package does not come with a test suite. + - Now, as the root user: + + Now, as the root user: + make install && mkdir -pv ${XORG_PREFIX}/share/doc/MesaLib-&mesalib-version; && -cp -rv docs/* ${XORG_PREFIX}/share/doc/MesaLib-&mesalib-version; +cp -rfv docs/* ${XORG_PREFIX}/share/doc/MesaLib-&mesalib-version; - Finally, if installing to any prefix other than - /usr, you should create symlinks - to the GL headers in /usr/include. - Execute the following command as the - root user: + + Finally, if installing to any prefix other than + /usr, you should create symlinks + to the GL headers in /usr/include. + Execute the following command as the + root user: + -ln -s -v ${XORG_PREFIX}/include/GL /usr/include && -ln -s -v ${XORG_PREFIX}/include/EGL /usr/include && -ln -s -v ${XORG_PREFIX}/include/KHR /usr/include && - -for HEADER in xa_{composite,context,tracker}.h +for GLHEADER in EGL GL GLES GLES2 KHR xa_composite.h xa_context.h xa_tracker.h do - ln -s -v ${XORG_PREFIX}/include/$HEADER /usr/include + ln -sfv ${XORG_PREFIX}/include/${GLHEADER} /usr/include/${GLHEADER} done @@ -158,21 +177,56 @@ done Command Explanations - sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure: by - default, Mesa builds with debugging symbols. Remove the -g switch from - both CFLAGS and CXXFLAGS with this - command. + + sed 's@FLAGS=\"-g@FLAGS=\"@' -i configure: by default, + Mesa builds with debugging symbols. Remove the -g switch from both + CFLAGS and CXXFLAGS with this command. + - --enable-shared-dricore: link DRI modules with - shared core DRI routines. + + : This switch enables + floating-point textures and renderbuffers. Please consult + docs/patents.txt to see if there are + any legal issues if you use this feature. + - --enable-xa: enables building of the XA X - Acceleration API (Required for VMware 3D Driver). + + : This switch enables support for + OpenGL ES 1.x API. + - --with-gallium-drivers="...": controls building - of gallium drivers. Available drivers are: i915, nouveau, r300, r600, - swrast and svga. Note that r300 and r600 require - to be installed. + + : This switch enables support for + OpenGL ES 2.x API. + + + + : This switch enables building of the + XA X Acceleration API (Required for VMware 3D Driver). + + + + : This switch enables building + of the shared glapi library. + + + + : This switch enables linking + of the DRI modules with shared core DRI routines. + + + + : This switch enables TLS support + in GLX. + + + + --with-gallium-drivers="...": This parameter + controls which Gallium drivers should be built. Available drivers are: + i915, nouveau, r300, r600, swrast and svga. Note that you will need to + remove r300 and r600 from the list if you haven't installed + . + @@ -185,11 +239,18 @@ done Installed Directories - glxgears and glxinfo - libEGL.so, libGL.so, libGLU.so, libxatracker.so, and *_dri.so - $XORG_PREFIX/include/{EGL,GL,KHR}, - $XORG_PREFIX/lib/dri, and - $XORG_PREFIX/share/doc/MesaLib-&mesalib-version; + + glxgears and glxinfo + + + libEGL.so, libglapi.so, libGLESv1_CM.so, libGLESv2.so, + libGL.so, libGLU.so and libxatracker.so + + + $XORG_PREFIX/include/{EGL,GL,GLES,GLES2,KHR}, + $XORG_PREFIX/lib/dri, and + $XORG_PREFIX/share/doc/MesaLib-&mesalib-version; + @@ -201,8 +262,10 @@ done glxgears - is a GL demo useful for troubleshooting graphics - problems. + + is a GL demo useful for troubleshooting graphics + problems. + glxgears @@ -212,8 +275,10 @@ done glxinfo - is a diagnostic program that displays information about the - graphics hardware and installed GL libraries. + + is a diagnostic program that displays information about the + graphics hardware and installed GL libraries. + glxinfo @@ -223,8 +288,10 @@ done libEGL.so - provides a native platform graphics interface as defined by - the EGL-1.4 specification. + + provides a native platform graphics interface as defined by + the EGL-1.4 specification. + libEGL.so @@ -234,7 +301,9 @@ done libGL.so - is the main OpenGL library. + + is the main OpenGL library. + libGL.so @@ -244,7 +313,9 @@ done libGLU.so - is the OpenGL Utility library. + + is the OpenGL Utility library. + libGLU.so @@ -254,7 +325,9 @@ done libxatracker.so - is the XA X Acceleration API library. + + is the library that provides XA X Acceleration API. + libxatracker.so