[Lunar-commits] <moonbase> mesa-lib: updated to 7.11.2
Zbigniew Luszpinski
zbiggy at lunar-linux.org
Wed Feb 1 00:38:34 CET 2012
commit 48372db6923fc9267ffd3b62ee47b65c9fadb6d2
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date: Wed Feb 1 00:38:34 2012 +0100
mesa-lib: updated to 7.11.2
---
xorg7/mesa-lib/BUILD | 43 ++++++++++++++++---------------------------
xorg7/mesa-lib/CONFIGURE | 36 ++++++++++++++++++++++++++++++++++--
xorg7/mesa-lib/DETAILS | 8 ++++----
3 files changed, 54 insertions(+), 33 deletions(-)
diff --git a/xorg7/mesa-lib/BUILD b/xorg7/mesa-lib/BUILD
index 7b58751..9e9f9e9 100644
--- a/xorg7/mesa-lib/BUILD
+++ b/xorg7/mesa-lib/BUILD
@@ -2,52 +2,41 @@
# Detect VMware VGA virtual 3D card and add driver for it
VGA=`lspci | grep 'VGA.*VMware.*SVGA.*'`
+ if [[ -n $VGA ]]; then
+ bad_flags linker
+ SUPPORTED_GALLIUM+="svga"
+ fi &&
if [[ -n $MESADRIVER ]] ; then
- # Gallium build breaks with LDFLAGS set so turn it off for now
- bad_flags linker
# Build selected drivers only, rather than the default of all of them
# Ensure that swrast is included, as a fall-back
OPTS+=" --with-dri-drivers=swrast,"
OPTS+=$(echo $MESADRIVER | sed s/\ /,/g)
- if [[ $GALLIUM == y ]]; then
- OPTS+=" --enable-gallium-swrast "
- if [[ $MESADRIVER == *i915* ]]; then
- OPTS+=" --enable-gallium-i915 "
- fi
- if [[ $MESADRIVER == *i965* ]]; then
- OPTS+=" --enable-gallium-i965 "
- fi
- # Nouveau breaks build in mesa 7.10.2
- if [[ $MESADRIVER == *nouveau* ]]; then
- OPTS+=" --enable-gallium-nouveau "
- fi
- if [[ $MESADRIVER == *radeon* ]]; then
- OPTS+=" --enable-gallium-radeon "
- fi
- if [[ $MESADRIVER == *r600* ]]; then
- OPTS+=" --enable-gallium-r600 "
- fi
- if [[ $VGA == *VMware* ]]; then
- OPTS+=" --enable-gallium-svga "
- fi
+ fi &&
+
+ if [[ $GALLIUM == y ]]; then
+ OPTS+=" --enable-gallium-llvm --enable-gallium-egl --enable-openvg "
+ if [[ -n $SUPPORTED_GALLIUM ]]; then
+ OPTS+="--with-gallium-drivers=$(echo $SUPPORTED_GALLIUM | sed s/\ /,/g)"
fi
+ else OPTS+=" --disable-gallium-llvm "
fi &&
+ if [[ $MESADRIVER == *r[36]00* ]]; then lin -c llvm
+ else sedit 's/^GALLIUM_DRIVERS_DEFAULT=.*/GALLIUM_DRIVERS_DEFAULT="swrast"/' configure
+ fi &&
# Don't overlap with freeglut
OPTS+=" --disable-glut" &&
# Needed with mesa-lib 7.8.2
rm -f include/GL/glut{,f90}.h &&
- ./configure --prefix=/usr --with-x --enable-xcb --enable-gles1 --enable-gles2 --enable-gles-overlay --enable-openvg $OPTS &&
+ ./configure --prefix=/usr $OPTS --with-x --enable-xcb --enable-xorg &&
+
prepare_install &&
make all &&
- # glew headers are installed from the glew module instead
- rm -f include/GL/{glew,glxew,wglew}.h &&
-
make install
) > $C_FIFO 2>&1
diff --git a/xorg7/mesa-lib/CONFIGURE b/xorg7/mesa-lib/CONFIGURE
index 271cf23..0954c3c 100644
--- a/xorg7/mesa-lib/CONFIGURE
+++ b/xorg7/mesa-lib/CONFIGURE
@@ -1,6 +1,7 @@
# swrast is always included, in BUILD
# nouveau is removed from the list because it fails to build in mesa 7.10.2
-SUPPORTED_DRIVERS="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis tdfx unichrome"
+SUPPORTED_DRIVERS="i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon savage sis tdfx unichrome"
+SUPPORTED_GALLIUM="cell i915 i965 nouveau nv50 nvc0 nvfx r300 r600 svga"
make_drivers_checklist() {
@@ -12,6 +13,16 @@ make_drivers_checklist() {
done
}
+make_gallium_drivers_checklist() {
+
+ # For each locale, extract name, title and charmap information
+ for driver in $SUPPORTED_GALLIUM; do
+ title=$driver
+
+ echo "\"$driver\" \"$title\" \"off\" "
+ done
+}
+
select_drivers() {
BACKTITLE="MesaLib Configuration"
TITLE="Driver Selection"
@@ -25,19 +36,39 @@ select_drivers() {
0 0 0
}
+select_gallium_drivers() {
+ BACKTITLE="Gallium Configuration"
+ TITLE="Gallium Driver Selection"
+ HELP=""
+ make_gallium_drivers_checklist | xargs \
+ dialog --backtitle "$BACKTITLE" \
+ --title "$TITLE" \
+ --stdout \
+ --separate-output \
+ --checklist "$HELP" \
+ 0 0 0
+}
+
if ! grep -q CONFIGURED $MODULE_CONFIG; then
if grep -q "MESADRIVER=" $MODULE_CONFIG; then
message "Selecting drivers is optional"
fi
+ if grep -q "GALLIUMDRIVER=" $MODULE_CONFIG; then
+ message "Selecting Gallium drivers is optional"
+ fi
+
if query "Would you like to select specific drivers? (if not selected, all drivers will be installed)" n; then
unpack_localedata
MESADRIVER=`select_drivers`
+ GALLIUMDRIVER=`select_gallium_drivers`
TEMP=`grep -v "MESADRIVER=" $MODULE_CONFIG`
echo "$TEMP" > $MODULE_CONFIG
echo "MESADRIVER=\"$MESADRIVER\"" >> $MODULE_CONFIG
-
+ TEMP=`grep -v "GALLIUMDRIVER=" $MODULE_CONFIG`
+ echo "$TEMP" >> $MODULE_CONFIG
+ echo "GALLIUMDRIVER=\"$GALLIUMDRIVER\"" >> $MODULE_CONFIG
fi
echo "OPTS=\"\$OPTS $OPTS\"" >> $MODULE_CONFIG
@@ -46,4 +77,5 @@ fi
# Default is y, so xorg-server can be compiled with it disabled or enabled
mquery GALLIUM "Enable Gallium renderer? (can break functionality on some chipsets)" y "" ""
+mquery TEXTURE_FLOAT "Enable patented texture-float? (if this patent is valid in your country choose N)" y "--enable-texture-float" "--disable-texture-float"
mquery ENABLE_GLX_TLS "Enable glx-tls? (${PROBLEM_COLOR}lin xorg-server also${DEFAULT_COLOR})" y "--enable-glx-tls" "--disable-glx-tls"
diff --git a/xorg7/mesa-lib/DETAILS b/xorg7/mesa-lib/DETAILS
index c34f014..616e069 100644
--- a/xorg7/mesa-lib/DETAILS
+++ b/xorg7/mesa-lib/DETAILS
@@ -1,15 +1,15 @@
MODULE=mesa-lib
- VERSION=7.10.3
+ VERSION=7.11.2
SOURCE=MesaLib-$VERSION.tar.bz2
SOURCE2=MesaGLUT-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/Mesa-$VERSION
SOURCE_URL=ftp://ftp.freedesktop.org/pub/mesa/$VERSION
SOURCE2_URL=$SOURCE_URL
- SOURCE_VFY=sha1:e1fe8bad90bb24cc4b25a42932c277a0e0d7a2ac
- SOURCE2_VFY=sha1:d06d9216547d8398af2127ed46972e76b0def89f
+ SOURCE_VFY=sha1:5981ac2de8438e5f4a1f3561f2044d700c5f0de9
+ SOURCE2_VFY=sha1:2e6e730204800a0748b301a5f58b86332699788b
WEB_SITE=http://www.mesa3d.org
ENTERED=20060215
- UPDATED=20111109
+ UPDATED=20120122
SHORT="Mesa 3D library"
PSAFE=no
More information about the Lunar-commits
mailing list