Mesa add multiversion support, add meta file support, remove package 'mesa-master', remove package 'mesa-master-GL'

Signed-off-by: Stephan Raue <stephan@openelec.tv>
2025-07-29 05:36:47 +00:00 · 2010-11-12 18:29:35 +01:00 · 2010-11-12 18:29:35 +01:00 · c83e54fcf9
commit c83e54fcf9
parent 9399971f14
33 changed files with 68 additions and 241 deletions
--- a/packages/addons/games/megaglest-source/meta
+++ b/packages/addons/games/megaglest-source/meta
@ -5,8 +5,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.glest.org"
 PKG_URL="http://downloads.sourceforge.net/project/megaglest/current_release/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 $MESA"
-PKG_BUILD_DEPENDS="toolchain lua curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 $MESA"
+PKG_DEPENDS="curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 Mesa"
+PKG_BUILD_DEPENDS="toolchain lua curl xerces-c $LIBJPEG libpng libvorbis libogg SDL openal-soft libX11 Mesa"
 PKG_PRIORITY="optional"
 PKG_SECTION="games"
 PKG_SHORTDESC="(Game) MegaGlest: a free 3D real-time strategy game"
--- a/packages/addons/games/sauerbraten/meta
+++ b/packages/addons/games/sauerbraten/meta
@ -5,8 +5,8 @@ PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://sauerbraten.org/"
 PKG_URL="http://downloads.sourceforge.net/project/sauerbraten/sauerbraten/2010_07_19/${PKG_NAME}_${PKG_VERSION}_justice_edition_linux.tar.bz2"
-PKG_DEPENDS="zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer $MESA"
-PKG_BUILD_DEPENDS="toolchain zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer $MESA"
+PKG_DEPENDS="zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer Mesa"
+PKG_BUILD_DEPENDS="toolchain zlib libpng $LIBJPEG libX11 SDL SDL_image SDL_mixer Mesa"
 PKG_PRIORITY="optional"
 PKG_SECTION="games"
 PKG_SHORTDESC="(Game) Cube 2: Sauerbraten"
--- a/packages/debug/mesa-demos/build
+++ b/packages/debug/mesa-demos/build
@ -4,7 +4,7 @@

 $SCRIPTS/build toolchain
 $SCRIPTS/build libX11
-$SCRIPTS/build $MESA
+$SCRIPTS/build Mesa
 $SCRIPTS/build glew

 cd $PKG_BUILD
--- a/packages/debug/mesa-demos/install
+++ b/packages/debug/mesa-demos/install
@ -3,7 +3,7 @@
 . config/options $1

 $SCRIPTS/install libX11
-$SCRIPTS/install $MESA
+$SCRIPTS/install Mesa
 $SCRIPTS/install glew

 mkdir -p $INSTALL/usr/bin
--- a/packages/graphics/Mesa-GL/build
+++ b/packages/graphics/Mesa-GL/build
@ -2,21 +2,9 @@

 . config/options $1

-$SCRIPTS/unpack $MESA
-$SCRIPTS/build libxml2-host
-$SCRIPTS/build talloc
-$SCRIPTS/build expat
-$SCRIPTS/build glproto
-$SCRIPTS/build dri2proto
-$SCRIPTS/build libdrm
-$SCRIPTS/build libXext
-$SCRIPTS/build libXdamage
-$SCRIPTS/build libXfixes
-$SCRIPTS/build libXxf86vm
-$SCRIPTS/build libxcb
-$SCRIPTS/build libX11
+$SCRIPTS/unpack Mesa

-cd $BUILD/$MESA*
+cd $BUILD/Mesa*
 ./configure --host=$TARGET_NAME \
            --build=$HOST_NAME \
            --prefix=/usr \
--- a/packages/graphics/Mesa-GL/meta
+++ b/packages/graphics/Mesa-GL/meta
@ -0,0 +1,14 @@
+PKG_NAME="Mesa-GL"
+PKG_VERSION=""
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.mesa3d.org/"
+PKG_URL=""
+PKG_DEPENDS=""
+PKG_BUILD_DEPENDS="toolchain libxml2-host talloc expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="Mesa-GL: 3-D graphics library with OpenGL API (GL part)"
+PKG_LONGDESC="Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax or state machine, it is being used with authorization from Silicon Graphics, Inc. However, the author makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with Silicon Graphics, Inc. Those who want a licensed implementation of OpenGL should contact a licensed vendor. While Mesa is not a licensed OpenGL implementation, it is currently being tested with the OpenGL conformance tests. For the current conformance status see the CONFORM file included in the Mesa distribution."
+PKG_IS_ADDON="no"
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@ -2,20 +2,6 @@

 . config/options $1

-$SCRIPTS/build libxml2-host
-$SCRIPTS/build talloc
-$SCRIPTS/build expat
-$SCRIPTS/build glproto
-$SCRIPTS/build dri2proto
-$SCRIPTS/build libdrm
-$SCRIPTS/build libXext
-$SCRIPTS/build libXdamage
-$SCRIPTS/build libXfixes
-$SCRIPTS/build libXxf86vm
-$SCRIPTS/build libxcb
-$SCRIPTS/build libX11
-$SCRIPTS/build xorg-server
-
 get_graphicdrivers

 # dont use strip because of use from mklib
--- a/packages/graphics/Mesa/install
+++ b/packages/graphics/Mesa/install
@ -2,16 +2,6 @@

 . config/options $1

-$SCRIPTS/install libXdamage
-$SCRIPTS/install libdrm
-$SCRIPTS/install talloc
-$SCRIPTS/install expat
-$SCRIPTS/install libXext
-$SCRIPTS/install libXfixes
-$SCRIPTS/install libXxf86vm
-$SCRIPTS/install libxcb
-$SCRIPTS/install libX11
-
 mkdir -p $INSTALL/usr/lib
  cp -P $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers
    ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
--- a/packages/graphics/Mesa/meta
+++ b/packages/graphics/Mesa/meta
@ -0,0 +1,19 @@
+PKG_NAME="Mesa"
+PKG_VERSION="7.9.1-20101109"
+PKG_REV="1"
+PKG_ARCH="any"
+PKG_LICENSE="OSS"
+PKG_SITE="http://www.mesa3d.org/"
+PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_DEPENDS="libXdamage libdrm talloc expat libXext libXfixes libXxf86vm libxcb libX11"
+PKG_BUILD_DEPENDS="toolchain libxml2-host talloc expat glproto dri2proto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 xorg-server"
+PKG_PRIORITY="optional"
+PKG_SECTION="graphics"
+PKG_SHORTDESC="mesa: 3-D graphics library with OpenGL API"
+PKG_LONGDESC="Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL*. To the extent that Mesa utilizes the OpenGL command syntax or state machine, it is being used with authorization from Silicon Graphics, Inc. However, the author makes no claim that Mesa is in any way a compatible replacement for OpenGL or associated with Silicon Graphics, Inc. Those who want a licensed implementation of OpenGL should contact a licensed vendor. While Mesa is not a licensed OpenGL implementation, it is currently being tested with the OpenGL conformance tests. For the current conformance status see the CONFORM file included in the Mesa distribution."
+PKG_IS_ADDON="no"
+
+if [ $MESA_MASTER = "yes" ]; then
+  PKG_VERSION="20101111"
+  PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
+fi
--- a/packages/graphics/Mesa/url
+++ b/packages/graphics/Mesa/url
@ -1 +0,0 @@
-http://sources.openelec.tv/svn/Mesa-7.9.1-20101109.tar.bz2
--- a/packages/graphics/cairo/build
+++ b/packages/graphics/cairo/build
@ -10,7 +10,7 @@ $SCRIPTS/build libpng
 $SCRIPTS/build pixman
 $SCRIPTS/build libXrender
 $SCRIPTS/build libX11
-# $SCRIPTS/build $MESA
+# $SCRIPTS/build Mesa
 # $SCRIPTS/build libdrm
 # $SCRIPTS/build libxcb

--- a/packages/graphics/cairo/install
+++ b/packages/graphics/cairo/install
@ -9,6 +9,7 @@ $SCRIPTS/install libpng
 $SCRIPTS/install pixman
 $SCRIPTS/install libXrender
 $SCRIPTS/install libX11
+$SCRIPTS/install Mesa
 #$SCRIPTS/install libxcb

 mkdir -p $INSTALL/usr/lib
--- a/packages/graphics/glew/build
+++ b/packages/graphics/glew/build
@ -7,7 +7,7 @@ $SCRIPTS/build libX11
 $SCRIPTS/build libXext
 $SCRIPTS/build libXi
 $SCRIPTS/build libXmu
-$SCRIPTS/build $MESA
+$SCRIPTS/build Mesa

 cd $PKG_BUILD
 make SYSTEM=linux \
--- a/packages/graphics/glew/install
+++ b/packages/graphics/glew/install
@ -6,7 +6,7 @@ $SCRIPTS/install libX11
 $SCRIPTS/install libXext
 $SCRIPTS/install libXi
 $SCRIPTS/install libXmu
-$SCRIPTS/install $MESA
+$SCRIPTS/install Mesa

 mkdir -p $INSTALL/usr/lib
  cp -PR $PKG_BUILD/lib/lib*.so* $INSTALL/usr/lib
--- a/packages/graphics/mesa-master-GL/build
+++ b/packages/graphics/mesa-master-GL/build
@ -1,56 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-$SCRIPTS/unpack $MESA
-$SCRIPTS/build libxml2-host
-$SCRIPTS/build talloc
-$SCRIPTS/build expat
-$SCRIPTS/build glproto
-$SCRIPTS/build dri2proto
-$SCRIPTS/build libdrm
-$SCRIPTS/build libXext
-$SCRIPTS/build libXdamage
-$SCRIPTS/build libXfixes
-$SCRIPTS/build libXxf86vm
-$SCRIPTS/build libxcb
-$SCRIPTS/build libX11
-
-cd $BUILD/$MESA*
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --disable-debug \
-            --disable-selinux \
-            --enable-xcb \
-            --disable-glx-tls \
-            --enable-driglx-direct \
-            --disable-egl \
-            --disable-glu \
-            --disable-gl-osmesa \
-            --disable-glut \
-            --disable-glw \
-            --disable-motif \
-            --with-driver=dri \
-            --with-dri-drivers="" \
-            --disable-gallium
-
-  make -C src/glx
-  make -C src/mesa gl.pc
-  make -C src/mesa/drivers/dri dri.pc
-
-  mkdir -p $SYSROOT_PREFIX/usr/include/GL
-    cp include/GL/*.h $SYSROOT_PREFIX/usr/include/GL
-  mkdir -p $SYSROOT_PREFIX/usr/lib
-    cp -P lib/libGL.so* $SYSROOT_PREFIX/usr/lib/pkgconfig
-  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-    cp src/mesa/gl.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
-
-  mkdir -p $SYSROOT_PREFIX/usr/include/GL/internal
-    cp include/GL/internal/dri_interface.h $SYSROOT_PREFIX/usr/include/GL/internal
-  mkdir -p $SYSROOT_PREFIX/usr/lib/pkgconfig
-    cp src/mesa/drivers/dri/dri.pc $SYSROOT_PREFIX/usr/lib/pkgconfig
--- a/packages/graphics/mesa-master/build
+++ b/packages/graphics/mesa-master/build
@ -1,87 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-$SCRIPTS/build libxml2-host
-$SCRIPTS/build talloc
-$SCRIPTS/build expat
-$SCRIPTS/build glproto
-$SCRIPTS/build dri2proto
-$SCRIPTS/build libdrm
-$SCRIPTS/build libXext
-$SCRIPTS/build libXdamage
-$SCRIPTS/build libXfixes
-$SCRIPTS/build libXxf86vm
-$SCRIPTS/build libxcb
-$SCRIPTS/build libX11
-$SCRIPTS/build xorg-server
-
-get_graphicdrivers
-
-# dont use strip because of use from mklib
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-s||"`
-
-MESA_CONFIG=" --disable-gallium --disable-gallium-nouveau --disable-gallium-i915 --disable-gallium-i965"
-MESA_CONFIG="$MESA_CONFIG --disable-gallium-radeon --disable-gallium-r600 --disable-gallium-svga --disable-gallium-swrast"
-
-for drv in $GRAPHIC_DRIVERS; do
-  [ $drv = i915 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-intel/disable-gallium-intel/'`
-
-  [ $drv = i965 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-intel/disable-gallium-intel/'`
-
-  [ $drv = radeon ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-radeon/disable-gallium-radeon/'`
-
-  [ $drv = r600 ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-r600/disable-gallium-r600/'`
-
-  [ $drv = nouveau ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-nouveau/enable-gallium-nouveau/'` && \
-    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx,xorg"
-
-  [ $drv = vmware ] && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium/enable-gallium/'` && \
-    MESA_CONFIG=`echo $MESA_CONFIG | sed -e 's/disable-gallium-svga/enable-gallium-svga/'` && \
-    MESA_CONFIG="$MESA_CONFIG --with-state-trackers=dri,glx,xorg"
-done
-
-cd $PKG_BUILD
-
-make clean
-
-HOST_CC=$HOST_CC \
-HOST_OPT_FLAGS="$HOST_CFLAGS" \
-X11_INCLUDES= \
-DRI_DRIVER_INSTALL_DIR="$XORG_PATH_DRI" \
-DRI_DRIVER_SEARCH_DIR="$XORG_PATH_DRI" \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --localstatedir=/var \
-            --disable-static \
-            --enable-shared \
-            --disable-debug \
-            --disable-selinux \
-            --enable-xcb \
-            --disable-glx-tls \
-            --enable-driglx-direct \
-            --disable-egl \
-            --enable-glu \
-            --disable-gl-osmesa \
-            --disable-glut \
-            --disable-glw \
-            --disable-motif \
-            --with-driver=dri \
-            --with-dri-drivers=$MESA_DRIVERS \
-            --with-dri-driverdir="$XORG_PATH_DRI" \
-            --with-xorg-driver-dir="$XORG_PATH_DRIVERS" \
-            $MESA_CONFIG \
-
-make
-
-$MAKEINSTALL -C src/mesa
-$MAKEINSTALL -C src/glu
--- a/packages/graphics/mesa-master/install
+++ b/packages/graphics/mesa-master/install
@ -1,26 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-$SCRIPTS/install libXdamage
-$SCRIPTS/install libdrm
-$SCRIPTS/install talloc
-$SCRIPTS/install expat
-$SCRIPTS/install libXext
-$SCRIPTS/install libXfixes
-$SCRIPTS/install libXxf86vm
-$SCRIPTS/install libxcb
-$SCRIPTS/install libX11
-
-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/lib/libGL.so.1.2 $INSTALL/usr/lib/libGL_mesa.so.1 # rename for cooperate with nvidia drivers
-    ln -sf libGL.so.1 $INSTALL/usr/lib/libGL.so
-    ln -sf /var/lib/libGL.so $INSTALL/usr/lib/libGL.so.1
-  cp -P $PKG_BUILD/lib/libGLU.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/usr/lib/dri
-  cp -P $PKG_BUILD/lib/*_dri.so $INSTALL/usr/lib/dri || true
-  cp -P $PKG_BUILD/lib/gallium/*_dri.so $INSTALL/usr/lib/dri || true
-
-mkdir -p $INSTALL/usr/lib/xorg/modules/drivers
-  cp -P $PKG_BUILD/lib/gallium/*_drv.so $INSTALL/usr/lib/xorg/modules/drivers || true
--- a/packages/graphics/mesa-master/url
+++ b/packages/graphics/mesa-master/url
@ -1 +0,0 @@
-http://sources.openelec.tv/svn/mesa-master-20101111.tar.bz2
--- a/packages/mediacenter/xbmc-dharma/meta
+++ b/packages/mediacenter/xbmc-dharma/meta
@ -5,8 +5,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc: XBMC Mediacenter"
--- a/packages/mediacenter/xbmc/meta
+++ b/packages/mediacenter/xbmc/meta
@ -5,8 +5,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
 PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc"
-PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba alsa bc"
+PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump dbus libXt libXtst libXmu libXrandr Mesa glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmms libmodplug faad2 flac wavpack libmpeg2 libbluray SDL SDL_mixer SDL_image sqlite mysql samba"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
 PKG_SHORTDESC="xbmc: XBMC Mediacenter"
--- a/packages/multimedia/SDL/meta
+++ b/packages/multimedia/SDL/meta
@ -5,8 +5,8 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.libsdl.org/"
 PKG_URL="http://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS="alsa-lib libX11 libXrandr $MESA"
-PKG_BUILD_DEPENDS="toolchain alsa-lib libX11 libXrandr $MESA"
+PKG_DEPENDS="alsa-lib libX11 libXrandr Mesa"
+PKG_BUILD_DEPENDS="toolchain alsa-lib libX11 libXrandr Mesa"
 PKG_PRIORITY="optional"
 PKG_SECTION="multimedia"
 PKG_SHORTDESC="libsdl: A cross-platform Graphic API"
--- a/packages/multimedia/SDL_ttf/build
+++ b/packages/multimedia/SDL_ttf/build
@ -7,7 +7,7 @@ $SCRIPTS/build SDL
 $SCRIPTS/build libICE
 $SCRIPTS/build libX11
 $SCRIPTS/build freetype
-$SCRIPTS/build $MESA
+$SCRIPTS/build Mesa

 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
--- a/packages/multimedia/SDL_ttf/install
+++ b/packages/multimedia/SDL_ttf/install
@ -6,7 +6,7 @@ $SCRIPTS/install SDL
 $SCRIPTS/install libICE
 $SCRIPTS/install libX11
 $SCRIPTS/install freetype
-$SCRIPTS/install $MESA
+$SCRIPTS/install Mesa

 mkdir -p $INSTALL/usr/lib
  cp -P $PKG_BUILD/.libs/*.so* $INSTALL/usr/lib
--- a/packages/multimedia/libva/build
+++ b/packages/multimedia/libva/build
@ -7,7 +7,7 @@ $SCRIPTS/build libX11
 $SCRIPTS/build libXext
 $SCRIPTS/build libXfixes
 $SCRIPTS/build libdrm
-$SCRIPTS/build $MESA
+$SCRIPTS/build Mesa

 cd $PKG_BUILD

--- a/packages/multimedia/libva/install
+++ b/packages/multimedia/libva/install
@ -6,7 +6,7 @@ $SCRIPTS/install libX11
 $SCRIPTS/install libXext
 $SCRIPTS/install libXfixes
 $SCRIPTS/install libdrm
-$SCRIPTS/install $MESA
+$SCRIPTS/install Mesa

 mkdir -p $INSTALL/usr/lib
  cp -P $PKG_BUILD/va/.libs/libva*.so* $INSTALL/usr/lib
--- a/packages/sdk/games-sdk/install
+++ b/packages/sdk/games-sdk/install
@ -19,4 +19,4 @@ $SCRIPTS/install openal-soft
 $SCRIPTS/install libX11
 $SCRIPTS/install pango
 $SCRIPTS/install fontconfig
-$SCRIPTS/install $MESA
+$SCRIPTS/install Mesa
--- a/packages/x11/driver/xf86-video-nouveau/meta
+++ b/packages/x11/driver/xf86-video-nouveau/meta
@ -5,8 +5,8 @@ PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://sources.openelec.tv/svn/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess udev $MESA"
-PKG_BUILD_DEPENDS="toolchain libXrandr libXrender libdrm libXext libpciaccess udev $MESA xorg-server"
+PKG_DEPENDS="libXrandr libXrender libdrm libXext libpciaccess udev Mesa"
+PKG_BUILD_DEPENDS="toolchain libXrandr libXrender libdrm libXext libpciaccess udev Mesa xorg-server"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/driver"
 PKG_SHORTDESC="xf86-video-nouveau: Nouveau display driver (experimental)"
--- a/packages/x11/xserver/xorg-server/build
+++ b/packages/x11/xserver/xorg-server/build
@ -25,7 +25,7 @@ $SCRIPTS/build libX11
 $SCRIPTS/build libXfont
 $SCRIPTS/build libxkbfile
 $SCRIPTS/build libdrm
-$SCRIPTS/build ${MESA}-GL
+$SCRIPTS/build Mesa-GL
 $SCRIPTS/build openssl
 $SCRIPTS/build freetype
 $SCRIPTS/build pixman
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@ -10,7 +10,7 @@ $SCRIPTS/install openssl
 $SCRIPTS/install libX11
 $SCRIPTS/install libXfont
 $SCRIPTS/install libdrm
-$SCRIPTS/install $MESA
+$SCRIPTS/install Mesa
 $SCRIPTS/install pixman
 $SCRIPTS/install udev

--- a/projects/ATV/options
+++ b/projects/ATV/options
@ -131,8 +131,8 @@
 # use libdrm-master (latest git) instead latest released version
  LIBDRM_MASTER="yes"

-# Mesa to use (Mesa / mesa-master)
-  MESA="mesa-master"
+# use Mesa-master (latest git) instead latest released version
+  MESA_MASTER="yes"

 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
  VDPAU="no"
--- a/projects/ION/options
+++ b/projects/ION/options
@ -131,8 +131,8 @@
 # use libdrm-master (latest git) instead latest released version
  LIBDRM_MASTER="no"

-# Mesa to use (Mesa / mesa-master)
-  MESA="Mesa"
+# use Mesa-master (latest git) instead latest released version
+  MESA_MASTER="no"

 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
  VDPAU="yes"
--- a/projects/generic/options
+++ b/projects/generic/options
@ -131,8 +131,8 @@
 # use libdrm-master (latest git) instead latest released version
  LIBDRM_MASTER="no"

-# Mesa to use (Mesa / mesa-master)
-  MESA="Mesa"
+# use Mesa-master (latest git) instead latest released version
+  MESA_MASTER="no"

 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
  VDPAU="yes"
--- a/projects/intel/options
+++ b/projects/intel/options
@ -131,8 +131,8 @@
 # use libdrm-master (latest git) instead latest released version
  LIBDRM_MASTER="no"

-# Mesa to use (Mesa / mesa-master)
-  MESA="Mesa"
+# use Mesa-master (latest git) instead latest released version
+  MESA_MASTER="no"

 # Use VDPAU video acceleration (needs nVidia driver and a supported card)
  VDPAU="no"
				`@ -1 +0,0 @@`
				`http://sources.openelec.tv/svn/Mesa-7.9.1-20101109.tar.bz2`
				`@ -1 +0,0 @@`
				`http://sources.openelec.tv/svn/mesa-master-20101111.tar.bz2`