From 651ce88628a1443996af9c8c50364896d4e3dba0 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 1 Nov 2010 18:58:55 +0100
Subject: [PATCH] MesaLib: update to 7.9. glx-utils not included anymore.

---
 srcpkgs/MesaLib/MesaLib-devel.template |  2 --
 srcpkgs/MesaLib/glx-utils.template     | 16 --------------
 srcpkgs/MesaLib/template               | 30 +++++++++-----------------
 srcpkgs/glx-utils                      |  1 -
 4 files changed, 10 insertions(+), 39 deletions(-)
 delete mode 100644 srcpkgs/MesaLib/glx-utils.template
 delete mode 120000 srcpkgs/glx-utils

diff --git a/srcpkgs/MesaLib/MesaLib-devel.template b/srcpkgs/MesaLib/MesaLib-devel.template
index b36ce8e014..9e124dc8b5 100644
--- a/srcpkgs/MesaLib/MesaLib-devel.template
+++ b/srcpkgs/MesaLib/MesaLib-devel.template
@@ -5,8 +5,6 @@ long_desc="${long_desc}
 
  This package contains files for development, headers, static libs, etc."
 
-revision=1
-
 Add_dependency build pkg-config
 Add_dependency build glproto
 Add_dependency build dri2proto  ">=2.1"
diff --git a/srcpkgs/MesaLib/glx-utils.template b/srcpkgs/MesaLib/glx-utils.template
deleted file mode 100644
index d776c34746..0000000000
--- a/srcpkgs/MesaLib/glx-utils.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# Template file for 'glx-utils'.
-#
-short_desc="GLX utilities from Mesa"
-long_desc="${long_desc}
-
- This package contains some GLX utilities such as glxgears and glxinfo."
-
-Add_dependency run glibc
-Add_dependency run libX11
-Add_dependency run MesaLib
-
-do_install()
-{
-	install -d ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/bin ${DESTDIR}/usr
-}
diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template
index e54e342ccc..3ee1da3c90 100644
--- a/srcpkgs/MesaLib/template
+++ b/srcpkgs/MesaLib/template
@@ -1,18 +1,13 @@
 # Template build file for 'MesaLib'.
 pkgname=MesaLib
-version=7.8.2
-revision=1
+version=7.9
 wrksrc="Mesa-${version}"
-distfiles="
-ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2
-ftp://ftp.freedesktop.org/pub/mesa/$version/MesaDemos-$version.tar.bz2"
+distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
-configure_args="--enable-glx-tls --enable-xcb --with-demos"
+configure_args="--enable-glx-tls --enable-xcb"
 short_desc="Graphics library similar to SGI's OpenGL"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum="
-505bf418dceba05837f4ea1b1972b9620c35f8cb94bc4d1e6d573c15f562576d
-ea7b9ebfb7a80de2b275c0c9124c8a505382ec48411a2794ab82542f9885ac3c"
+checksum=e0cd67f4516d809e18fbc85dc721e84217d524d77d815b59e0c7c2d7ea1129f3
 long_desc="
  MesaLib 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
@@ -20,19 +15,21 @@ long_desc="
  Inc. However, the author makes no claim that Mesa is in any way a
  compatible replacement for OpenGL or associated with Silicon Graphics, Inc."
 
-subpackages="$pkgname-devel glx-utils"
+subpackages="$pkgname-devel"
+Add_dependency run libgcc
 Add_dependency run glibc
 Add_dependency run libstdc++
-Add_dependency run libgcc
 Add_dependency run libXext
 Add_dependency run libXxf86vm
 Add_dependency run libXdamage
 Add_dependency run libXfixes
 Add_dependency run libX11
 Add_dependency run libxcb
+Add_dependency run libudev
 Add_dependency run libdrm
 Add_dependency run expat
 Add_dependency run libXt
+Add_dependency run talloc
 
 Add_dependency build python
 Add_dependency build pkg-config
@@ -45,15 +42,8 @@ Add_dependency build libXdamage-devel
 Add_dependency build libXfixes-devel
 Add_dependency build libX11-devel
 Add_dependency build libxcb-devel
+Add_dependency build libudev-devel
 Add_dependency build libdrm-devel
 Add_dependency build expat-devel
 Add_dependency build libXt-devel
-
-post_install()
-{
-	install -d ${DESTDIR}/usr/bin || return 1
-	for f in glxgears glxinfo; do
-		install -m755 ${wrksrc}/progs/xdemos/${f} \
-			${DESTDIR}/usr/bin || return 1
-	done
-}
+Add_dependency build talloc-devel
diff --git a/srcpkgs/glx-utils b/srcpkgs/glx-utils
deleted file mode 120000
index 8bf5fbea21..0000000000
--- a/srcpkgs/glx-utils
+++ /dev/null
@@ -1 +0,0 @@
-MesaLib
\ No newline at end of file