Wed Feb 27 00:03:48 PST 2013

author: root <root@rshg054.dnsready.net> 2013-02-27 00:03:49 -0800
committer: root <root@rshg054.dnsready.net> 2013-02-27 00:03:49 -0800
commit: 23018fec360e50c7cb4de4b2411650ce79532e54 (patch)
tree: 766004a81e02dd8a2ea0d5092ce2d19aed799bf6
parent: 32e4cb82a73f6efc4254917e6324a2b61ecb5ddc (diff)
39 files changed, 486 insertions, 2661 deletions
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 4172caf6b..5dc9ee675 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84799 2013-02-24 18:38:31Z faidoc $
+# $Id: PKGBUILD 84919 2013-02-26 05:29:14Z bgyorgy $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
@@ -6,21 +6,22 @@
 
 pkgname=cinnamon
 pkgver=1.7.1
-pkgrel=1
+pkgrel=3
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64')
 url="http://cinnamon.linuxmint.com/"
 license=('GPL2')
-depends=('accountsservice' 'caribou' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme'
-         'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard'
-         'gstreamer0.10' 'networkmanager' 'muffin' 'python2-dbus'
-         'python2-gconf' 'python2-imaging' 'python2-lxml' 'cinnamon-screensaver')
+depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth'
+         'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session'
+         'gnome-themes-standard' 'gstreamer0.10' 'networkmanager' 'muffin' 'python2-dbus'
+         'python2-gconf' 'python2-imaging' 'python2-pyinotify' 'python2-lxml')
 makedepends=('gnome-common' 'intltool')
 optdepends=('cinnamon-control-center: extended configurations for Cinnamon'
+            'cinnamon-screensaver: lock screen'
             'gucharmap: show character table from Keyboard applet'
             'libgnomekbd: show keyboard layout from Keyboard applet'
             'nemo: the official Cinnamon file manager (forked from Nautilus)'
-            'nautilus: the official Gnome file manager')
+            'webkitgtk3: download applets from Spices website in cinnamon-settings')
 options=('!libtool' '!emptydirs')
 install=${pkgname}.install
 source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/$pkgver"
@@ -57,16 +58,13 @@ build() {
 package() {
   cd ${srcdir}/linuxmint-Cinnamon*
   make DESTDIR="${pkgdir}" install
-  
+
   # Python2 fix
-  sed -i 's/bin\/python/bin\/python2/g' \
-    "${pkgdir}/usr/bin/$pkgname-launcher" \
+  sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' \
     "${pkgdir}/usr/bin/$pkgname-menu-editor" \
-    "${pkgdir}/usr/bin/$pkgname-settings" \
     "${pkgdir}/usr/share/$pkgname/applets/panel-launchers@$pkgname.org/$pkgname-add-panel-launcher.py"
-    
-  sed -i 's/env python/env python2/g' \
-    "${pkgdir}/usr/lib/$pkgname-settings/$pkgname-settings.py"
+
+  find "${pkgdir}" -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
 }
 
 
diff --git a/community/ffmpegsource/PKGBUILD b/community/ffmpegsource/PKGBUILD
index e68395e82..33e864022 100755
--- a/community/ffmpegsource/PKGBUILD
+++ b/community/ffmpegsource/PKGBUILD
@@ -1,27 +1,41 @@
-# $Id: PKGBUILD 84674 2013-02-21 15:31:17Z alucryd $
+# $Id: PKGBUILD 84951 2013-02-26 15:11:09Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 
 pkgname=ffmpegsource
-pkgver=2.17
-pkgrel=9
+pkgver=743
+pkgrel=1
 pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access"
 arch=('i686' 'x86_64')
 url="http://code.google.com/p/ffmpegsource/"
 license=('MIT')
 depends=('ffmpeg')
+makedepends=('svn')
 options=('!libtool')
-source=("http://ffmpegsource.googlecode.com/files/ffms-${pkgver}-src.tar.bz2" 'autoconf.patch' 'ffmpeg.patch')
-sha256sums=('991f7a77982823afdcf0beb8961deddaf7dd0aea949249e51fbf51cb3314643d'
-            '77e5185f91249b8d032958abb142827a5349b06ff1b4fbd4c5c87ccea811273d'
-            'adc08b58dec29b04be9d9eb2f12c2fa836565d363aafcfc3e785ae4692db6845')
+source=('autoconf.patch')
+sha256sums=('b09a7e9a08a16bdaf19d43c7ad8d3ec455f6fecec2f4f5ada417345343adda93')
+
+_svntrunk=http://ffmpegsource.googlecode.com/svn/trunk/
+_svnmod=ffmpegsource
 
 build() {
-  cd "${srcdir}"/ffms-${pkgver}-src
+  cd "${srcdir}"
+  msg "Connecting to SVN server...."
+
+  if [[ -d ${_svnmod}/.svn ]]; then
+    (cd ${_svnmod} && svn up -r ${pkgver})
+  else
+    svn co ${_svntrunk} --config-dir ./ -r ${pkgver} ${_svnmod}
+  fi
+
+  msg "SVN checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "${srcdir}"/${_svnmod}-build
+  svn export "${srcdir}"/${_svnmod} "${srcdir}"/${_svnmod}-build
+  cd "${srcdir}"/${_svnmod}-build
 
 # Patch
   patch -Np1 -i "${srcdir}"/autoconf.patch
-  patch -Np1 -i "${srcdir}"/ffmpeg.patch
-  mv configure.in configure.ac
 
 # Build
   ./autogen.sh --prefix=/usr --enable-shared --disable-static
@@ -29,7 +43,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/ffms-${pkgver}-src
+  cd "${srcdir}"/${_svnmod}-build
 
 # Install
   make DESTDIR="${pkgdir}" install
diff --git a/community/ffmpegsource/autoconf.patch b/community/ffmpegsource/autoconf.patch
index 0420ad776..e15e4522c 100755
--- a/community/ffmpegsource/autoconf.patch
+++ b/community/ffmpegsource/autoconf.patch
@@ -9,8 +9,8 @@
  
  lib_LTLIBRARIES = src/core/libffms2.la
  src_core_libffms2_la_LIBADD = @LIBAV_LIBS@ @ZLIB_LDFLAGS@ -lz @LTUNDEF@
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
 @@ -30,7 +30,7 @@ if test -z "$CXXFLAGS"; then
      CXXFLAGS="$OPT_FLAGS"
  fi
diff --git a/community/ffmpegsource/ffmpeg.patch b/community/ffmpegsource/ffmpeg.patch
deleted file mode 100755
index 71bf6aa2d..000000000
--- a/community/ffmpegsource/ffmpeg.patch
+++ /dev/null
@@ -1,89 +0,0 @@
---- ffms-2.17-src.orig/configure.in
-+++ ffms-2.17-src/configure.in
-@@ -135,7 +135,7 @@ AC_DEFUN([TEST_LIBAV],
-             #include <libavcodec/avcodec.h>
-             #include <libswscale/swscale.h>
-             ]],[[
--                avcodec_init();
-+                av_register_all();
-                 swscale_version();
-                 #ifdef FFMS_USE_FFMPEG_COMPAT
-                 int bogus = CODEC_ID_G2M;
---- ffms-2.17-src.orig/include/ffmscompat.h
-+++ ffms-2.17-src/include/ffmscompat.h
-@@ -84,6 +84,14 @@
- #	else
- #		define FFMS_CALCULATE_DELAY (CodecContext->has_b_frames + (CodecContext->thread_count - 1))
- #	endif
-+#       if VERSION_CHECK(LIBAVCODEC_VERSION_INT, <, 54, 25, 0, 54, 51, 100)
-+#               define FFMS_ID(x) (CODEC_ID_##x)
-+#               define FFMS_CodecID CodecID
-+#       else
-+#               define FFMS_ID(x) (AV_CODEC_ID_##x)
-+#               define FFMS_CodecID AVCodecID
-+#               undef CodecID
-+#       endif
- #endif
- 
- #ifdef LIBAVUTIL_VERSION_INT
---- ffms-2.17-src.orig/src/core/codectype.cpp
-+++ ffms-2.17-src/src/core/codectype.cpp
-@@ -25,7 +25,7 @@
- 
- typedef struct CodecTags {
- 	char str[20];
--	CodecID id;
-+	FFMS_CodecID id;
- } CodecTags;
- 
- static const CodecTags mkv_codec_tags[] = {
-@@ -92,7 +92,7 @@ static const CodecTags mkv_codec_tags[]
- };
- 
- typedef struct AVCodecTag {
--	enum CodecID id;
-+	enum FFMS_CodecID id;
- 	unsigned int tag;
- } AVCodecTag;
- 
-@@ -400,7 +400,7 @@ const char *GetLAVCSampleFormatName(AVSa
- 	}
- }
- 
--CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) {
-+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC, unsigned int BitsPerSample) {
- 	/* Look up native codecs */
- 	for(int i = 0; mkv_codec_tags[i].id != CODEC_ID_NONE; i++){
- 		if(!strncmp(mkv_codec_tags[i].str, Codec,
-@@ -408,7 +408,7 @@ CodecID MatroskaToFFCodecID(char *Codec,
- 
- 				// Uncompressed and exotic format fixup
- 				// This list is incomplete
--				CodecID CID = mkv_codec_tags[i].id;
-+				FFMS_CodecID CID = mkv_codec_tags[i].id;
- 				switch (CID) {
- 					case CODEC_ID_PCM_S16LE:
- 						switch (BitsPerSample) {
---- ffms-2.17-src.orig/src/core/codectype.h
-+++ ffms-2.17-src/src/core/codectype.h
-@@ -27,5 +27,5 @@ extern "C" {
- #include "ffmscompat.h"
- 
- FFMS_TrackType HaaliTrackTypeToFFTrackType(int TT);
--CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0);
-+FFMS_CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate, unsigned int FourCC = 0, unsigned int BitsPerSample = 0);
- const char *GetLAVCSampleFormatName(AVSampleFormat s);
---- ffms-2.17-src.orig/src/core/matroskaparser.h
-+++ ffms-2.17-src/src/core/matroskaparser.h
-@@ -32,6 +32,11 @@
- #ifndef MATROSKA_PARSER_H
- #define	MATROSKA_PARSER_H
- 
-+/* Make sure we undefine CodecID, since libavcodec defines it as AVCodec ID */
-+#ifdef CodecID
-+#undef CodecID
-+#endif
-+
- /* Random notes:
-  *
-  * The parser does not process frame data in any way and does not read it into
diff --git a/community/goaccess/PKGBUILD b/community/goaccess/PKGBUILD
new file mode 100644
index 000000000..f2c1d647b
--- /dev/null
+++ b/community/goaccess/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 84906 2013-02-26 01:29:13Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+# Contributor: Josh VanderLinden <arch@cloudlery.com>
+# Contributor: Nicolas Storme <nicolas@atelier-web.com>
+
+pkgname=goaccess
+pkgver=0.5
+pkgrel=2
+pkgdesc="An open source real-time web log analyzer and interactive viewer"
+arch=('i686' 'x86_64')
+url="http://goaccess.prosoftcorp.com"
+license=('GPL')
+depends=('ncurses' 'geoip' 'glib2')
+source=(http://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('f6359a9553a460265f5859cea4d40ec0')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --enable-geoip
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make prefix="$pkgdir/usr" install
+}
diff --git a/community/libaccounts-glib/PKGBUILD b/community/libaccounts-glib/PKGBUILD
index 8012d8425..e289718d1 100644
--- a/community/libaccounts-glib/PKGBUILD
+++ b/community/libaccounts-glib/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 84335 2013-02-16 20:11:59Z bgyorgy $
+# $Id: PKGBUILD 85006 2013-02-26 17:28:47Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=libaccounts-glib
-pkgver=1.7
+pkgver=1.8
 pkgrel=1
 pkgdesc="Glib-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends=('dbus-glib' 'libxml2' 'sqlite3')
 makedepends=('python2-gobject')
 options=('!libtool')
 source=(http://accounts-sso.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('b81a86ee1f66c592dab573334a1a564c8c497858')
+sha1sums=('5d827392f6da2ff74e342a6b3a50fbe3486b49b0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/libaccounts-qt/PKGBUILD b/community/libaccounts-qt/PKGBUILD
index b38459ad6..f3670a72c 100644
--- a/community/libaccounts-qt/PKGBUILD
+++ b/community/libaccounts-qt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83016 2013-01-26 15:16:16Z bgyorgy $
+# $Id: PKGBUILD 84998 2013-02-26 17:05:05Z bgyorgy $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=libaccounts-qt
 _pkgbase=accounts-qt
 pkgname=('libaccounts-qt' 'libaccounts-qt-doc')
-pkgver=1.4
+pkgver=1.6
 pkgrel=1
 pkgdesc="Qt-based client library for accessing the online accounts database"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('qt' 'libaccounts-glib')
 makedepends=('doxygen' 'graphviz' 'ttf-dejavu')
 options=('!emptydirs')
 source=(http://accounts-sso.googlecode.com/files/$_pkgbase-$pkgver.tar.bz2)
-sha1sums=('135fdaa766da070b2ad41ff4c33c663f4d321c8e')
+sha1sums=('bd2c02b747384d53b75767c18b1e026bcf2211c5')
 
 build() {
   cd "$srcdir/$_pkgbase-$pkgver"
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index 09cae83cc..21f0a4be2 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84385 2013-02-17 18:49:54Z bpiotrowski $
+# $Id: PKGBUILD 84970 2013-02-26 15:56:33Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.8.20
+pkgver=0.8.21
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ depends=('openssl' 'python2')
 checkdepends=('curl') # curl used for check()
 options=('!emptydirs')
 source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz)
-sha256sums=('e4461bfded531f4880839829ab3bce5b824905d6e181876e3d0309a366bf57ee')
+sha256sums=('e526f56d22bb2ebee5a607bd1e7a16dcc8530b916e3a372192e6cd5fa97d08e6')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/opendkim/PKGBUILD b/community/opendkim/PKGBUILD
index edd1ed051..e302a49f9 100644
--- a/community/opendkim/PKGBUILD
+++ b/community/opendkim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82828 2013-01-24 15:21:21Z spupykin $
+# $Id: PKGBUILD 84932 2013-02-26 10:19:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Thomas Jost <schnouki@schnouki.net>
 
 pkgname=opendkim
-pkgver=2.7.4
+pkgver=2.8.0
 pkgrel=1
 pkgdesc="An open source implementation of the DKIM sender authentication system. Based on a fork of dkim-milter."
 arch=(i686 x86_64)
@@ -18,7 +18,7 @@ source=(http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.g
 	opendkim.conf
 	opendkim.rc
 	opendkim.service)
-md5sums=('310063cabe530eb0b5c16103334b3bb0'
+md5sums=('53bd811c6577235bd008f632e7f63dae'
          '3e2bb1058ac0662f01e675aa6ac7ee8f'
          '093f5c098a45cc68753f97e45a5b374c'
          'bc1b73856bc1941faaa4842e00437cb5')
diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD
index a168f3f71..c4f9c8dc6 100644
--- a/community/parrot/PKGBUILD
+++ b/community/parrot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 84846 2013-02-25 10:40:09Z spupykin $
+# $Id: PKGBUILD 84934 2013-02-26 10:19:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: mpie <michael.kyne-phillips1@ntlworld.com>
 
@@ -6,7 +6,7 @@ pkgname=parrot
 pkgver=5.1.0
 #_rel=stable
 _rel=devel
-pkgrel=1
+pkgrel=2
 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages"
 arch=('x86_64' 'i686')
 url="http://www.parrotcode.org/"
@@ -22,7 +22,8 @@ build() {
   cd "$srcdir/$pkgname-$pkgver"
   perl Configure.pl --prefix=/usr \
     --parrot_is_shared \
-    --disable-rpath
+    --disable-rpath \
+    --optimize
   export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:$(pwd)/blib/lib"
   make all parrot_utils docs html
 }
diff --git a/community/python-cx_freeze/PKGBUILD b/community/python-cx_freeze/PKGBUILD
new file mode 100644
index 000000000..cc563b77a
--- /dev/null
+++ b/community/python-cx_freeze/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 84904 2013-02-25 23:57:50Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Ray Rashif <schiv@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: Eric Belanger <eric@archlinux.org>
+# Contributor: Roberto Alsina <ralsina@kde.org>
+
+pkgbase=python-cx_freeze
+pkgname=('python-cx_freeze' 'python2-cx_freeze')
+pkgver=4.3.1
+pkgrel=1
+pkgdesc='Set of utilities for freezing Python scripts into executables'
+arch=('x86_64' 'i686')
+url='http://cx-freeze.sourceforge.net/'
+license=('PSF')
+makedepends=('python' 'python2')
+source=("http://prdownloads.sourceforge.net/cx-freeze/cx_Freeze-$pkgver.tar.gz")
+sha256sums=('11f8818ab4e1754c81c1226ce3430f29e6ba231a22a153ce3794a5cc464fa11b')
+
+package_python-cx_freeze() {
+  depends=('python')
+  conflicts=('cx_freeze' 'python2-cx_freeze')
+
+  cd "$srcdir/cx_Freeze-$pkgver"
+  python setup.py install --root "$pkgdir" --optimize 1
+}
+
+package_python2-cx_freeze() {
+  depends=('python2')
+  conflicts=('cx_freeze' 'python-cx_freeze')
+  replaces=('cx_freeze')
+
+  cd "$srcdir/cx_Freeze-$pkgver"
+  python2 setup.py install --root "$pkgdir" --optimize 1
+  # Python 2 shebang fix
+  find "$pkgdir" -name qotd.py -exec sed -i '0,/on/s//on2/' {} \;
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/stuntrally/PKGBUILD b/community/stuntrally/PKGBUILD
new file mode 100644
index 000000000..1cc321145
--- /dev/null
+++ b/community/stuntrally/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor: Sven Schneider <archlinux.sandmann@googlemail.com>
+# Contributor: Jason Melton <jason.melton@gmail.com>
+
+pkgname=stuntrally
+pkgver=1.9
+pkgrel=2
+pkgdesc="Stunt Rally game with track editor, based on VDrift"
+arch=('i686' 'x86_64')
+license=('GPL3')
+url="http://code.google.com/p/vdrift-ogre"
+depends=('libvorbis' 'mygui' 'sdl' 'enet' 'hicolor-icon-theme' 'libxcursor' 'stuntrally-data')
+makedepends=('cmake' 'boost')
+install=stuntrally.install
+source=(src_${pkgver}.tar.gz::https://nodeload.github.com/${pkgname}/stuntrally/tar.gz/${pkgver})
+md5sums=('3253c5a64a6d3f4fc4b756ea431286de')
+
+build() {
+  cd "${srcdir}/stuntrally-${pkgver}/"
+
+  rm -rf build
+  mkdir build && cd build
+
+  cmake -DCMAKE_INSTALL_PREFIX="/usr" -DSHARE_INSTALL="share/stuntrally" ..
+  make
+}
+
+package() {
+  cd "${srcdir}/stuntrally-${pkgver}/build/"
+
+  make DESTDIR="${pkgdir}" install
+
+  rm -rf "${pkgdir}/usr/share/stuntrally/"
+}
diff --git a/community/stuntrally/stuntrally.install b/community/stuntrally/stuntrally.install
new file mode 100644
index 000000000..547348418
--- /dev/null
+++ b/community/stuntrally/stuntrally.install
@@ -0,0 +1,11 @@
+post_install() {
+	gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/community/xboard/PKGBUILD b/community/xboard/PKGBUILD
index 35eb41181..508523e77 100644
--- a/community/xboard/PKGBUILD
+++ b/community/xboard/PKGBUILD
@@ -1,30 +1,35 @@
-# $Id: PKGBUILD 72645 2012-06-18 12:05:37Z spupykin $
+# $Id: PKGBUILD 84936 2013-02-26 10:20:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jason Chu <jason@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=xboard
-pkgver=4.6.2
-pkgrel=3
+pkgver=4.7.0
+pkgrel=1
 pkgdesc="Graphical user interfaces for chess"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/xboard/"
 license=('GPL3')
-depends=('libxaw' 'gnuchess' 'texinfo' 'xdg-utils'
-	 'xorg-fonts-75dpi' 'xorg-fonts-100dpi')
+depends=('gnuchess' 'texinfo' 'xdg-utils'
+	 'xorg-fonts-75dpi' 'xorg-fonts-100dpi'
+	 'gtk2' 'cairo' 'librsvg')
 makedepends=('gendesk')
 optdepends=('perl')
 install=${pkgname}.install
 source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('6e6d119fac60d68139d7836426212efb')
+md5sums=('646e5091f7ee4b5fa9998d2cca9cf795')
 
 build() {
   cd "${srcdir}"
   gendesk
 
   cd "${pkgname}-${pkgver}"
-  sed -i 's/fairymax/gnuchess/g' xboard.h xboard.conf.in
-  ./configure --prefix=/usr --mandir=/usr/share/man --sysconfdir=/etc
+  sed -i 's/fairymax/gnuchess/g' {xaw,gtk}/xboard.h xboard.conf.in
+  ./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man \
+    --sysconfdir=/etc \
+    --with-gtk
   make
 }
 
diff --git a/extra/bzflag/PKGBUILD b/extra/bzflag/PKGBUILD
index a565f2d7c..e0fb01e87 100644
--- a/extra/bzflag/PKGBUILD
+++ b/extra/bzflag/PKGBUILD
@@ -1,18 +1,17 @@
-# $Id: PKGBUILD 169739 2012-10-27 23:41:24Z eric $
+# $Id: PKGBUILD 178623 2013-02-25 23:15:25Z bisson $
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=bzflag
 pkgver=2.4.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Multiplayer 3D tank battle game'
 url='http://bzflag.org/'
 license=('LGPL')
 options=('!libtool')
 arch=('i686' 'x86_64')
 depends=('curl' 'glew' 'glu' 'sdl')
-makedepends=('mesa') # glu requires <GL/gl.h>
 source=("http://downloads.sourceforge.net/project/bzflag/bzflag%20source/${pkgver}/bzflag-${pkgver}.tar.bz2")
 sha1sums=('36c67c0734a1318b34b39ed0da49606e05ebd291')
 
diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index 2662b40e5..ea369be40 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178409 2013-02-21 12:49:48Z ioni $
+# $Id: PKGBUILD 178756 2013-02-26 18:03:18Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg
-pkgver=1.1.2
-pkgrel=3
+pkgver=1.1.3
+pkgrel=1
 epoch=1
 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix"
 arch=('i686' 'x86_64')
@@ -18,15 +18,12 @@ depends=(
       'v4l-utils' 'x264' 'xvidcore' 'zlib'
       )
 makedepends=('libvdpau' 'yasm')
-source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2
-        h264-vdpau.patch)
-sha256sums=('dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce'
-            'f55f31a40627ac375fa903c958f34af0f4c72dd9f64dd5f4f64320bb6f126f42')
+source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2)
+sha256sums=('a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i ../h264-vdpau.patch
   ./configure \
     --prefix=/usr \
     --disable-debug \
diff --git a/extra/ffmpeg/h264-vdpau.patch b/extra/ffmpeg/h264-vdpau.patch
deleted file mode 100644
index 75ebe306f..000000000
--- a/extra/ffmpeg/h264-vdpau.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=libavcodec%2Fh264.c;h=da749a241d5647751cb5a961429abb6657a79a00;hp=56ef1092bd4509697f11b76ae97757bbc03aef14;hb=c6f59b95c529baf2ea6729ab9089fddce3ddd86a;hpb=6407800521d26b103db4c22d9de709e957381e4b
-
-diff --git a/libavcodec/h264.c b/libavcodec/h264.c
-index 56ef109..da749a2 100644
---- a/libavcodec/h264.c
-+++ b/libavcodec/h264.c
-@@ -2537,11 +2537,17 @@ static enum PixelFormat get_pixel_format(H264Context *h)
-             return s->avctx->color_range == AVCOL_RANGE_JPEG ? AV_PIX_FMT_YUVJ422P
-                                                              : AV_PIX_FMT_YUV422P;
-         } else {
--            return s->avctx->get_format(s->avctx, s->avctx->codec->pix_fmts ?
-+            int i;
-+            const enum AVPixelFormat * fmt = s->avctx->codec->pix_fmts ?
-                                         s->avctx->codec->pix_fmts :
-                                         s->avctx->color_range == AVCOL_RANGE_JPEG ?
-                                         hwaccel_pixfmt_list_h264_jpeg_420 :
--                                        ff_hwaccel_pixfmt_list_420);
-+                                        ff_hwaccel_pixfmt_list_420;
-+
-+            for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++)
-+                if (fmt[i] == s->avctx->pix_fmt)
-+                    return fmt[i];
-+            return s->avctx->get_format(s->avctx, fmt);
-         }
-         break;
-     default:
diff --git a/extra/fsarchiver/PKGBUILD b/extra/fsarchiver/PKGBUILD
index b911565e7..82a8321e3 100644
--- a/extra/fsarchiver/PKGBUILD
+++ b/extra/fsarchiver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 177799 2013-02-09 02:58:49Z eric $
+# $Id: PKGBUILD 178753 2013-02-26 16:58:17Z eric $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=fsarchiver
-pkgver=0.6.16
+pkgver=0.6.17
 pkgrel=1
 pkgdesc="A safe and flexible file-system backup and deployment tool"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://www.fsarchiver.org/"
 license=('GPL2')
 depends=('bzip2' 'e2fsprogs' 'lzo2' 'xz' 'libgcrypt')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('2844a2c8c08181148ee5e05d03b781030b2b67f4')
+sha1sums=('3b1049b674f3be45ecda5a91a584c7ddc3781e6b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/glu/PKGBUILD b/extra/glu/PKGBUILD
index a3905a97e..338df82e9 100644
--- a/extra/glu/PKGBUILD
+++ b/extra/glu/PKGBUILD
@@ -1,16 +1,15 @@
-# $Id: PKGBUILD 168550 2012-10-13 11:42:49Z andyrtr $
+# $Id: PKGBUILD 178743 2013-02-26 16:19:48Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=glu
 pkgver=9.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Mesa OpenGL Utility library"
 arch=('i686' 'x86_64')
 url="http://cgit.freedesktop.org/mesa/glu/"
 license=('LGPL')
 depends=('libgl')
-makedepends=('mesa')
 options=('!libtool')
 source=(ftp://ftp.freedesktop.org/pub/mesa/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12')
diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD
index cf7b93bd6..7e6d62bde 100644
--- a/extra/libpng/PKGBUILD
+++ b/extra/libpng/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 169446 2012-10-21 10:49:41Z ibiru $
+# $Id: PKGBUILD 178758 2013-02-26 18:11:18Z ioni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Travis Willard <travis@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=libpng
-pkgver=1.5.13
-_apngver=1.5.13
+pkgver=1.5.14
+_apngver=1.5.14
 pkgrel=1
 pkgdesc="A collection of routines used to create PNG format graphics files"
 arch=('i686' 'x86_64')
@@ -16,8 +16,8 @@ depends=('zlib' 'sh')
 options=('!libtool')
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz"
         "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz")
-md5sums=('0b607a685da977f1bfc96e1c47055183'
-         '23c8765aa6ca188c0575386d5ea8fe70')
+md5sums=('94284b01d62ca43c5eb3f6702db08ed8'
+         '89fbc11f19ec1f181587bdde1dd9402f')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD
index 3299ac897..99be3512f 100644
--- a/extra/libtorrent-rasterbar/PKGBUILD
+++ b/extra/libtorrent-rasterbar/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 176291 2013-01-28 16:48:24Z stephane $
+# $Id: PKGBUILD 178762 2013-02-26 18:22:51Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libtorrent-rasterbar
-pkgver=0.16.7
-pkgrel=2
+pkgver=0.16.8
+pkgrel=1
 epoch=1
 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
 url="http://www.rasterbar.com/products/libtorrent/"
@@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2')
 makedepends=('boost')
 options=('!libtool' '!emptydirs')
 source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('94b132a17d8f6a5345937731343398be8d31f170')
+sha1sums=('483689787cb64e7cf4abefda4058b912ec406709')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD
index e07e9a946..5e29706a8 100644
--- a/extra/mtr/PKGBUILD
+++ b/extra/mtr/PKGBUILD
@@ -1,33 +1,38 @@
-# $Id: PKGBUILD 144089 2011-12-03 12:24:56Z ibiru $
+# $Id: PKGBUILD 178764 2013-02-26 18:56:25Z ioni $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mtr
 pkgname=(mtr mtr-gtk)
-pkgver=0.82
+pkgver=0.83
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 makedepends=('ncurses' 'gtk2')
-source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz)
+source=(ftp://ftp.bitwizard.nl/mtr/$pkgbase-$pkgver.tar.gz
+        mtr-glib2.patch)
 url="http://www.bitwizard.nl/mtr/"
-md5sums=('10601ea543fda3e51545c4bce195b64c')
+md5sums=('2e3a40f2da47748ad0053a5d678b9b4a'
+         '6bce08e1de7c6835bdda893847981bc8')
 
 build() {
-    install -d  "$srcdir/"{mtr-cli,mtr-gtk}
-    cd "$srcdir/mtr-cli"
-    ../$pkgbase-$pkgver/configure --prefix=/usr --disable-gtktest --without-gtk
+    patch -Np0 -i mtr-glib2.patch
+    cp -r  $pkgbase-$pkgver $pkgbase-cli
+    cd mtr-cli
+    ./bootstrap.sh
+    ./configure --prefix=/usr --without-gtk
     make
 
-    cd "$srcdir/mtr-gtk"
-    ../$pkgbase-$pkgver/configure --prefix=/usr
+    cd "$srcdir/$pkgbase-$pkgver"
+    ./bootstrap.sh
+    ./configure --prefix=/usr
     make
 }
 
 package_mtr() {
     pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)"
-    depends=('ncurses')
-    cd "$srcdir/mtr-cli"
+    depends=('ncurses' 'glib2')
+    cd mtr-cli
     make DESTDIR="$pkgdir" install
 }
 
@@ -37,6 +42,6 @@ package_mtr-gtk() {
     conflicts=("mtr")
     provides=("mtr=$pkgver")
 
-    cd "$srcdir/mtr-gtk"
+    cd $pkgbase-$pkgver
     make DESTDIR="$pkgdir" install
 }
diff --git a/extra/mtr/mtr-glib2.patch b/extra/mtr/mtr-glib2.patch
new file mode 100644
index 000000000..76a53fa6f
--- /dev/null
+++ b/extra/mtr/mtr-glib2.patch
@@ -0,0 +1,26 @@
+diff -up mtr-0.83/configure.in.glib2 mtr-0.83/configure.in
+--- mtr-0.83/configure.in.glib2	2013-02-18 20:10:00.767417356 +0100
++++ mtr-0.83/configure.in	2013-02-18 20:10:53.549513018 +0100
+@@ -59,6 +59,8 @@ else
+ 	GTK_OBJ=""
+ fi
+ 
++PKG_CHECK_MODULES([GLIB2], [glib-2.0])
++
+ AC_CHECK_FUNC(socket, , 
+   AC_CHECK_LIB(socket, socket, , AC_MSG_ERROR(No socket library found)))
+ 
+diff -up mtr-0.83/Makefile.am.glib2 mtr-0.83/Makefile.am
+--- mtr-0.83/Makefile.am.glib2	2013-02-18 20:13:54.635841512 +0100
++++ mtr-0.83/Makefile.am	2013-02-18 20:16:17.877101679 +0100
+@@ -19,8 +19,9 @@ mtr_SOURCES = mtr.c \
+               mtr-gtk.h
+ EXTRA_mtr_SOURCES = curses.c \
+                     gtk.c
++AM_CFLAGS = $(GLIB2_CFLAGS)
+ mtr_DEPENDENCIES = $(GTK_OBJ) $(CURSES_OBJ)
+-mtr_LDFLAGS = $(GTK_OBJ) $(CURSES_OBJ)
++mtr_LDFLAGS = $(GTK_OBJ) $(GLIB2_LIBS) $(CURSES_OBJ)
+ 
+ EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist
+ distclean-local:
diff --git a/extra/nspr/PKGBUILD b/extra/nspr/PKGBUILD
index 1f427a23f..07dc4d298 100644
--- a/extra/nspr/PKGBUILD
+++ b/extra/nspr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173931 2012-12-28 07:40:52Z andyrtr $
+# $Id: PKGBUILD 178768 2013-02-26 20:04:47Z ioni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 pkgname=nspr
-pkgver=4.9.4
+pkgver=4.9.5
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('zip')
 options=(!emptydirs)
 source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz
         nspr.pc.in)
-md5sums=('cf58772702b3abbdcff14e22014eeeaf'
+md5sums=('b6ccfa8fcbbeb17ebeb19a3edff612bd'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
diff --git a/extra/nss/PKGBUILD b/extra/nss/PKGBUILD
index 07ced92db..d4540f420 100644
--- a/extra/nss/PKGBUILD
+++ b/extra/nss/PKGBUILD
@@ -1,32 +1,30 @@
-# $Id: PKGBUILD 174760 2013-01-06 20:10:23Z jgc $
+# $Id: PKGBUILD 178767 2013-02-26 20:04:18Z ioni $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
-pkgver=3.14.1.1.93
-_pkgver=3.14.1
+pkgver=3.14.3
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
 arch=(i686 x86_64)
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.9.4
+_nsprver=4.9.5
 depends=("nspr>=${_nsprver}" 'sqlite' 'zlib' 'sh')
 makedepends=('perl')
 options=('!strip')
-#source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_3_14_1_WITH_CKBI_1_93_RTM/src/${pkgname}-3.14.1.with.ckbi.1.93.tar.gz
+source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz
         nss.pc.in
         nss-config.in
         ssl-renegotiate-transitional.patch
         add_spi+cacert_ca_certs.patch)
-sha1sums=('28b4a2316dc5e5d4605ac375449691c05b6f1c29'
+sha1sums=('94d8781d1fa29cfbd37453dda3e9488709b82c4c'
           'aa5b2c0aa38d3c1066d511336cf28d1333e3aebd'
           'cb744cc3e56b604e4754bc3c7d9f25bb9a0a136c'
           '8a964a744ba098711b80c0d279a2993524e8eb92'
           'be6ef0f124f188ebb76f4d83e13466bdcfb27dd3')
 
 build() {
-  cd "${srcdir}/${pkgname}-${_pkgver}/mozilla"
+  cd "${srcdir}/${pkgname}-${pkgver}/mozilla"
   # Add CAcert and spi-inc.org CA certificates.
   # See http://wiki.cacert.org/NSSLib for how to generate
   patch -Np0 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
@@ -47,7 +45,7 @@ build() {
   #  cd security/nss/lib/ckfw/builtins
   #  make generate
 
-  cd "${srcdir}/${pkgname}-${_pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   export BUILD_OPT=1
   export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
   export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
@@ -65,7 +63,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${_pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
   install -m755 -d "${pkgdir}/usr/bin"
   install -m755 -d "${pkgdir}/usr/include/nss"
diff --git a/extra/sane/PKGBUILD b/extra/sane/PKGBUILD
index 4abdfd248..d0aab1080 100644
--- a/extra/sane/PKGBUILD
+++ b/extra/sane/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173127 2012-12-11 14:42:10Z jgc $
+# $Id: PKGBUILD 178746 2013-02-26 16:27:02Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 # Contributor: Simo L. <neotuli@yahoo.com>
@@ -6,7 +6,7 @@
 
 pkgname=sane
 pkgver=1.0.23
-pkgrel=2
+pkgrel=3
 pkgdesc="Scanner Access Now Easy"
 url="http://www.sane-project.org/"
 arch=('i686' 'x86_64')
@@ -18,12 +18,19 @@ backup=(etc/sane.d/{abaton.conf,agfafocus.conf,apple.conf,artec.conf,artec_eplus
 source=(ftp://ftp.archlinux.org/other/sane/$pkgname-backends-$pkgver.tar.gz
         'sane.xinetd'
         'saned.socket'
-        'saned.service')
+        'saned.service'
+        'kodakaio.c.patch'
+        'network.patch')
 options=(!libtool)
 
 build() {
   cd "${srcdir}/${pkgname}-backends-${pkgver}"
 
+   # fix FS#33657
+   patch -Np0 -i ${srcdir}/kodakaio.c.patch
+   # fix http://vasks.debian.org/tracker/?func=detail&atid=410366&aid=313760&group_id=30186
+   patch -Np1 -i ${srcdir}/network.patch
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -59,6 +66,8 @@ package () {
       "${pkgdir}/usr/lib/systemd/system/saned@.service"
 }
 md5sums=('e226a89c54173efea80e91e9a5eb6573'
-         'da946cc36fb83612162cf9505986d4b2'
+         '5f519030392d599e2ad348159ec4c96f'
          'e57e9e15528f47f5f1b3f1411135ed5d'
-         'e44bd4c994a52d6f472463d1eb0a03be')
+         'e44bd4c994a52d6f472463d1eb0a03be'
+         'e65dbefb7c3d69955fb6eb3ace14aa12'
+         '44e77692c52db15b0f530a1d9a8e1296')
diff --git a/extra/sane/kodakaio.c.patch b/extra/sane/kodakaio.c.patch
new file mode 100644
index 000000000..95cb1ee9a
--- /dev/null
+++ b/extra/sane/kodakaio.c.patch
@@ -0,0 +1,11 @@
+--- backend/kodakaio.c.bad	2013-01-31 20:42:10.627296894 +0100
++++ backend/kodakaio.c	2013-01-31 20:42:46.040397213 +0100
+@@ -2197,7 +2197,7 @@
+ 
+ 	reply = cupsGetDevices(CUPS_HTTP_DEFAULT, CUPS_TIMEOUT_DEFAULT, 
+ 		"dnssd", CUPS_EXCLUDE_NONE, ProcessDevice, Dummy);
+-	if(reply != IPP_OK) printf("Failed cupsGetDevices\n");
++	if(reply != IPP_OK) DBG(1, "Failed cupsGetDevices\n");
+ 
+ 	return 0;
+ }
diff --git a/extra/sane/libv4l-0.8.3.patch b/extra/sane/libv4l-0.8.3.patch
deleted file mode 100644
index 4e240e0cf..000000000
--- a/extra/sane/libv4l-0.8.3.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 26c69b228b29f612faf4b0cc85db969ee7cc4ea6 Mon Sep 17 00:00:00 2001
-From: Nils Philippsen <nils@redhat.com>
-Date: Mon, 14 Mar 2011 13:35:05 +0100
-Subject: [PATCH] patch: v4l
-
-Squashed commit of the following:
-
-commit 23381932c76846191b42a48e505b37cd74711265
-Author: Julien BLACHE <jb@jblache.org>
-Date:   Wed Feb 16 19:37:43 2011 +0100
-
-    Fix v4l build with libv4l 0.8.3+
-
-    (cherry picked from commit c5ca46c2d1be78c651afb843cc834cf2b5b24953)
-
-    Conflicts:
-
-    	ChangeLog
-
-    Signed-off-by: Nils Philippsen <nils@redhat.com>
----
- backend/v4l.c |    3 +--
- backend/v4l.h |    3 ++-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/backend/v4l.c b/backend/v4l.c
-index 6510ef0..38595ed 100644
---- a/backend/v4l.c
-+++ b/backend/v4l.c
-@@ -84,9 +84,8 @@
- #include "../include/sane/sanei_config.h"
- #define V4L_CONFIG_FILE "v4l.conf"
- 
--#include "v4l.h"
--
- #include <libv4l1.h>
-+#include "v4l.h"
- 
- static const SANE_Device **devlist = NULL;
- static int num_devices;
-diff --git a/backend/v4l.h b/backend/v4l.h
-index 588b96e..6aee586 100644
---- a/backend/v4l.h
-+++ b/backend/v4l.h
-@@ -29,6 +29,7 @@
- #ifndef v4l_h
- #define v4l_h
- 
-+#ifndef __LINUX_VIDEODEV_H
- /* Kernel interface */
- /* Only the stuff we need. For more features, more defines are needed */
- 
-@@ -165,7 +166,7 @@ struct video_channel
- 
- 
- /* end of kernel interface */
--
-+#endif /* !__LINUX_VIDEODEV_H */
- 
- #include <../include/sane/sane.h>
- 
--- 
-1.7.4
-
diff --git a/extra/sane/network.patch b/extra/sane/network.patch
new file mode 100644
index 000000000..2605ea835
--- /dev/null
+++ b/extra/sane/network.patch
@@ -0,0 +1,42 @@
+diff --git a/sanei/sanei_tcp.c b/sanei/sanei_tcp.c
+index a57d7c7..d0a1e92 100644
+--- a/sanei/sanei_tcp.c
++++ b/sanei/sanei_tcp.c
+@@ -45,6 +45,7 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <time.h>
+ 
+ #ifdef HAVE_WINSOCK2_H
+ #include <winsock2.h>
+@@ -123,14 +124,27 @@ sanei_tcp_write(int fd, const u_char * buf, int count)
+ ssize_t
+ sanei_tcp_read(int fd, u_char * buf, int count)
+ {
+-        ssize_t bytes_recv = 0, rc = 1;
++    ssize_t bytes_recv = 0, rc = 1;
++	int retry = 5;
+ 
+ 	while (bytes_recv < count && rc > 0)
+ 	{
+ 		rc = recv(fd, buf+bytes_recv, count-bytes_recv, 0);
++		DBG(1, "%s: bytes received %d\n", __FUNCTION__, rc);
+ 		if (rc > 0)
+ 		  bytes_recv += rc;
+-
++		else {
++			if ( errno == EAGAIN && retry-- ) {
++				DBG(1, "%s: waiting  %d\n", __FUNCTION__, retry);
++				/* wait for max 1s */
++				struct timespec req;
++				struct timespec rem;
++				req.tv_sec = 0;
++				req.tv_nsec= 100000000;
++				nanosleep(&req, &rem);	
++				rc = 1;
++			}
++		}
+ 	}
+ 	return bytes_recv;
+ }
diff --git a/extra/sane/sane.xinetd b/extra/sane/sane.xinetd
index b035664b4..67f08a656 100644
--- a/extra/sane/sane.xinetd
+++ b/extra/sane/sane.xinetd
@@ -3,7 +3,7 @@ service sane-port
 	port        = 6566
 	socket_type = stream
 	wait        = no
-	user        = root
+	user        = nobody 
 	group       = scanner
 	server      = /usr/sbin/saned
 	# disabled by default!
diff --git a/extra/sane/xerox_mfp_fix_usb_devices.patch b/extra/sane/xerox_mfp_fix_usb_devices.patch
deleted file mode 100644
index 5ed29b974..000000000
--- a/extra/sane/xerox_mfp_fix_usb_devices.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7
-Author: Alex Belkin <abc@telekom.ru>
-Date:   Tue Mar 8 17:57:19 2011 +0300
-
-    keep usb device by default (correct for bug introduced by tcp sub-backend
-
-diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
-index e08b50f..d4672a7 100644
---- a/backend/xerox_mfp.c
-+++ b/backend/xerox_mfp.c
-@@ -37,10 +37,10 @@
- static const SANE_Device **devlist = NULL;	/* sane_get_devices array */
- static struct device *devices_head = NULL;	/* sane_get_devices list */
- 
--transport available_transports[] = {
-+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
-+transport available_transports[TRANSPORTS_MAX] = {
-     { "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
-     { "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
--    { 0 }
- };
- 
- static int resolv_state(int state)
-@@ -824,7 +824,13 @@ free_devices (void)
-   devices_head = NULL;
- }
- 
--/* SANE API ignores return code of this callback */
-+static transport *tr_from_devname(SANE_String_Const devname)
-+{
-+  if (strncmp("tcp", devname, 3) == 0)
-+    return &available_transports[TRANSPORT_TCP];
-+  return &available_transports[TRANSPORT_USB];
-+}
-+
- static SANE_Status
- list_one_device (SANE_String_Const devname)
- {
-@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
-       return SANE_STATUS_GOOD;
-   }
- 
--  for (tr = available_transports; tr->ttype; tr++) {
--    if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--      break;
--  }
--  if (!tr->ttype)
--    return SANE_STATUS_INVAL;
-+  tr = tr_from_devname(devname);
- 
-   dev = calloc (1, sizeof (struct device));
-   if (dev == NULL)
-@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
- static SANE_Status
- list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
- {
--    transport *tr;
--
--    for (tr = available_transports; tr->ttype; tr++) {
--	if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
--	    return tr->configure_device(devname, list_one_device);
--    }
--    return	SANE_STATUS_INVAL;
-+  return tr_from_devname(devname)->configure_device(devname, list_one_device);
- }
- 
- SANE_Status
diff --git a/extra/swt/PKGBUILD b/extra/swt/PKGBUILD
index 94c7bc9ec..117266eec 100644
--- a/extra/swt/PKGBUILD
+++ b/extra/swt/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 173193 2012-12-12 16:57:29Z guillaume $
+# $Id: PKGBUILD 178694 2013-02-26 10:20:09Z guillaume $
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 pkgname=swt
 pkgver=4.2.1
-pkgrel=1
+pkgrel=2
 _date=201209141800
-pkgdesc="An open source widget toolkit for Java"
+pkgdesc='An open source widget toolkit for Java'
 arch=('i686' 'x86_64')
-url="http://www.eclipse.org/swt/"
+url='http://www.eclipse.org/swt/'
 license=('EPL')
 depends=('java-runtime>=6' 'gtk2>=2.20.1' 'libxtst')
 optdepends=('libgnomeui' 'mesa' 'glu' 'libwebkit')
@@ -25,6 +25,7 @@ source=(http://download.eclipse.org/eclipse/downloads/drops4/R-${pkgver}-${_date
         build-swt.xml)
 # To test this pkg:
 # http://www.eclipse.org/swt/examples.php#standaloneOutsideEclipse
+# http://download.eclipse.org/eclipse/downloads/
 
 build() {
   cd ${srcdir}
diff --git a/extra/tomcat-native/PKGBUILD b/extra/tomcat-native/PKGBUILD
index 277778cfc..22e7cd0bc 100644
--- a/extra/tomcat-native/PKGBUILD
+++ b/extra/tomcat-native/PKGBUILD
@@ -2,16 +2,17 @@
 # Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
 
 pkgname=tomcat-native
-pkgver=1.1.24
+pkgver=1.1.27
 pkgrel=1
-pkgdesc="The Apache Tomcat Native Library"
+pkgdesc='The Apache Tomcat Native Library'
 arch=('i686' 'x86_64')
-url="http://tomcat.apache.org/"
-license=("Apache")
+url='http://tomcat.apache.org/'
+license=('APACHE')
 depends=('apr' 'openssl')
 makedepends=('java-environment')
+options=(!emptydirs)
 source=(http://www.apache.org/dist/tomcat/tomcat-connectors/native/${pkgver}/source/${pkgname}-${pkgver}-src.tar.gz)
-md5sums=('cfd4762f2da19ba79d1b6a2a948c9d21')
+sha256sums=('7f78e71060dc029f9005490080babc45a2b702ea54263c440c52a9a7c02609e4')
 
 build() {
   cd "${srcdir}/tomcat-native-${pkgver}-src/jni/native"
@@ -28,5 +29,4 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}-src/jni/native"
 
   make DESTDIR=${pkgdir} install
-  rm -rf ${pkgdir}/usr/{bin,include}
 }
diff --git a/libre/lib32-mesa-demos-libre/PKGBUILD b/libre/lib32-mesa-demos-libre/PKGBUILD
index 1719f138d..aa9fde2c3 100644
--- a/libre/lib32-mesa-demos-libre/PKGBUILD
+++ b/libre/lib32-mesa-demos-libre/PKGBUILD
@@ -1,25 +1,24 @@
-# $Id: PKGBUILD 94667 2010-10-09 11:21:35Z andyrtr $
+# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgbasename=mesa-demos-libre
 pkgname=lib32-$_pkgbasename
-pkgver=8.0.1
-pkgrel=2
+pkgver=8.1.0
+pkgrel=1
 arch=(x86_64)
-pkgdesc="Mesa demos and tools (32-bit), libre"
+pkgdesc="Mesa demos and tools (32-bit), without nonfree demos"
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-depends=('lib32-glew>=1.5.6' mesa-demos-libre)
 provides=("lib32-mesa-demos=$pkgver")
 replaces=('lib32-mesa-demos')
 conflicts=('lib32-mesa-demos')
-makedepends=(gcc-multilib)
+makedepends=(gcc-multilib 'lib32-mesa-libgl>=9.1' 'lib32-glew' 'libgl>=9.1')
 source=(ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2
         mesa-demos-libre.patch)
-md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
-         '1858e95d40ac9e5e0b59753ce9e673e3')
+md5sums=('9df33ba69a26bbfbc7c8148602e59542'
+         '5ce0660b46beb1230194fbd852d33ab0')
 
 build() {
   export CC="gcc -m32"
@@ -27,12 +26,21 @@ build() {
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   cd "${srcdir}/mesa-demos-${pkgver}"
+
+  # Remove nonfree demos (pointblast and spriteblast)
+  rm -v src/demos/{pointblast,spriteblast}.c
   patch -Np1 -i "${srcdir}/mesa-demos-libre.patch"
-  ./configure --prefix=/usr
+
+  ./configure --prefix=/usr \
+    --enable-gles1 \
+    --enable-gles2
+
   make
 }
 
 package() {
+  depends=('lib32-glew' mesa-demos-libre)
+
   cd "${srcdir}/mesa-demos-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
diff --git a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch
index c5261f8e9..d630f373c 100755
--- a/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch
+++ b/libre/lib32-mesa-demos-libre/mesa-demos-libre.patch
@@ -1,15 +1,15 @@
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//src/demos/Makefile.am
---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.am	2010-07-13 14:46:40.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/Makefile.am	2011-06-04 15:34:18.000000000 -0400
-@@ -62,7 +62,6 @@ bin_PROGRAMS = \
- 	morph3d \
+diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am
+--- mesa-demos-8.1.0.orig/src/demos/Makefile.am	2012-12-15 05:17:06.000000000 -0200
++++ mesa-demos-8.1.0/src/demos/Makefile.am	2013-02-26 17:22:04.845832793 -0200
+@@ -65,7 +65,6 @@
  	multiarb \
  	paltex \
+ 	pixeltest \
 -	pointblast \
  	projtex \
  	ray \
  	readpix \
-@@ -71,7 +70,6 @@ bin_PROGRAMS = \
+@@ -74,7 +73,6 @@
  	shadowtex \
  	singlebuffer \
  	spectex \
@@ -17,36 +17,34 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//sr
  	stex3d \
  	teapot \
  	terrain \
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//src/demos/Makefile.in
---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.in	2010-07-13 14:53:23.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/Makefile.in	2011-06-04 15:35:32.000000000 -0400
-@@ -73,11 +73,10 @@ host_triplet = @host@
+diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in
+--- mesa-demos-8.1.0.orig/src/demos/Makefile.in	2013-02-24 09:12:04.000000000 -0200
++++ mesa-demos-8.1.0/src/demos/Makefile.in	2013-02-26 17:48:36.711995049 -0200
+@@ -90,11 +90,11 @@
  @HAVE_GLUT_TRUE@	ipers$(EXEEXT) isosurf$(EXEEXT) \
  @HAVE_GLUT_TRUE@	lodbias$(EXEEXT) morph3d$(EXEEXT) \
  @HAVE_GLUT_TRUE@	multiarb$(EXEEXT) paltex$(EXEEXT) \
--@HAVE_GLUT_TRUE@	pointblast$(EXEEXT) projtex$(EXEEXT) \
--@HAVE_GLUT_TRUE@	ray$(EXEEXT) readpix$(EXEEXT) reflect$(EXEEXT) \
--@HAVE_GLUT_TRUE@	renormal$(EXEEXT) shadowtex$(EXEEXT) \
--@HAVE_GLUT_TRUE@	singlebuffer$(EXEEXT) spectex$(EXEEXT) \
--@HAVE_GLUT_TRUE@	spriteblast$(EXEEXT) stex3d$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	reflect$(EXEEXT) renormal$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	spectex$(EXEEXT) stex3d$(EXEEXT) \
- @HAVE_GLUT_TRUE@	teapot$(EXEEXT) terrain$(EXEEXT) \
- @HAVE_GLUT_TRUE@	tessdemo$(EXEEXT) texcyl$(EXEEXT) \
- @HAVE_GLUT_TRUE@	texenv$(EXEEXT) textures$(EXEEXT) \
-@@ -188,9 +187,6 @@ multiarb_DEPENDENCIES = ../util/libutil.
- paltex_SOURCES = paltex.c
- paltex_OBJECTS = paltex.$(OBJEXT)
- paltex_LDADD = $(LDADD)
+-@HAVE_GLUT_TRUE@	pixeltest$(EXEEXT) pointblast$(EXEEXT) \
++@HAVE_GLUT_TRUE@	pixeltest$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	reflect$(EXEEXT) renormal$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
+-@HAVE_GLUT_TRUE@	spectex$(EXEEXT) spriteblast$(EXEEXT) \
++@HAVE_GLUT_TRUE@	spectex$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	stex3d$(EXEEXT) teapot$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	terrain$(EXEEXT) tessdemo$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	texcyl$(EXEEXT) texenv$(EXEEXT) \
+@@ -219,9 +219,6 @@
+ pixeltest_SOURCES = pixeltest.c
+ pixeltest_OBJECTS = pixeltest.$(OBJEXT)
+ pixeltest_LDADD = $(LDADD)
 -pointblast_SOURCES = pointblast.c
 -pointblast_OBJECTS = pointblast.$(OBJEXT)
 -pointblast_LDADD = $(LDADD)
  projtex_SOURCES = projtex.c
  projtex_OBJECTS = projtex.$(OBJEXT)
  projtex_DEPENDENCIES = ../util/libutil.la
-@@ -215,9 +211,6 @@ singlebuffer_LDADD = $(LDADD)
+@@ -246,9 +243,6 @@
  spectex_SOURCES = spectex.c
  spectex_OBJECTS = spectex.$(OBJEXT)
  spectex_LDADD = $(LDADD)
@@ -56,66 +54,57 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr
  stex3d_SOURCES = stex3d.c
  stex3d_OBJECTS = stex3d.$(OBJEXT)
  stex3d_LDADD = $(LDADD)
-@@ -285,21 +278,20 @@ SOURCES = arbfplight.c arbfslight.c arbo
- 	fbo_firecube.c fbotexture.c fire.c fogcoord.c fplight.c \
- 	fslight.c gamma.c gearbox.c gears.c geartrain.c glinfo.c \
- 	gloss.c gltestperf.c ipers.c isosurf.c lodbias.c morph3d.c \
--	multiarb.c paltex.c pointblast.c projtex.c ray.c readpix.c \
--	reflect.c renormal.c shadowtex.c singlebuffer.c spectex.c \
--	spriteblast.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \
--	texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \
--	vao_demo.c winpos.c
-+	multiarb.c paltex.c projtex.c ray.c readpix.c reflect.c \
-+	renormal.c shadowtex.c singlebuffer.c spectex.c stex3d.c \
-+	teapot.c terrain.c tessdemo.c texcyl.c texenv.c textures.c \
-+	trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c
- DIST_SOURCES = arbfplight.c arbfslight.c arbocclude.c bounce.c \
- 	clearspd.c copypix.c cubemap.c dinoshade.c dissolve.c \
- 	drawpix.c engine.c fbo_firecube.c fbotexture.c fire.c \
- 	fogcoord.c fplight.c fslight.c gamma.c gearbox.c gears.c \
- 	geartrain.c glinfo.c gloss.c gltestperf.c ipers.c isosurf.c \
--	lodbias.c morph3d.c multiarb.c paltex.c pointblast.c projtex.c \
--	ray.c readpix.c reflect.c renormal.c shadowtex.c \
--	singlebuffer.c spectex.c spriteblast.c stex3d.c teapot.c \
--	terrain.c tessdemo.c texcyl.c texenv.c textures.c trispd.c \
--	$(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c
-+	lodbias.c morph3d.c multiarb.c paltex.c projtex.c ray.c \
-+	readpix.c reflect.c renormal.c shadowtex.c singlebuffer.c \
-+	spectex.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \
-+	texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \
-+	vao_demo.c winpos.c
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -653,9 +645,6 @@ multiarb$(EXEEXT): $(multiarb_OBJECTS) $
- paltex$(EXEEXT): $(paltex_OBJECTS) $(paltex_DEPENDENCIES) 
- 	@rm -f paltex$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(paltex_OBJECTS) $(paltex_LDADD) $(LIBS)
--pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) 
+@@ -325,8 +319,8 @@
+ 	fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
+ 	gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
+ 	ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
+-	pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
+-	renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
++	pixeltest.c projtex.c ray.c readpix.c reflect.c \
++	renormal.c shadowtex.c singlebuffer.c spectex.c \
+ 	stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
+ 	textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
+ 	winpos.c
+@@ -336,8 +330,8 @@
+ 	fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
+ 	gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
+ 	ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
+-	pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
+-	renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
++	pixeltest.c projtex.c ray.c readpix.c reflect.c \
++	renormal.c shadowtex.c singlebuffer.c spectex.c \
+ 	stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
+ 	textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
+ 	winpos.c
+@@ -722,9 +716,6 @@
+ pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) 
+ 	@rm -f pixeltest$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS)
+-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES) 
 -	@rm -f pointblast$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS)
- projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) 
+ projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES) 
  	@rm -f projtex$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS)
-@@ -680,9 +669,6 @@ singlebuffer$(EXEEXT): $(singlebuffer_OB
- spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) 
+@@ -749,9 +740,6 @@
+ spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) 
  	@rm -f spectex$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
--spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) 
+-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES) 
 -	@rm -f spriteblast$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS)
- stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) 
+ stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES) 
  	@rm -f stex3d$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS)
-@@ -756,7 +742,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/morph3d.Po@am__quote@
+@@ -828,7 +816,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@
-@@ -765,7 +750,6 @@ distclean-compile:
+@@ -837,7 +824,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@
@@ -123,1070 +112,3 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/pointblast.c mesa-demos-8.0.1//src/demos/pointblast.c
---- Desktop/mesa-demos-8.0.1//src/demos/pointblast.c	2010-07-07 13:57:15.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/pointblast.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,504 +0,0 @@
--
--/* Copyright (c) Mark J. Kilgard, 1997.  */
--
--/* This program is freely distributable without licensing fees 
--   and is provided without guarantee or warrantee expressed or 
--   implied. This program is -not- in the public domain. */
--
--/* This example demonstrates how to render particle effects
--   with OpenGL.  A cloud of pinkish/orange particles explodes with the
--   particles bouncing off the ground.  When the EXT_point_parameters
--   is present , the particle size is attenuated based on eye distance. */
--
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <math.h>       /* for cos(), sin(), and sqrt() */
--#ifdef _WIN32
--#include <windows.h>
--#endif
--#include <GL/glew.h>
--#include <GL/glut.h>
--
--/* Some <math.h> files do not define M_PI... */
--#ifndef M_PI
--#define M_PI 3.14159265
--#endif
--
--#if 0  /* For debugging. */
--#undef GL_EXT_point_parameters
--#endif
--
--static GLfloat angle = -150;   /* in degrees */
--static int spin = 0;
--static int moving, begin;
--static int newModel = 1;
--static float theTime;
--static int repeat = 1;
--static int blend = 1;
--int useMipmaps = 1;
--int linearFiltering = 1;
--
--static GLfloat constant[3] = { 1/5.0, 0.0, 0.0 };
--static GLfloat linear[3] = { 0.0, 1/5.0, 0.0 };
--static GLfloat theQuad[3] = { 0.25, 0.0, 1/60.0 };
--
--#define MAX_POINTS 2000
--
--static int numPoints = 200;
--
--static GLfloat pointList[MAX_POINTS][3];
--static GLfloat pointTime[MAX_POINTS];
--static GLfloat pointVelocity[MAX_POINTS][2];
--static GLfloat pointDirection[MAX_POINTS][2];
--static int colorList[MAX_POINTS];
--static int animate = 1, motion = 0;
--
--static GLfloat colorSet[][4] = {
--  /* Shades of red. */
--  { 0.7, 0.2, 0.4, 0.5 },
--  { 0.8, 0.0, 0.7, 0.5 },
--  { 1.0, 0.0, 0.0, 0.5 },
--  { 0.9, 0.3, 0.6, 0.5 },
--  { 1.0, 0.4, 0.0, 0.5 },
--  { 1.0, 0.0, 0.5, 0.5 },
--};
--
--#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0]))
--
--#define DEAD (NUM_COLORS+1)
--
--
--#if 0  /* drand48 might be better on Unix machines */
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48())
--#else
--static float float_rand(void) { return rand() / (float) RAND_MAX; }
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand())
--#endif
--
--#define MEAN_VELOCITY 3.0
--#define GRAVITY 2.0
--
--/* Modeling units of ground extent in each X and Z direction. */
--#define EDGE 12
--
--static void
--makePointList(void)
--{
--  float angle, velocity, direction;
--  int i;
--
--  motion = 1;
--  for (i=0; i<numPoints; i++) {
--    pointList[i][0] = 0.0;
--    pointList[i][1] = 0.0;
--    pointList[i][2] = 0.0;
--    pointTime[i] = 0.0;
--    angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0;
--    direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0;
--    pointDirection[i][0] = cos(direction);
--    pointDirection[i][1] = sin(direction);
--    velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0);
--    pointVelocity[i][0] = velocity * cos(angle);
--    pointVelocity[i][1] = velocity * sin(angle);
--    colorList[i] = rand() % NUM_COLORS;
--  }
--  theTime = 0.0;
--}
--
--static void
--updatePointList(void)
--{
--  float distance;
--  int i;
--
--  static double t0 = -1.;
--  double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
--  if (t0 < 0.0)
--    t0 = t;
--  dt = t - t0;
--  t0 = t;
--
--  motion = 0;
--  for (i=0; i<numPoints; i++) {
--    distance = pointVelocity[i][0] * theTime;
--
--    /* X and Z */
--    pointList[i][0] = pointDirection[i][0] * distance;
--    pointList[i][2] = pointDirection[i][1] * distance;
--
--    /* Z */
--    pointList[i][1] =
--      (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i];
--
--    /* If we hit the ground, bounce the point upward again. */
--    if (pointList[i][1] <= 0.0) {
--      if (distance > EDGE) {
--        /* Particle has hit ground past the distance duration of
--          the particles.  Mark particle as dead. */
--       colorList[i] = NUM_COLORS;  /* Not moving. */
--       continue;
--      }
--
--      pointVelocity[i][1] *= 0.8;  /* 80% of previous up velocity. */
--      pointTime[i] = 0.0;  /* Reset the particles sense of up time. */
--    }
--    motion = 1;
--    pointTime[i] += dt;
--  }
--  theTime += dt;
--  if (!motion && !spin) {
--    if (repeat) {
--      makePointList();
--    } else {
--      glutIdleFunc(NULL);
--    }
--  }
--}
--
--static void
--idle(void)
--{
--  updatePointList();
--  if (spin) {
--    angle += 0.3;
--    newModel = 1;
--  }
--  glutPostRedisplay();
--}
--
--static void
--visible(int vis)
--{
--  if (vis == GLUT_VISIBLE) {
--    if (animate && (motion || spin)) {
--      glutIdleFunc(idle);
--    }
--  } else {
--    glutIdleFunc(NULL);
--  }
--}
--
--static void
--recalcModelView(void)
--{
--  glPopMatrix();
--  glPushMatrix();
--  glRotatef(angle, 0.0, 1.0, 0.0);
--  newModel = 0;
--}
--
--static void
--redraw(void)
--{
--  int i;
--
--  glDepthMask(GL_TRUE);
--  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
--  if (newModel)
--    recalcModelView();
--
--
--  /* Draw the floor. */
--/*  glEnable(GL_TEXTURE_2D);*/
--  glColor3f(0.5, 1.0, 0.5);
--  glBegin(GL_QUADS);
--    glTexCoord2f(0.0, 0.0);
--    glVertex3f(-EDGE, -0.05, -EDGE);
--    glTexCoord2f(20.0, 0.0);
--    glVertex3f(EDGE, -0.05, -EDGE);
--    glTexCoord2f(20.0, 20.0);
--    glVertex3f(EDGE, -0.05, EDGE);
--    glTexCoord2f(0.0, 20.0);
--    glVertex3f(-EDGE, -0.05, EDGE);
--  glEnd();
--
--  /* Allow particles to blend with each other. */
--  glDepthMask(GL_FALSE);
--
--  if (blend)
--     glEnable(GL_BLEND);
--
--  glDisable(GL_TEXTURE_2D);
--  glBegin(GL_POINTS);
--    for (i=0; i<numPoints; i++) {
--      /* Draw alive particles. */
--      if (colorList[i] != DEAD) {
--        glColor4fv(colorSet[colorList[i]]);
--        glVertex3fv(pointList[i]);
--      }
--    }
--  glEnd();
--
--  glDisable(GL_BLEND);
--
--  glutSwapBuffers();
--}
--
--/* ARGSUSED2 */
--static void
--mouse(int button, int state, int x, int y)
--{
--  /* Scene can be spun around Y axis using left
--     mouse button movement. */
--  if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) {
--    moving = 1;
--    begin = x;
--  }
--  if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) {
--    moving = 0;
--  }
--}
--
--/* ARGSUSED1 */
--static void
--mouseMotion(int x, int y)
--{
--  if (moving) {
--    angle = angle + (x - begin);
--    begin = x;
--    newModel = 1;
--    glutPostRedisplay();
--  }
--}
--
--static void
--menu(int option)
--{
--  switch (option) {
--  case 0:
--    makePointList();
--    break;
--#ifdef GL_ARB_point_parameters
--  case 1:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant);
--    break;
--  case 2:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear);
--    break;
--  case 3:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--    break;
--#endif
--  case 4:
--    blend = 1;
--    break;
--  case 5:
--    blend = 0;
--    break;
--#ifdef GL_ARB_point_parameters
--  case 6:
--    glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0);
--    break;
--  case 7:
--    glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0);
--    break;
--#endif
--  case 8:
--    glEnable(GL_POINT_SMOOTH);
--    break;
--  case 9:
--    glDisable(GL_POINT_SMOOTH);
--    break;
--  case 10:
--    glPointSize(2.0);
--    break;
--  case 11:
--    glPointSize(4.0);
--    break;
--  case 12:
--    glPointSize(8.0);
--    break;
--  case 13:
--    spin = 1 - spin;
--    if (animate && (spin || motion)) {
--      glutIdleFunc(idle);
--    } else {
--      glutIdleFunc(NULL);
--    }
--    break;
--  case 14:
--    numPoints = 200;
--    break;
--  case 15:
--    numPoints = 500;
--    break;
--  case 16:
--    numPoints = 1000;
--    break;
--  case 17:
--    numPoints = 2000;
--    break;
--  case 666:
--    exit(0);
--  }
--  glutPostRedisplay();
--}
--
--/* ARGSUSED1 */
--static void
--key(unsigned char c, int x, int y)
--{
--  switch (c) {
--  case 13:
--    animate = 1 - animate;  /* toggle. */
--    if (animate && (motion || spin)) {
--      glutIdleFunc(idle);
--    } else {
--      glutIdleFunc(NULL);
--    }
--    break;
--  case ' ':
--    animate = 1;
--    makePointList();
--    glutIdleFunc(idle);
--    break;
--  case 27:
--    exit(0);
--  }
--}
--
--/* Nice floor texture tiling pattern. */
--static char *circles[] = {
--  "....xxxx........",
--  "..xxxxxxxx......",
--  ".xxxxxxxxxx.....",
--  ".xxx....xxx.....",
--  "xxx......xxx....",
--  "xxx......xxx....",
--  "xxx......xxx....",
--  "xxx......xxx....",
--  ".xxx....xxx.....",
--  ".xxxxxxxxxx.....",
--  "..xxxxxxxx......",
--  "....xxxx........",
--  "................",
--  "................",
--  "................",
--  "................",
--};
--
--static void
--makeFloorTexture(void)
--{
--  GLubyte floorTexture[16][16][3];
--  GLubyte *loc;
--  int s, t;
--
--  /* Setup RGB image for the texture. */
--  loc = (GLubyte*) floorTexture;
--  for (t = 0; t < 16; t++) {
--    for (s = 0; s < 16; s++) {
--      if (circles[t][s] == 'x') {
--        /* Nice blue. */
--        loc[0] = 0x1f;
--        loc[1] = 0x1f;
--        loc[2] = 0x8f;
--      } else {
--        /* Light gray. */
--        loc[0] = 0xca;
--        loc[1] = 0xca;
--        loc[2] = 0xca;
--      }
--      loc += 3;
--    }
--  }
--
--  glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
--
--  if (useMipmaps) {
--    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
--      GL_LINEAR_MIPMAP_LINEAR);
--    gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 16, 16,
--      GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
--  } else {
--    if (linearFiltering) {
--      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
--    } else {
--      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
--    }
--    glTexImage2D(GL_TEXTURE_2D, 0, 3, 16, 16, 0,
--      GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
--  }
--}
--
--int
--main(int argc, char **argv)
--{
--  int i;
--
--  glutInitWindowSize(300, 300);
--  glutInit(&argc, argv);
--  glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
--
--  for (i=1; i<argc; i++) {
--    if(!strcmp("-noms", argv[i])) {
--      glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
--      printf("forcing no multisampling\n");
--    } else if(!strcmp("-nomipmaps", argv[i])) {
--      useMipmaps = 0;
--    } else if(!strcmp("-nearest", argv[i])) {
--      linearFiltering = 0;
--    }
--  }
--
--  glutCreateWindow("point burst");
--  glewInit();
--  glutDisplayFunc(redraw);
--  glutMouseFunc(mouse);
--  glutMotionFunc(mouseMotion);
--  glutVisibilityFunc(visible);
--  glutKeyboardFunc(key);
--  glutCreateMenu(menu);
--  glutAddMenuEntry("Reset time", 0);
--  glutAddMenuEntry("Constant", 1);
--  glutAddMenuEntry("Linear", 2);
--  glutAddMenuEntry("Quadratic", 3);
--  glutAddMenuEntry("Blend on", 4);
--  glutAddMenuEntry("Blend off", 5);
--  glutAddMenuEntry("Threshold 1", 6);
--  glutAddMenuEntry("Threshold 10", 7);
--  glutAddMenuEntry("Point smooth on", 8);
--  glutAddMenuEntry("Point smooth off", 9);
--  glutAddMenuEntry("Point size 2", 10);
--  glutAddMenuEntry("Point size 4", 11);
--  glutAddMenuEntry("Point size 8", 12);
--  glutAddMenuEntry("Toggle spin", 13);
--  glutAddMenuEntry("200 points ", 14);
--  glutAddMenuEntry("500 points ", 15);
--  glutAddMenuEntry("1000 points ", 16);
--  glutAddMenuEntry("2000 points ", 17);
--  glutAddMenuEntry("Quit", 666);
--  glutAttachMenu(GLUT_RIGHT_BUTTON);
--
--  if (!glutExtensionSupported("GL_ARB_point_parameters")) {
--    fprintf(stderr, "Sorry, GL_ARB_point_parameters is not supported.\n");
--    return -1;
--  }
--
--  glShadeModel(GL_FLAT);
--  glEnable(GL_DEPTH_TEST);
--  glEnable(GL_POINT_SMOOTH);
--  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
--  glPointSize(8.0);
--#if GL_ARB_point_parameters
--  glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--#endif
--  glMatrixMode(GL_PROJECTION);
--  gluPerspective( /* field of view in degree */ 40.0,
--  /* aspect ratio */ 1.0,
--    /* Z near */ 0.5, /* Z far */ 40.0);
--  glMatrixMode(GL_MODELVIEW);
--  gluLookAt(0.0, 1.0, 8.0, /* eye location */
--    0.0, 1.0, 0.0,      /* center is at (0,0,0) */
--    0.0, 1.0, 0.);      /* up is in postivie Y direction */
--  glPushMatrix();       /* dummy push so we can pop on model
--                           recalc */
--
--  makePointList();
--  makeFloorTexture();
--
--  glutMainLoop();
--  return 0;             /* ANSI C requires main to return int. */
--}
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c mesa-demos-8.0.1//src/demos/spriteblast.c
---- Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c	2010-07-07 13:57:15.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/spriteblast.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,555 +0,0 @@
--
--/* Copyright (c) Mark J. Kilgard, 1997.  */
--
--/* This program is freely distributable without licensing fees 
--   and is provided without guarantee or warrantee expressed or 
--   implied. This program is -not- in the public domain. */
--
--/* This example demonstrates how to render particle effects
--   with OpenGL.  A cloud of pinkish/orange particles explodes with the
--   particles bouncing off the ground.  When the EXT_point_parameters
--   is present , the particle size is attenuated based on eye distance. */
--
--
--/* Modified by Brian Paul to test GL_ARB_point_sprite */
--
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <math.h>       /* for cos(), sin(), and sqrt() */
--#ifdef _WIN32
--#include <windows.h>
--#endif
--#include <GL/glew.h>
--#include <GL/glut.h>
--
--/* Some <math.h> files do not define M_PI... */
--#ifndef M_PI
--#define M_PI 3.14159265
--#endif
--
--#if 0  /* For debugging. */
--#undef GL_EXT_point_parameters
--#endif
--
--static GLfloat angle = -150;   /* in degrees */
--static int spin = 0;
--static int moving, begin;
--static float theTime;
--static int repeat = 1;
--static int blend = 1;
--int useMipmaps = 1;
--int linearFiltering = 1;
--
--static GLfloat constant[3] = { .2,  0.0,     0.0 };
--static GLfloat linear[3]   = { .0,   .1,     0.0 };
--static GLfloat theQuad[3]  = { .005, 0.1, 1/600.0 };
--
--#define MAX_POINTS 2000
--
--static int numPoints = 200;
--
--static GLfloat pointList[MAX_POINTS][3];
--static GLfloat pointTime[MAX_POINTS];
--static GLfloat pointVelocity[MAX_POINTS][2];
--static GLfloat pointDirection[MAX_POINTS][2];
--static int colorList[MAX_POINTS];
--static int animate = 1, motion = 0, org = 0, sprite = 1, smooth = 1;
--
--static GLfloat colorSet[][4] = {
--  /* Shades of red. */
--  { 0.7, 0.2, 0.4, 0.5 },
--  { 0.8, 0.0, 0.7, 0.5 },
--  { 1.0, 0.0, 0.0, 0.5 },
--  { 0.9, 0.3, 0.6, 0.5 },
--  { 1.0, 0.4, 0.0, 0.5 },
--  { 1.0, 0.0, 0.5, 0.5 },
--};
--
--#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0]))
--
--#define DEAD (NUM_COLORS+1)
--
--
--/* GL */
--static GLint spritePattern[16][16] = {
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
--   { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0 },
--   { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0 },
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
--};
--
--
--
--
--#if 0  /* drand48 might be better on Unix machines */
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48())
--#else
--static float float_rand(void) { return rand() / (float) RAND_MAX; }
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand())
--#endif
--
--#define MEAN_VELOCITY 3.0
--#define GRAVITY 2.0
--
--/* Modeling units of ground extent in each X and Z direction. */
--#define EDGE 12
--
--static void
--makePointList(void)
--{
--  float angle, velocity, direction;
--  int i;
--
--  motion = 1;
--  for (i=0; i<numPoints; i++) {
--    pointList[i][0] = 0.0;
--    pointList[i][1] = 0.0;
--    pointList[i][2] = 0.0;
--    pointTime[i] = 0.0;
--    angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0;
--    direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0;
--    pointDirection[i][0] = cos(direction);
--    pointDirection[i][1] = sin(direction);
--    velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0);
--    pointVelocity[i][0] = velocity * cos(angle);
--    pointVelocity[i][1] = velocity * sin(angle);
--    colorList[i] = rand() % NUM_COLORS;
--  }
--  theTime = 0.0;
--}
--
--static void
--updatePointList(void)
--{
--  float distance;
--  int i;
--
--  static double t0 = -1.;
--  double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
--  if (t0 < 0.0)
--    t0 = t;
--  dt = t - t0;
--  t0 = t;
--
--  motion = 0;
--  for (i=0; i<numPoints; i++) {
--    distance = pointVelocity[i][0] * theTime;
--
--    /* X and Z */
--    pointList[i][0] = pointDirection[i][0] * distance;
--    pointList[i][2] = pointDirection[i][1] * distance;
--
--    /* Z */
--    pointList[i][1] =
--      (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i];
--
--    /* If we hit the ground, bounce the point upward again. */
--    if (pointList[i][1] <= 0.0) {
--      if (distance > EDGE) {
--        /* Particle has hit ground past the distance duration of
--          the particles.  Mark particle as dead. */
--       colorList[i] = NUM_COLORS;  /* Not moving. */
--       continue;
--      }
--
--      pointVelocity[i][1] *= 0.8;  /* 80% of previous up velocity. */
--      pointTime[i] = 0.0;  /* Reset the particles sense of up time. */
--    }
--    motion = 1;
--    pointTime[i] += dt;
--  }
--  theTime += dt;
--  if (!motion && !spin) {
--    if (repeat) {
--      makePointList();
--    } else {
--      glutIdleFunc(NULL);
--    }
--  }
--}
--
--static void
--idle(void)
--{
--  updatePointList();
--  if (spin) {
--    angle += 0.3;
--  }
--  glutPostRedisplay();
--}
--
--static void
--visible(int vis)
--{
--  if (vis == GLUT_VISIBLE) {
--    if (animate && (motion || spin)) {
--      glutIdleFunc(idle);
--    }
--  } else {
--    glutIdleFunc(NULL);
--  }
--}
--
--static void
--redraw(void)
--{
--  int i;
--
--  glDepthMask(GL_TRUE);
--  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
--
--  glPushMatrix();
--  glRotatef(15.0, 1.0, 0.0, 0.0);
--  glRotatef(angle, 0.0, 1.0, 0.0);
--
--
--  /* Draw the floor. */
--/*  glEnable(GL_TEXTURE_2D);*/
--  glColor3f(0.1, 0.5, 1.0);
--  glBegin(GL_QUADS);
--    glTexCoord2f(0.0, 0.0);
--    glVertex3f(-EDGE, -0.05, -EDGE);
--    glTexCoord2f(20.0, 0.0);
--    glVertex3f(EDGE, -0.05, -EDGE);
--    glTexCoord2f(20.0, 20.0);
--    glVertex3f(EDGE, -0.05, EDGE);
--    glTexCoord2f(0.0, 20.0);
--    glVertex3f(-EDGE, -0.05, EDGE);
--  glEnd();
--
--  /* Allow particles to blend with each other. */
--  glDepthMask(GL_FALSE);
--
--  if (blend)
--     glEnable(GL_BLEND);
--
--  if (sprite) {
--     glEnable(GL_TEXTURE_2D);
--#ifdef GL_ARB_point_sprite
--     glEnable(GL_POINT_SPRITE_ARB);
--#endif
--  }
--
--  glColor3f(1,1,1);
--  glBegin(GL_POINTS);
--    for (i=0; i<numPoints; i++) {
--      /* Draw alive particles. */
--      if (colorList[i] != DEAD) {
--        if (!sprite) glColor4fv(colorSet[colorList[i]]);
--        glVertex3fv(pointList[i]);
--      }
--    }
--  glEnd();
--
--  glDisable(GL_TEXTURE_2D);
--#ifdef GL_ARB_point_sprite
--  glDisable(GL_POINT_SPRITE_ARB);
--#endif
--  glDisable(GL_BLEND);
--
--  glPopMatrix();
--
--  glutSwapBuffers();
--}
--
--/* ARGSUSED2 */
--static void
--mouse(int button, int state, int x, int y)
--{
--  /* Scene can be spun around Y axis using left
--     mouse button movement. */
--  if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) {
--    moving = 1;
--    begin = x;
--  }
--  if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) {
--    moving = 0;
--  }
--}
--
--/* ARGSUSED1 */
--static void
--mouseMotion(int x, int y)
--{
--  if (moving) {
--    angle = angle + (x - begin);
--    begin = x;
--    glutPostRedisplay();
--  }
--}
--
--static void
--menu(int option)
--{
--  switch (option) {
--  case 0:
--    makePointList();
--    break;
--#ifdef GL_ARB_point_parameters
--  case 1:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant);
--    break;
--  case 2:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear);
--    break;
--  case 3:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--    break;
--#endif
--  case 4:
--    blend = 1;
--    break;
--  case 5:
--    blend = 0;
--    break;
--#ifdef GL_ARB_point_parameters
--  case 6:
--    glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0);
--    break;
--  case 7:
--    glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0);
--    break;
--#endif
--  case 8:
--    glEnable(GL_POINT_SMOOTH);
--    smooth = 1;
--    break;
--  case 9:
--    glDisable(GL_POINT_SMOOTH);
--    smooth = 0;
--    break;
--  case 10:
--    glPointSize(16.0);
--    break;
--  case 11:
--    glPointSize(32.0);
--    break;
--  case 12:
--    glPointSize(64.0);
--    break;
--  case 13:
--    spin = 1 - spin;
--    if (animate && (spin || motion)) {
--      glutIdleFunc(idle);
--    } else {
--      glutIdleFunc(NULL);
--    }
--    break;
--  case 14:
--    numPoints = 200;
--    break;
--  case 15:
--    numPoints = 500;
--    break;
--  case 16:
--    numPoints = 1000;
--    break;
--  case 17:
--    numPoints = 2000;
--    break;
--  case 666:
--    exit(0);
--  }
--  glutPostRedisplay();
--}
--
--/* ARGSUSED1 */
--static void
--key(unsigned char c, int x, int y)
--{
--  switch (c) {
--  case 13:
--    animate = 1 - animate;  /* toggle. */
--    if (animate && (motion || spin)) {
--      glutIdleFunc(idle);
--    } else {
--      glutIdleFunc(NULL);
--    }
--    break;
--  case ' ':
--    animate = 1;
--    makePointList();
--    glutIdleFunc(idle);
--    break;
--  case 'o':
--  case 'O':
--    org ^= 1;
--#ifdef GL_VERSION_2_0
--#ifdef GL_ARB_point_parameters
--    glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN,
--                      org ? GL_LOWER_LEFT : GL_UPPER_LEFT);
--#endif
--#endif
--    glutPostRedisplay();
--    break;
--  case 't':
--  case 'T':
--    sprite ^= 1;
--    glutPostRedisplay();
--    break;
--  case 's':
--  case 'S':
--    (smooth ^= 1) ? glEnable(GL_POINT_SMOOTH) : glDisable(GL_POINT_SMOOTH);
--    glutPostRedisplay();
--    break;
--  case '0':
--    glPointSize(1.0);
--    glutPostRedisplay();
--    break;
--  case '1':
--    glPointSize(16.0);
--    glutPostRedisplay();
--    break;
--  case '2':
--    glPointSize(32.0);
--    glutPostRedisplay();
--    break;
--  case '3':
--    glPointSize(64.0);
--    glutPostRedisplay();
--    break;
--  case '4':
--    glPointSize(128.0);
--    glutPostRedisplay();
--    break;
--  case 27:
--    exit(0);
--  }
--}
--
--
--
--static void
--makeSprite(void)
--{
--   GLubyte texture[16][16][4];
--   int i, j;
--
--   if (!glutExtensionSupported("GL_ARB_point_sprite")) {
--      printf("Sorry, this demo requires GL_ARB_point_sprite.\n");
--      exit(0);
--   }
--   if (!glutExtensionSupported("GL_ARB_point_parameters")) {
--      printf("Sorry, this demo requires GL_ARB_point_parameters.\n");
--      exit(0);
--   }
--
--   for (i = 0; i < 16; i++) {
--      for (j = 0; j < 16; j++) {
--         if (spritePattern[i][j]) {
--            texture[i][j][0] = 255;
--            texture[i][j][1] = 255;
--            texture[i][j][2] = 255;
--            texture[i][j][3] = 255;
--         }
--         else {
--            texture[i][j][0] = 255;
--            texture[i][j][1] = 0;
--            texture[i][j][2] = 0;
--            texture[i][j][3] = 0;
--         }
--      }
--   }
--
--   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE,
--                texture);
--   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
--   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
--#ifdef GL_ARB_point_sprite
--   glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
--#endif
--}
--
--
--static void
--reshape(int width, int height)
--{
--  GLfloat h = (GLfloat) height / (GLfloat) width;
--
--  glViewport(0, 0, (GLint) width, (GLint) height);
--  glMatrixMode(GL_PROJECTION);
--  glLoadIdentity();
--  glFrustum(-1.0, 1.0, -h, h, 2.0, 30.0);
--  glMatrixMode(GL_MODELVIEW);
--  glLoadIdentity();
--  glTranslatef(0.0, 0.0, -10.0);
--}
--
--int
--main(int argc, char **argv)
--{
--  int i;
--
--  glutInitWindowSize(600,300);
--  glutInit(&argc, argv);
--  glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
--
--  for (i=1; i<argc; i++) {
--    if(!strcmp("-noms", argv[i])) {
--      glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
--      printf("forcing no multisampling\n");
--    } else if(!strcmp("-nomipmaps", argv[i])) {
--      useMipmaps = 0;
--    } else if(!strcmp("-nearest", argv[i])) {
--      linearFiltering = 0;
--    }
--  }
--  glutCreateWindow("sprite blast");
--  glewInit();
--  glutReshapeFunc(reshape);
--  glutDisplayFunc(redraw);
--  glutMouseFunc(mouse);
--  glutMotionFunc(mouseMotion);
--  glutVisibilityFunc(visible);
--  glutKeyboardFunc(key);
--  glutCreateMenu(menu);
--  glutAddMenuEntry("Reset time", 0);
--  glutAddMenuEntry("Constant", 1);
--  glutAddMenuEntry("Linear", 2);
--  glutAddMenuEntry("Quadratic", 3);
--  glutAddMenuEntry("Blend on", 4);
--  glutAddMenuEntry("Blend off", 5);
--  glutAddMenuEntry("Threshold 1", 6);
--  glutAddMenuEntry("Threshold 10", 7);
--  glutAddMenuEntry("Point smooth on", 8);
--  glutAddMenuEntry("Point smooth off", 9);
--  glutAddMenuEntry("Point size 16", 10);
--  glutAddMenuEntry("Point size 32", 11);
--  glutAddMenuEntry("Point size 64", 12);
--  glutAddMenuEntry("Toggle spin", 13);
--  glutAddMenuEntry("200 points ", 14);
--  glutAddMenuEntry("500 points ", 15);
--  glutAddMenuEntry("1000 points ", 16);
--  glutAddMenuEntry("2000 points ", 17);
--  glutAddMenuEntry("Quit", 666);
--  glutAttachMenu(GLUT_RIGHT_BUTTON);
--
--  makePointList();
--  makeSprite();
--
--  glShadeModel(GL_FLAT);
--  glEnable(GL_DEPTH_TEST);
--  glEnable(GL_POINT_SMOOTH);
--  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
--  glPointSize(32.0);
--#ifdef GL_ARB_point_parameters
--  glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--#endif
--
--  glutMainLoop();
--  return 0;             /* ANSI C requires main to return int. */
--}
diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD
index 31170b19f..46f2b42b4 100644
--- a/libre/mesa-demos-libre/PKGBUILD
+++ b/libre/mesa-demos-libre/PKGBUILD
@@ -1,29 +1,33 @@
-# $Id: PKGBUILD 151279 2012-02-25 12:34:03Z pierre $
+# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor (Parabola): <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): <emulatorman@lavabit.com>
 
 pkgname='mesa-demos-libre'
-pkgver=8.0.1
-pkgrel=2
+pkgver=8.1.0
+pkgrel=1
 arch=('i686' 'x86_64')
-pkgdesc="Mesa demos and tools, libre"
+pkgdesc="Mesa demos and tools, without nonfree demos"
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-depends=('glew')
+depends=('libgl' 'glew')
 provides=("mesa-demos=$pkgver")
 replaces=('mesa-demos')
 conflicts=('mesa-demos')
 source=("ftp://ftp.freedesktop.org/pub/mesa/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2"
-        mesa-demos-libre.patch
-        LICENSE)
-md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
-         '1858e95d40ac9e5e0b59753ce9e673e3'
-         '5c65a0fe315dd347e09b1f2826a1df5a')
+        'LICENSE'
+        'mesa-demos-libre.patch')
+sha256sums=('9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828'
+            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+            '476f58fc62e9074936643b0d61165c5160a6d5aed082e60c10b39d219f56913f')
 
 build() {
   cd "${srcdir}/mesa-demos-${pkgver}"
+
+  # Remove nonfree demos (pointblast and spriteblast)
+  rm -v src/demos/{pointblast,spriteblast}.c
   patch -Np1 -i "${srcdir}/mesa-demos-libre.patch"
+
   ./configure --prefix=/usr
   make
 }
diff --git a/libre/mesa-demos-libre/mesa-demos-libre.patch b/libre/mesa-demos-libre/mesa-demos-libre.patch
index c5261f8e9..d630f373c 100755
--- a/libre/mesa-demos-libre/mesa-demos-libre.patch
+++ b/libre/mesa-demos-libre/mesa-demos-libre.patch
@@ -1,15 +1,15 @@
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//src/demos/Makefile.am
---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.am	2010-07-13 14:46:40.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/Makefile.am	2011-06-04 15:34:18.000000000 -0400
-@@ -62,7 +62,6 @@ bin_PROGRAMS = \
- 	morph3d \
+diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.am mesa-demos-8.1.0/src/demos/Makefile.am
+--- mesa-demos-8.1.0.orig/src/demos/Makefile.am	2012-12-15 05:17:06.000000000 -0200
++++ mesa-demos-8.1.0/src/demos/Makefile.am	2013-02-26 17:22:04.845832793 -0200
+@@ -65,7 +65,6 @@
  	multiarb \
  	paltex \
+ 	pixeltest \
 -	pointblast \
  	projtex \
  	ray \
  	readpix \
-@@ -71,7 +70,6 @@ bin_PROGRAMS = \
+@@ -74,7 +73,6 @@
  	shadowtex \
  	singlebuffer \
  	spectex \
@@ -17,36 +17,34 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.am mesa-demos-8.0.1//sr
  	stex3d \
  	teapot \
  	terrain \
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//src/demos/Makefile.in
---- Desktop/mesa-demos-8.0.1//src/demos/Makefile.in	2010-07-13 14:53:23.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/Makefile.in	2011-06-04 15:35:32.000000000 -0400
-@@ -73,11 +73,10 @@ host_triplet = @host@
+diff -Nur mesa-demos-8.1.0.orig/src/demos/Makefile.in mesa-demos-8.1.0/src/demos/Makefile.in
+--- mesa-demos-8.1.0.orig/src/demos/Makefile.in	2013-02-24 09:12:04.000000000 -0200
++++ mesa-demos-8.1.0/src/demos/Makefile.in	2013-02-26 17:48:36.711995049 -0200
+@@ -90,11 +90,11 @@
  @HAVE_GLUT_TRUE@	ipers$(EXEEXT) isosurf$(EXEEXT) \
  @HAVE_GLUT_TRUE@	lodbias$(EXEEXT) morph3d$(EXEEXT) \
  @HAVE_GLUT_TRUE@	multiarb$(EXEEXT) paltex$(EXEEXT) \
--@HAVE_GLUT_TRUE@	pointblast$(EXEEXT) projtex$(EXEEXT) \
--@HAVE_GLUT_TRUE@	ray$(EXEEXT) readpix$(EXEEXT) reflect$(EXEEXT) \
--@HAVE_GLUT_TRUE@	renormal$(EXEEXT) shadowtex$(EXEEXT) \
--@HAVE_GLUT_TRUE@	singlebuffer$(EXEEXT) spectex$(EXEEXT) \
--@HAVE_GLUT_TRUE@	spriteblast$(EXEEXT) stex3d$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	reflect$(EXEEXT) renormal$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
-+@HAVE_GLUT_TRUE@	spectex$(EXEEXT) stex3d$(EXEEXT) \
- @HAVE_GLUT_TRUE@	teapot$(EXEEXT) terrain$(EXEEXT) \
- @HAVE_GLUT_TRUE@	tessdemo$(EXEEXT) texcyl$(EXEEXT) \
- @HAVE_GLUT_TRUE@	texenv$(EXEEXT) textures$(EXEEXT) \
-@@ -188,9 +187,6 @@ multiarb_DEPENDENCIES = ../util/libutil.
- paltex_SOURCES = paltex.c
- paltex_OBJECTS = paltex.$(OBJEXT)
- paltex_LDADD = $(LDADD)
+-@HAVE_GLUT_TRUE@	pixeltest$(EXEEXT) pointblast$(EXEEXT) \
++@HAVE_GLUT_TRUE@	pixeltest$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	projtex$(EXEEXT) ray$(EXEEXT) readpix$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	reflect$(EXEEXT) renormal$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	shadowtex$(EXEEXT) singlebuffer$(EXEEXT) \
+-@HAVE_GLUT_TRUE@	spectex$(EXEEXT) spriteblast$(EXEEXT) \
++@HAVE_GLUT_TRUE@	spectex$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	stex3d$(EXEEXT) teapot$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	terrain$(EXEEXT) tessdemo$(EXEEXT) \
+ @HAVE_GLUT_TRUE@	texcyl$(EXEEXT) texenv$(EXEEXT) \
+@@ -219,9 +219,6 @@
+ pixeltest_SOURCES = pixeltest.c
+ pixeltest_OBJECTS = pixeltest.$(OBJEXT)
+ pixeltest_LDADD = $(LDADD)
 -pointblast_SOURCES = pointblast.c
 -pointblast_OBJECTS = pointblast.$(OBJEXT)
 -pointblast_LDADD = $(LDADD)
  projtex_SOURCES = projtex.c
  projtex_OBJECTS = projtex.$(OBJEXT)
  projtex_DEPENDENCIES = ../util/libutil.la
-@@ -215,9 +211,6 @@ singlebuffer_LDADD = $(LDADD)
+@@ -246,9 +243,6 @@
  spectex_SOURCES = spectex.c
  spectex_OBJECTS = spectex.$(OBJEXT)
  spectex_LDADD = $(LDADD)
@@ -56,66 +54,57 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr
  stex3d_SOURCES = stex3d.c
  stex3d_OBJECTS = stex3d.$(OBJEXT)
  stex3d_LDADD = $(LDADD)
-@@ -285,21 +278,20 @@ SOURCES = arbfplight.c arbfslight.c arbo
- 	fbo_firecube.c fbotexture.c fire.c fogcoord.c fplight.c \
- 	fslight.c gamma.c gearbox.c gears.c geartrain.c glinfo.c \
- 	gloss.c gltestperf.c ipers.c isosurf.c lodbias.c morph3d.c \
--	multiarb.c paltex.c pointblast.c projtex.c ray.c readpix.c \
--	reflect.c renormal.c shadowtex.c singlebuffer.c spectex.c \
--	spriteblast.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \
--	texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \
--	vao_demo.c winpos.c
-+	multiarb.c paltex.c projtex.c ray.c readpix.c reflect.c \
-+	renormal.c shadowtex.c singlebuffer.c spectex.c stex3d.c \
-+	teapot.c terrain.c tessdemo.c texcyl.c texenv.c textures.c \
-+	trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c
- DIST_SOURCES = arbfplight.c arbfslight.c arbocclude.c bounce.c \
- 	clearspd.c copypix.c cubemap.c dinoshade.c dissolve.c \
- 	drawpix.c engine.c fbo_firecube.c fbotexture.c fire.c \
- 	fogcoord.c fplight.c fslight.c gamma.c gearbox.c gears.c \
- 	geartrain.c glinfo.c gloss.c gltestperf.c ipers.c isosurf.c \
--	lodbias.c morph3d.c multiarb.c paltex.c pointblast.c projtex.c \
--	ray.c readpix.c reflect.c renormal.c shadowtex.c \
--	singlebuffer.c spectex.c spriteblast.c stex3d.c teapot.c \
--	terrain.c tessdemo.c texcyl.c texenv.c textures.c trispd.c \
--	$(tunnel_SOURCES) tunnel2.c vao_demo.c winpos.c
-+	lodbias.c morph3d.c multiarb.c paltex.c projtex.c ray.c \
-+	readpix.c reflect.c renormal.c shadowtex.c singlebuffer.c \
-+	spectex.c stex3d.c teapot.c terrain.c tessdemo.c texcyl.c \
-+	texenv.c textures.c trispd.c $(tunnel_SOURCES) tunnel2.c \
-+	vao_demo.c winpos.c
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -653,9 +645,6 @@ multiarb$(EXEEXT): $(multiarb_OBJECTS) $
- paltex$(EXEEXT): $(paltex_OBJECTS) $(paltex_DEPENDENCIES) 
- 	@rm -f paltex$(EXEEXT)
- 	$(AM_V_CCLD)$(LINK) $(paltex_OBJECTS) $(paltex_LDADD) $(LIBS)
--pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) 
+@@ -325,8 +319,8 @@
+ 	fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
+ 	gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
+ 	ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
+-	pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
+-	renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
++	pixeltest.c projtex.c ray.c readpix.c reflect.c \
++	renormal.c shadowtex.c singlebuffer.c spectex.c \
+ 	stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
+ 	textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
+ 	winpos.c
+@@ -336,8 +330,8 @@
+ 	fbotexture.c fire.c fogcoord.c fplight.c fslight.c gamma.c \
+ 	gearbox.c gears.c geartrain.c glinfo.c gloss.c gltestperf.c \
+ 	ipers.c isosurf.c lodbias.c morph3d.c multiarb.c paltex.c \
+-	pixeltest.c pointblast.c projtex.c ray.c readpix.c reflect.c \
+-	renormal.c shadowtex.c singlebuffer.c spectex.c spriteblast.c \
++	pixeltest.c projtex.c ray.c readpix.c reflect.c \
++	renormal.c shadowtex.c singlebuffer.c spectex.c \
+ 	stex3d.c teapot.c terrain.c tessdemo.c texcyl.c texenv.c \
+ 	textures.c trispd.c $(tunnel_SOURCES) tunnel2.c vao_demo.c \
+ 	winpos.c
+@@ -722,9 +716,6 @@
+ pixeltest$(EXEEXT): $(pixeltest_OBJECTS) $(pixeltest_DEPENDENCIES) $(EXTRA_pixeltest_DEPENDENCIES) 
+ 	@rm -f pixeltest$(EXEEXT)
+ 	$(AM_V_CCLD)$(LINK) $(pixeltest_OBJECTS) $(pixeltest_LDADD) $(LIBS)
+-pointblast$(EXEEXT): $(pointblast_OBJECTS) $(pointblast_DEPENDENCIES) $(EXTRA_pointblast_DEPENDENCIES) 
 -	@rm -f pointblast$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(pointblast_OBJECTS) $(pointblast_LDADD) $(LIBS)
- projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) 
+ projtex$(EXEEXT): $(projtex_OBJECTS) $(projtex_DEPENDENCIES) $(EXTRA_projtex_DEPENDENCIES) 
  	@rm -f projtex$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(projtex_OBJECTS) $(projtex_LDADD) $(LIBS)
-@@ -680,9 +669,6 @@ singlebuffer$(EXEEXT): $(singlebuffer_OB
- spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) 
+@@ -749,9 +740,6 @@
+ spectex$(EXEEXT): $(spectex_OBJECTS) $(spectex_DEPENDENCIES) $(EXTRA_spectex_DEPENDENCIES) 
  	@rm -f spectex$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(spectex_OBJECTS) $(spectex_LDADD) $(LIBS)
--spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) 
+-spriteblast$(EXEEXT): $(spriteblast_OBJECTS) $(spriteblast_DEPENDENCIES) $(EXTRA_spriteblast_DEPENDENCIES) 
 -	@rm -f spriteblast$(EXEEXT)
 -	$(AM_V_CCLD)$(LINK) $(spriteblast_OBJECTS) $(spriteblast_LDADD) $(LIBS)
- stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) 
+ stex3d$(EXEEXT): $(stex3d_OBJECTS) $(stex3d_DEPENDENCIES) $(EXTRA_stex3d_DEPENDENCIES) 
  	@rm -f stex3d$(EXEEXT)
  	$(AM_V_CCLD)$(LINK) $(stex3d_OBJECTS) $(stex3d_LDADD) $(LIBS)
-@@ -756,7 +742,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/morph3d.Po@am__quote@
+@@ -828,7 +816,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/multiarb.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/paltex.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pixeltest.Po@am__quote@
 -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointblast.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/projtex.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ray.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readpix.Po@am__quote@
-@@ -765,7 +750,6 @@ distclean-compile:
+@@ -837,7 +824,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shadowtex.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/singlebuffer.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spectex.Po@am__quote@
@@ -123,1070 +112,3 @@ diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/Makefile.in mesa-demos-8.0.1//sr
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stex3d.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/teapot.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/terrain.Po@am__quote@
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/pointblast.c mesa-demos-8.0.1//src/demos/pointblast.c
---- Desktop/mesa-demos-8.0.1//src/demos/pointblast.c	2010-07-07 13:57:15.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/pointblast.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,504 +0,0 @@
--
--/* Copyright (c) Mark J. Kilgard, 1997.  */
--
--/* This program is freely distributable without licensing fees 
--   and is provided without guarantee or warrantee expressed or 
--   implied. This program is -not- in the public domain. */
--
--/* This example demonstrates how to render particle effects
--   with OpenGL.  A cloud of pinkish/orange particles explodes with the
--   particles bouncing off the ground.  When the EXT_point_parameters
--   is present , the particle size is attenuated based on eye distance. */
--
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <math.h>       /* for cos(), sin(), and sqrt() */
--#ifdef _WIN32
--#include <windows.h>
--#endif
--#include <GL/glew.h>
--#include <GL/glut.h>
--
--/* Some <math.h> files do not define M_PI... */
--#ifndef M_PI
--#define M_PI 3.14159265
--#endif
--
--#if 0  /* For debugging. */
--#undef GL_EXT_point_parameters
--#endif
--
--static GLfloat angle = -150;   /* in degrees */
--static int spin = 0;
--static int moving, begin;
--static int newModel = 1;
--static float theTime;
--static int repeat = 1;
--static int blend = 1;
--int useMipmaps = 1;
--int linearFiltering = 1;
--
--static GLfloat constant[3] = { 1/5.0, 0.0, 0.0 };
--static GLfloat linear[3] = { 0.0, 1/5.0, 0.0 };
--static GLfloat theQuad[3] = { 0.25, 0.0, 1/60.0 };
--
--#define MAX_POINTS 2000
--
--static int numPoints = 200;
--
--static GLfloat pointList[MAX_POINTS][3];
--static GLfloat pointTime[MAX_POINTS];
--static GLfloat pointVelocity[MAX_POINTS][2];
--static GLfloat pointDirection[MAX_POINTS][2];
--static int colorList[MAX_POINTS];
--static int animate = 1, motion = 0;
--
--static GLfloat colorSet[][4] = {
--  /* Shades of red. */
--  { 0.7, 0.2, 0.4, 0.5 },
--  { 0.8, 0.0, 0.7, 0.5 },
--  { 1.0, 0.0, 0.0, 0.5 },
--  { 0.9, 0.3, 0.6, 0.5 },
--  { 1.0, 0.4, 0.0, 0.5 },
--  { 1.0, 0.0, 0.5, 0.5 },
--};
--
--#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0]))
--
--#define DEAD (NUM_COLORS+1)
--
--
--#if 0  /* drand48 might be better on Unix machines */
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48())
--#else
--static float float_rand(void) { return rand() / (float) RAND_MAX; }
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand())
--#endif
--
--#define MEAN_VELOCITY 3.0
--#define GRAVITY 2.0
--
--/* Modeling units of ground extent in each X and Z direction. */
--#define EDGE 12
--
--static void
--makePointList(void)
--{
--  float angle, velocity, direction;
--  int i;
--
--  motion = 1;
--  for (i=0; i<numPoints; i++) {
--    pointList[i][0] = 0.0;
--    pointList[i][1] = 0.0;
--    pointList[i][2] = 0.0;
--    pointTime[i] = 0.0;
--    angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0;
--    direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0;
--    pointDirection[i][0] = cos(direction);
--    pointDirection[i][1] = sin(direction);
--    velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0);
--    pointVelocity[i][0] = velocity * cos(angle);
--    pointVelocity[i][1] = velocity * sin(angle);
--    colorList[i] = rand() % NUM_COLORS;
--  }
--  theTime = 0.0;
--}
--
--static void
--updatePointList(void)
--{
--  float distance;
--  int i;
--
--  static double t0 = -1.;
--  double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
--  if (t0 < 0.0)
--    t0 = t;
--  dt = t - t0;
--  t0 = t;
--
--  motion = 0;
--  for (i=0; i<numPoints; i++) {
--    distance = pointVelocity[i][0] * theTime;
--
--    /* X and Z */
--    pointList[i][0] = pointDirection[i][0] * distance;
--    pointList[i][2] = pointDirection[i][1] * distance;
--
--    /* Z */
--    pointList[i][1] =
--      (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i];
--
--    /* If we hit the ground, bounce the point upward again. */
--    if (pointList[i][1] <= 0.0) {
--      if (distance > EDGE) {
--        /* Particle has hit ground past the distance duration of
--          the particles.  Mark particle as dead. */
--       colorList[i] = NUM_COLORS;  /* Not moving. */
--       continue;
--      }
--
--      pointVelocity[i][1] *= 0.8;  /* 80% of previous up velocity. */
--      pointTime[i] = 0.0;  /* Reset the particles sense of up time. */
--    }
--    motion = 1;
--    pointTime[i] += dt;
--  }
--  theTime += dt;
--  if (!motion && !spin) {
--    if (repeat) {
--      makePointList();
--    } else {
--      glutIdleFunc(NULL);
--    }
--  }
--}
--
--static void
--idle(void)
--{
--  updatePointList();
--  if (spin) {
--    angle += 0.3;
--    newModel = 1;
--  }
--  glutPostRedisplay();
--}
--
--static void
--visible(int vis)
--{
--  if (vis == GLUT_VISIBLE) {
--    if (animate && (motion || spin)) {
--      glutIdleFunc(idle);
--    }
--  } else {
--    glutIdleFunc(NULL);
--  }
--}
--
--static void
--recalcModelView(void)
--{
--  glPopMatrix();
--  glPushMatrix();
--  glRotatef(angle, 0.0, 1.0, 0.0);
--  newModel = 0;
--}
--
--static void
--redraw(void)
--{
--  int i;
--
--  glDepthMask(GL_TRUE);
--  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
--  if (newModel)
--    recalcModelView();
--
--
--  /* Draw the floor. */
--/*  glEnable(GL_TEXTURE_2D);*/
--  glColor3f(0.5, 1.0, 0.5);
--  glBegin(GL_QUADS);
--    glTexCoord2f(0.0, 0.0);
--    glVertex3f(-EDGE, -0.05, -EDGE);
--    glTexCoord2f(20.0, 0.0);
--    glVertex3f(EDGE, -0.05, -EDGE);
--    glTexCoord2f(20.0, 20.0);
--    glVertex3f(EDGE, -0.05, EDGE);
--    glTexCoord2f(0.0, 20.0);
--    glVertex3f(-EDGE, -0.05, EDGE);
--  glEnd();
--
--  /* Allow particles to blend with each other. */
--  glDepthMask(GL_FALSE);
--
--  if (blend)
--     glEnable(GL_BLEND);
--
--  glDisable(GL_TEXTURE_2D);
--  glBegin(GL_POINTS);
--    for (i=0; i<numPoints; i++) {
--      /* Draw alive particles. */
--      if (colorList[i] != DEAD) {
--        glColor4fv(colorSet[colorList[i]]);
--        glVertex3fv(pointList[i]);
--      }
--    }
--  glEnd();
--
--  glDisable(GL_BLEND);
--
--  glutSwapBuffers();
--}
--
--/* ARGSUSED2 */
--static void
--mouse(int button, int state, int x, int y)
--{
--  /* Scene can be spun around Y axis using left
--     mouse button movement. */
--  if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) {
--    moving = 1;
--    begin = x;
--  }
--  if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) {
--    moving = 0;
--  }
--}
--
--/* ARGSUSED1 */
--static void
--mouseMotion(int x, int y)
--{
--  if (moving) {
--    angle = angle + (x - begin);
--    begin = x;
--    newModel = 1;
--    glutPostRedisplay();
--  }
--}
--
--static void
--menu(int option)
--{
--  switch (option) {
--  case 0:
--    makePointList();
--    break;
--#ifdef GL_ARB_point_parameters
--  case 1:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant);
--    break;
--  case 2:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear);
--    break;
--  case 3:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--    break;
--#endif
--  case 4:
--    blend = 1;
--    break;
--  case 5:
--    blend = 0;
--    break;
--#ifdef GL_ARB_point_parameters
--  case 6:
--    glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0);
--    break;
--  case 7:
--    glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0);
--    break;
--#endif
--  case 8:
--    glEnable(GL_POINT_SMOOTH);
--    break;
--  case 9:
--    glDisable(GL_POINT_SMOOTH);
--    break;
--  case 10:
--    glPointSize(2.0);
--    break;
--  case 11:
--    glPointSize(4.0);
--    break;
--  case 12:
--    glPointSize(8.0);
--    break;
--  case 13:
--    spin = 1 - spin;
--    if (animate && (spin || motion)) {
--      glutIdleFunc(idle);
--    } else {
--      glutIdleFunc(NULL);
--    }
--    break;
--  case 14:
--    numPoints = 200;
--    break;
--  case 15:
--    numPoints = 500;
--    break;
--  case 16:
--    numPoints = 1000;
--    break;
--  case 17:
--    numPoints = 2000;
--    break;
--  case 666:
--    exit(0);
--  }
--  glutPostRedisplay();
--}
--
--/* ARGSUSED1 */
--static void
--key(unsigned char c, int x, int y)
--{
--  switch (c) {
--  case 13:
--    animate = 1 - animate;  /* toggle. */
--    if (animate && (motion || spin)) {
--      glutIdleFunc(idle);
--    } else {
--      glutIdleFunc(NULL);
--    }
--    break;
--  case ' ':
--    animate = 1;
--    makePointList();
--    glutIdleFunc(idle);
--    break;
--  case 27:
--    exit(0);
--  }
--}
--
--/* Nice floor texture tiling pattern. */
--static char *circles[] = {
--  "....xxxx........",
--  "..xxxxxxxx......",
--  ".xxxxxxxxxx.....",
--  ".xxx....xxx.....",
--  "xxx......xxx....",
--  "xxx......xxx....",
--  "xxx......xxx....",
--  "xxx......xxx....",
--  ".xxx....xxx.....",
--  ".xxxxxxxxxx.....",
--  "..xxxxxxxx......",
--  "....xxxx........",
--  "................",
--  "................",
--  "................",
--  "................",
--};
--
--static void
--makeFloorTexture(void)
--{
--  GLubyte floorTexture[16][16][3];
--  GLubyte *loc;
--  int s, t;
--
--  /* Setup RGB image for the texture. */
--  loc = (GLubyte*) floorTexture;
--  for (t = 0; t < 16; t++) {
--    for (s = 0; s < 16; s++) {
--      if (circles[t][s] == 'x') {
--        /* Nice blue. */
--        loc[0] = 0x1f;
--        loc[1] = 0x1f;
--        loc[2] = 0x8f;
--      } else {
--        /* Light gray. */
--        loc[0] = 0xca;
--        loc[1] = 0xca;
--        loc[2] = 0xca;
--      }
--      loc += 3;
--    }
--  }
--
--  glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
--
--  if (useMipmaps) {
--    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,
--      GL_LINEAR_MIPMAP_LINEAR);
--    gluBuild2DMipmaps(GL_TEXTURE_2D, 3, 16, 16,
--      GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
--  } else {
--    if (linearFiltering) {
--      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
--    } else {
--      glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
--    }
--    glTexImage2D(GL_TEXTURE_2D, 0, 3, 16, 16, 0,
--      GL_RGB, GL_UNSIGNED_BYTE, floorTexture);
--  }
--}
--
--int
--main(int argc, char **argv)
--{
--  int i;
--
--  glutInitWindowSize(300, 300);
--  glutInit(&argc, argv);
--  glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
--
--  for (i=1; i<argc; i++) {
--    if(!strcmp("-noms", argv[i])) {
--      glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
--      printf("forcing no multisampling\n");
--    } else if(!strcmp("-nomipmaps", argv[i])) {
--      useMipmaps = 0;
--    } else if(!strcmp("-nearest", argv[i])) {
--      linearFiltering = 0;
--    }
--  }
--
--  glutCreateWindow("point burst");
--  glewInit();
--  glutDisplayFunc(redraw);
--  glutMouseFunc(mouse);
--  glutMotionFunc(mouseMotion);
--  glutVisibilityFunc(visible);
--  glutKeyboardFunc(key);
--  glutCreateMenu(menu);
--  glutAddMenuEntry("Reset time", 0);
--  glutAddMenuEntry("Constant", 1);
--  glutAddMenuEntry("Linear", 2);
--  glutAddMenuEntry("Quadratic", 3);
--  glutAddMenuEntry("Blend on", 4);
--  glutAddMenuEntry("Blend off", 5);
--  glutAddMenuEntry("Threshold 1", 6);
--  glutAddMenuEntry("Threshold 10", 7);
--  glutAddMenuEntry("Point smooth on", 8);
--  glutAddMenuEntry("Point smooth off", 9);
--  glutAddMenuEntry("Point size 2", 10);
--  glutAddMenuEntry("Point size 4", 11);
--  glutAddMenuEntry("Point size 8", 12);
--  glutAddMenuEntry("Toggle spin", 13);
--  glutAddMenuEntry("200 points ", 14);
--  glutAddMenuEntry("500 points ", 15);
--  glutAddMenuEntry("1000 points ", 16);
--  glutAddMenuEntry("2000 points ", 17);
--  glutAddMenuEntry("Quit", 666);
--  glutAttachMenu(GLUT_RIGHT_BUTTON);
--
--  if (!glutExtensionSupported("GL_ARB_point_parameters")) {
--    fprintf(stderr, "Sorry, GL_ARB_point_parameters is not supported.\n");
--    return -1;
--  }
--
--  glShadeModel(GL_FLAT);
--  glEnable(GL_DEPTH_TEST);
--  glEnable(GL_POINT_SMOOTH);
--  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
--  glPointSize(8.0);
--#if GL_ARB_point_parameters
--  glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--#endif
--  glMatrixMode(GL_PROJECTION);
--  gluPerspective( /* field of view in degree */ 40.0,
--  /* aspect ratio */ 1.0,
--    /* Z near */ 0.5, /* Z far */ 40.0);
--  glMatrixMode(GL_MODELVIEW);
--  gluLookAt(0.0, 1.0, 8.0, /* eye location */
--    0.0, 1.0, 0.0,      /* center is at (0,0,0) */
--    0.0, 1.0, 0.);      /* up is in postivie Y direction */
--  glPushMatrix();       /* dummy push so we can pop on model
--                           recalc */
--
--  makePointList();
--  makeFloorTexture();
--
--  glutMainLoop();
--  return 0;             /* ANSI C requires main to return int. */
--}
-diff -rauNp Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c mesa-demos-8.0.1//src/demos/spriteblast.c
---- Desktop/mesa-demos-8.0.1//src/demos/spriteblast.c	2010-07-07 13:57:15.000000000 -0400
-+++ mesa-demos-8.0.1/src/demos/spriteblast.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,555 +0,0 @@
--
--/* Copyright (c) Mark J. Kilgard, 1997.  */
--
--/* This program is freely distributable without licensing fees 
--   and is provided without guarantee or warrantee expressed or 
--   implied. This program is -not- in the public domain. */
--
--/* This example demonstrates how to render particle effects
--   with OpenGL.  A cloud of pinkish/orange particles explodes with the
--   particles bouncing off the ground.  When the EXT_point_parameters
--   is present , the particle size is attenuated based on eye distance. */
--
--
--/* Modified by Brian Paul to test GL_ARB_point_sprite */
--
--
--#include <stdio.h>
--#include <stdlib.h>
--#include <string.h>
--#include <math.h>       /* for cos(), sin(), and sqrt() */
--#ifdef _WIN32
--#include <windows.h>
--#endif
--#include <GL/glew.h>
--#include <GL/glut.h>
--
--/* Some <math.h> files do not define M_PI... */
--#ifndef M_PI
--#define M_PI 3.14159265
--#endif
--
--#if 0  /* For debugging. */
--#undef GL_EXT_point_parameters
--#endif
--
--static GLfloat angle = -150;   /* in degrees */
--static int spin = 0;
--static int moving, begin;
--static float theTime;
--static int repeat = 1;
--static int blend = 1;
--int useMipmaps = 1;
--int linearFiltering = 1;
--
--static GLfloat constant[3] = { .2,  0.0,     0.0 };
--static GLfloat linear[3]   = { .0,   .1,     0.0 };
--static GLfloat theQuad[3]  = { .005, 0.1, 1/600.0 };
--
--#define MAX_POINTS 2000
--
--static int numPoints = 200;
--
--static GLfloat pointList[MAX_POINTS][3];
--static GLfloat pointTime[MAX_POINTS];
--static GLfloat pointVelocity[MAX_POINTS][2];
--static GLfloat pointDirection[MAX_POINTS][2];
--static int colorList[MAX_POINTS];
--static int animate = 1, motion = 0, org = 0, sprite = 1, smooth = 1;
--
--static GLfloat colorSet[][4] = {
--  /* Shades of red. */
--  { 0.7, 0.2, 0.4, 0.5 },
--  { 0.8, 0.0, 0.7, 0.5 },
--  { 1.0, 0.0, 0.0, 0.5 },
--  { 0.9, 0.3, 0.6, 0.5 },
--  { 1.0, 0.4, 0.0, 0.5 },
--  { 1.0, 0.0, 0.5, 0.5 },
--};
--
--#define NUM_COLORS (sizeof(colorSet)/sizeof(colorSet[0]))
--
--#define DEAD (NUM_COLORS+1)
--
--
--/* GL */
--static GLint spritePattern[16][16] = {
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
--   { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 1, 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0 },
--   { 0, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 1, 0 },
--   { 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0 },
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
--   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
--};
--
--
--
--
--#if 0  /* drand48 might be better on Unix machines */
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * drand48())
--#else
--static float float_rand(void) { return rand() / (float) RAND_MAX; }
--#define RANDOM_RANGE(lo, hi) ((lo) + (hi - lo) * float_rand())
--#endif
--
--#define MEAN_VELOCITY 3.0
--#define GRAVITY 2.0
--
--/* Modeling units of ground extent in each X and Z direction. */
--#define EDGE 12
--
--static void
--makePointList(void)
--{
--  float angle, velocity, direction;
--  int i;
--
--  motion = 1;
--  for (i=0; i<numPoints; i++) {
--    pointList[i][0] = 0.0;
--    pointList[i][1] = 0.0;
--    pointList[i][2] = 0.0;
--    pointTime[i] = 0.0;
--    angle = (RANDOM_RANGE(60.0, 70.0)) * M_PI/180.0;
--    direction = RANDOM_RANGE(0.0, 360.0) * M_PI/180.0;
--    pointDirection[i][0] = cos(direction);
--    pointDirection[i][1] = sin(direction);
--    velocity = MEAN_VELOCITY + RANDOM_RANGE(-0.8, 1.0);
--    pointVelocity[i][0] = velocity * cos(angle);
--    pointVelocity[i][1] = velocity * sin(angle);
--    colorList[i] = rand() % NUM_COLORS;
--  }
--  theTime = 0.0;
--}
--
--static void
--updatePointList(void)
--{
--  float distance;
--  int i;
--
--  static double t0 = -1.;
--  double dt, t = glutGet(GLUT_ELAPSED_TIME) / 1000.0;
--  if (t0 < 0.0)
--    t0 = t;
--  dt = t - t0;
--  t0 = t;
--
--  motion = 0;
--  for (i=0; i<numPoints; i++) {
--    distance = pointVelocity[i][0] * theTime;
--
--    /* X and Z */
--    pointList[i][0] = pointDirection[i][0] * distance;
--    pointList[i][2] = pointDirection[i][1] * distance;
--
--    /* Z */
--    pointList[i][1] =
--      (pointVelocity[i][1] - 0.5 * GRAVITY * pointTime[i])*pointTime[i];
--
--    /* If we hit the ground, bounce the point upward again. */
--    if (pointList[i][1] <= 0.0) {
--      if (distance > EDGE) {
--        /* Particle has hit ground past the distance duration of
--          the particles.  Mark particle as dead. */
--       colorList[i] = NUM_COLORS;  /* Not moving. */
--       continue;
--      }
--
--      pointVelocity[i][1] *= 0.8;  /* 80% of previous up velocity. */
--      pointTime[i] = 0.0;  /* Reset the particles sense of up time. */
--    }
--    motion = 1;
--    pointTime[i] += dt;
--  }
--  theTime += dt;
--  if (!motion && !spin) {
--    if (repeat) {
--      makePointList();
--    } else {
--      glutIdleFunc(NULL);
--    }
--  }
--}
--
--static void
--idle(void)
--{
--  updatePointList();
--  if (spin) {
--    angle += 0.3;
--  }
--  glutPostRedisplay();
--}
--
--static void
--visible(int vis)
--{
--  if (vis == GLUT_VISIBLE) {
--    if (animate && (motion || spin)) {
--      glutIdleFunc(idle);
--    }
--  } else {
--    glutIdleFunc(NULL);
--  }
--}
--
--static void
--redraw(void)
--{
--  int i;
--
--  glDepthMask(GL_TRUE);
--  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
--
--  glPushMatrix();
--  glRotatef(15.0, 1.0, 0.0, 0.0);
--  glRotatef(angle, 0.0, 1.0, 0.0);
--
--
--  /* Draw the floor. */
--/*  glEnable(GL_TEXTURE_2D);*/
--  glColor3f(0.1, 0.5, 1.0);
--  glBegin(GL_QUADS);
--    glTexCoord2f(0.0, 0.0);
--    glVertex3f(-EDGE, -0.05, -EDGE);
--    glTexCoord2f(20.0, 0.0);
--    glVertex3f(EDGE, -0.05, -EDGE);
--    glTexCoord2f(20.0, 20.0);
--    glVertex3f(EDGE, -0.05, EDGE);
--    glTexCoord2f(0.0, 20.0);
--    glVertex3f(-EDGE, -0.05, EDGE);
--  glEnd();
--
--  /* Allow particles to blend with each other. */
--  glDepthMask(GL_FALSE);
--
--  if (blend)
--     glEnable(GL_BLEND);
--
--  if (sprite) {
--     glEnable(GL_TEXTURE_2D);
--#ifdef GL_ARB_point_sprite
--     glEnable(GL_POINT_SPRITE_ARB);
--#endif
--  }
--
--  glColor3f(1,1,1);
--  glBegin(GL_POINTS);
--    for (i=0; i<numPoints; i++) {
--      /* Draw alive particles. */
--      if (colorList[i] != DEAD) {
--        if (!sprite) glColor4fv(colorSet[colorList[i]]);
--        glVertex3fv(pointList[i]);
--      }
--    }
--  glEnd();
--
--  glDisable(GL_TEXTURE_2D);
--#ifdef GL_ARB_point_sprite
--  glDisable(GL_POINT_SPRITE_ARB);
--#endif
--  glDisable(GL_BLEND);
--
--  glPopMatrix();
--
--  glutSwapBuffers();
--}
--
--/* ARGSUSED2 */
--static void
--mouse(int button, int state, int x, int y)
--{
--  /* Scene can be spun around Y axis using left
--     mouse button movement. */
--  if (button == GLUT_LEFT_BUTTON && state == GLUT_DOWN) {
--    moving = 1;
--    begin = x;
--  }
--  if (button == GLUT_LEFT_BUTTON && state == GLUT_UP) {
--    moving = 0;
--  }
--}
--
--/* ARGSUSED1 */
--static void
--mouseMotion(int x, int y)
--{
--  if (moving) {
--    angle = angle + (x - begin);
--    begin = x;
--    glutPostRedisplay();
--  }
--}
--
--static void
--menu(int option)
--{
--  switch (option) {
--  case 0:
--    makePointList();
--    break;
--#ifdef GL_ARB_point_parameters
--  case 1:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, constant);
--    break;
--  case 2:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, linear);
--    break;
--  case 3:
--    glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--    break;
--#endif
--  case 4:
--    blend = 1;
--    break;
--  case 5:
--    blend = 0;
--    break;
--#ifdef GL_ARB_point_parameters
--  case 6:
--    glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 1.0);
--    break;
--  case 7:
--    glPointParameterfARB(GL_POINT_FADE_THRESHOLD_SIZE_ARB, 10.0);
--    break;
--#endif
--  case 8:
--    glEnable(GL_POINT_SMOOTH);
--    smooth = 1;
--    break;
--  case 9:
--    glDisable(GL_POINT_SMOOTH);
--    smooth = 0;
--    break;
--  case 10:
--    glPointSize(16.0);
--    break;
--  case 11:
--    glPointSize(32.0);
--    break;
--  case 12:
--    glPointSize(64.0);
--    break;
--  case 13:
--    spin = 1 - spin;
--    if (animate && (spin || motion)) {
--      glutIdleFunc(idle);
--    } else {
--      glutIdleFunc(NULL);
--    }
--    break;
--  case 14:
--    numPoints = 200;
--    break;
--  case 15:
--    numPoints = 500;
--    break;
--  case 16:
--    numPoints = 1000;
--    break;
--  case 17:
--    numPoints = 2000;
--    break;
--  case 666:
--    exit(0);
--  }
--  glutPostRedisplay();
--}
--
--/* ARGSUSED1 */
--static void
--key(unsigned char c, int x, int y)
--{
--  switch (c) {
--  case 13:
--    animate = 1 - animate;  /* toggle. */
--    if (animate && (motion || spin)) {
--      glutIdleFunc(idle);
--    } else {
--      glutIdleFunc(NULL);
--    }
--    break;
--  case ' ':
--    animate = 1;
--    makePointList();
--    glutIdleFunc(idle);
--    break;
--  case 'o':
--  case 'O':
--    org ^= 1;
--#ifdef GL_VERSION_2_0
--#ifdef GL_ARB_point_parameters
--    glPointParameteri(GL_POINT_SPRITE_COORD_ORIGIN,
--                      org ? GL_LOWER_LEFT : GL_UPPER_LEFT);
--#endif
--#endif
--    glutPostRedisplay();
--    break;
--  case 't':
--  case 'T':
--    sprite ^= 1;
--    glutPostRedisplay();
--    break;
--  case 's':
--  case 'S':
--    (smooth ^= 1) ? glEnable(GL_POINT_SMOOTH) : glDisable(GL_POINT_SMOOTH);
--    glutPostRedisplay();
--    break;
--  case '0':
--    glPointSize(1.0);
--    glutPostRedisplay();
--    break;
--  case '1':
--    glPointSize(16.0);
--    glutPostRedisplay();
--    break;
--  case '2':
--    glPointSize(32.0);
--    glutPostRedisplay();
--    break;
--  case '3':
--    glPointSize(64.0);
--    glutPostRedisplay();
--    break;
--  case '4':
--    glPointSize(128.0);
--    glutPostRedisplay();
--    break;
--  case 27:
--    exit(0);
--  }
--}
--
--
--
--static void
--makeSprite(void)
--{
--   GLubyte texture[16][16][4];
--   int i, j;
--
--   if (!glutExtensionSupported("GL_ARB_point_sprite")) {
--      printf("Sorry, this demo requires GL_ARB_point_sprite.\n");
--      exit(0);
--   }
--   if (!glutExtensionSupported("GL_ARB_point_parameters")) {
--      printf("Sorry, this demo requires GL_ARB_point_parameters.\n");
--      exit(0);
--   }
--
--   for (i = 0; i < 16; i++) {
--      for (j = 0; j < 16; j++) {
--         if (spritePattern[i][j]) {
--            texture[i][j][0] = 255;
--            texture[i][j][1] = 255;
--            texture[i][j][2] = 255;
--            texture[i][j][3] = 255;
--         }
--         else {
--            texture[i][j][0] = 255;
--            texture[i][j][1] = 0;
--            texture[i][j][2] = 0;
--            texture[i][j][3] = 0;
--         }
--      }
--   }
--
--   glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 16, 16, 0, GL_RGBA, GL_UNSIGNED_BYTE,
--                texture);
--   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
--   glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
--#ifdef GL_ARB_point_sprite
--   glTexEnvi(GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE);
--#endif
--}
--
--
--static void
--reshape(int width, int height)
--{
--  GLfloat h = (GLfloat) height / (GLfloat) width;
--
--  glViewport(0, 0, (GLint) width, (GLint) height);
--  glMatrixMode(GL_PROJECTION);
--  glLoadIdentity();
--  glFrustum(-1.0, 1.0, -h, h, 2.0, 30.0);
--  glMatrixMode(GL_MODELVIEW);
--  glLoadIdentity();
--  glTranslatef(0.0, 0.0, -10.0);
--}
--
--int
--main(int argc, char **argv)
--{
--  int i;
--
--  glutInitWindowSize(600,300);
--  glutInit(&argc, argv);
--  glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE);
--
--  for (i=1; i<argc; i++) {
--    if(!strcmp("-noms", argv[i])) {
--      glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
--      printf("forcing no multisampling\n");
--    } else if(!strcmp("-nomipmaps", argv[i])) {
--      useMipmaps = 0;
--    } else if(!strcmp("-nearest", argv[i])) {
--      linearFiltering = 0;
--    }
--  }
--  glutCreateWindow("sprite blast");
--  glewInit();
--  glutReshapeFunc(reshape);
--  glutDisplayFunc(redraw);
--  glutMouseFunc(mouse);
--  glutMotionFunc(mouseMotion);
--  glutVisibilityFunc(visible);
--  glutKeyboardFunc(key);
--  glutCreateMenu(menu);
--  glutAddMenuEntry("Reset time", 0);
--  glutAddMenuEntry("Constant", 1);
--  glutAddMenuEntry("Linear", 2);
--  glutAddMenuEntry("Quadratic", 3);
--  glutAddMenuEntry("Blend on", 4);
--  glutAddMenuEntry("Blend off", 5);
--  glutAddMenuEntry("Threshold 1", 6);
--  glutAddMenuEntry("Threshold 10", 7);
--  glutAddMenuEntry("Point smooth on", 8);
--  glutAddMenuEntry("Point smooth off", 9);
--  glutAddMenuEntry("Point size 16", 10);
--  glutAddMenuEntry("Point size 32", 11);
--  glutAddMenuEntry("Point size 64", 12);
--  glutAddMenuEntry("Toggle spin", 13);
--  glutAddMenuEntry("200 points ", 14);
--  glutAddMenuEntry("500 points ", 15);
--  glutAddMenuEntry("1000 points ", 16);
--  glutAddMenuEntry("2000 points ", 17);
--  glutAddMenuEntry("Quit", 666);
--  glutAttachMenu(GLUT_RIGHT_BUTTON);
--
--  makePointList();
--  makeSprite();
--
--  glShadeModel(GL_FLAT);
--  glEnable(GL_DEPTH_TEST);
--  glEnable(GL_POINT_SMOOTH);
--  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
--  glPointSize(32.0);
--#ifdef GL_ARB_point_parameters
--  glPointParameterfvARB(GL_POINT_DISTANCE_ATTENUATION_ARB, theQuad);
--#endif
--
--  glutMainLoop();
--  return 0;             /* ANSI C requires main to return int. */
--}
diff --git a/pcr/nexuiz-data/PKGBUILD b/pcr/nexuiz-data/PKGBUILD
index 619da3465..f6d3ba62c 100644
--- a/pcr/nexuiz-data/PKGBUILD
+++ b/pcr/nexuiz-data/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=nexuiz-data
 _pkgsourcename=nexuiz
 pkgver=2.5.2
 _zipver=252
-pkgrel=1.1
+pkgrel=3
 arch=('any')
 pkgdesc="Nexuiz game data"
 conflicts=('nexuiz<2.5.1-3')
diff --git a/pcr/nexuiz/PKGBUILD b/pcr/nexuiz/PKGBUILD
index 0dc56d81b..1e3fdfbeb 100644
--- a/pcr/nexuiz/PKGBUILD
+++ b/pcr/nexuiz/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=nexuiz
 pkgver=2.5.2
 _zipver=252
-pkgrel=2.3
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="A free software first person shooter"
 url="http://www.alientrap.org/games/nexuiz"
author	root <root@rshg054.dnsready.net>	2013-02-27 00:03:49 -0800
committer	root <root@rshg054.dnsready.net>	2013-02-27 00:03:49 -0800
commit	23018fec360e50c7cb4de4b2411650ce79532e54 (patch)
tree	766004a81e02dd8a2ea0d5092ce2d19aed799bf6
parent	32e4cb82a73f6efc4254917e6324a2b61ecb5ddc (diff)