Fri Aug 12 23:14:35 UTC 2011

32 files changed, 1060 insertions, 58 deletions

diff --git a/community-staging/flightgear/PKGBUILD b/community-staging/flightgear/PKGBUILD
new file mode 100644
index 000000000..439e47c9c
--- /dev/null
+++ b/community-staging/flightgear/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 54030 2011-08-11 23:28:19Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: William Rea <sillywilly@gmail.com>
+# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
+
+pkgname=flightgear
+pkgver=2.4.0
+pkgrel=1
+pkgdesc="An open-source, multi-platform flight simulator"
+arch=(i686 x86_64)
+depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion') # 'flightgear-data')
+makedepends=('boost')
+license=("GPL")
+url="http://www.flightgear.org"
+options=('!makeflags')
+source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver")
+md5sums=('eb8d1ed8b1de5f1ac7926c9d0c2f37f8')
+
+build() {
+  cd $srcdir/fg-flightgear
+#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <stdio.h>' {} \;
+#  [ $NOEXTRACT -eq 1 ] || find -name \*.c\* -exec sed -i '1,2i#include <GL/glu.h>' {} \;
+  [ -x configure ] || ./autogen.sh
+  [ -f Makefile ] || ./configure --prefix=/usr
+  make
+}
+
+package() {
+  depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'flightgear-data')
+  cd $srcdir/fg-flightgear
+  make DESTDIR=$pkgdir install
+}
diff --git a/community-staging/simgear/PKGBUILD b/community-staging/simgear/PKGBUILD
new file mode 100644
index 000000000..970dbf82b
--- /dev/null
+++ b/community-staging/simgear/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 54019 2011-08-11 20:22:33Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: William Rea <sillywilly@gmail.com>
+# Contributor: Hans Janssen <hans@janserv.xs4all.nl>
+
+pkgname=simgear
+pkgver=2.4.0
+pkgrel=1
+pkgdesc="A set of open-source libraries designed to be used as building blocks for quickly assembling 3d simulations, games, and visualization applications."
+arch=(i686 x86_64)
+depends=('glut' 'freealut' 'plib' 'openscenegraph')
+makedepends=('boost')
+license=("GPL")
+#url="http://www.simgear.org"
+url="https://gitorious.org/fg"
+options=('!makeflags')
+source=("SimGear-$pkgver.tar.gz::https://gitorious.org/fg/simgear/archive-tarball/release/$pkgver"
+	build-fix.patch)
+md5sums=('e2c6fab13a74cd42992f8cfd5ad46cde'
+         '905a05cc1364c067b3b9574d41cef7fa')
+
+build() {
+  cd $srcdir/fg-simgear
+#  patch -p1 <$srcdir/build-fix.patch
+  [ -x configure ] || ./autogen.sh
+  [ -f Makefile ] || ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/fg-simgear
+  make DESTDIR=$pkgdir install
+}
diff --git a/community-staging/simgear/build-fix.patch b/community-staging/simgear/build-fix.patch
new file mode 100644
index 000000000..da4ba81f8
--- /dev/null
+++ b/community-staging/simgear/build-fix.patch
@@ -0,0 +1,71 @@
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx
+--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.cxx	2011-07-04 13:02:57.000000000 +0400
+@@ -70,9 +70,6 @@
+   osg::ref_ptr<osg::RefMatrix> mModelView;
+ };
+ 
+-osgUtil::RegisterRenderBinProxy
+-SGClipGroup::clipBinProxy("ClipRenderBin", new SGClipGroup::ClipRenderBin);
+-
+ class SGClipGroup::CullCallback : public osg::NodeCallback {
+ public:
+   virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx
+--- SimGear-2.0.0/simgear/scene/model/SGClipGroup.hxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGClipGroup.hxx	2011-07-04 13:03:01.000000000 +0400
+@@ -51,8 +51,6 @@
+   class ClipRenderBin;
+ 
+   std::vector<osg::ref_ptr<osg::ClipPlane> > mClipPlanes;
+-
+-  static osgUtil::RegisterRenderBinProxy clipBinProxy;
+ };
+ 
+ #endif
+diff -wbBur SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx
+--- SimGear-2.0.0/simgear/scene/model/SGPagedLOD.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/model/SGPagedLOD.cxx	2011-07-12 15:12:21.000000000 +0400
+@@ -21,6 +21,7 @@
+ #include <osgDB/ReadFile>
+ #include <osgDB/Input>
+ #include <osgDB/ParameterOutput>
++#include <osgDB/DatabasePager>
+ 
+ #include <simgear/debug/logstream.hxx>
+ #include <simgear/structure/OSGVersion.hxx>
+@@ -67,9 +68,12 @@
+     unsigned childNum = getNumChildren();
+     setTimeStamp(childNum, 0);
+     double priority=1.0;
++/*
++FIXME:!!!
+     dbp->requestNodeFile(getFileName(childNum),this,priority,0,
+                          getDatabaseRequest(childNum),
+                          _readerWriterOptions.get());
++*/
+ }
+ 
+ bool SGPagedLOD_writeLocalData(const Object& obj, osgDB::Output& fw)
+diff -wbBur SimGear-2.0.0/simgear/scene/sky/bbcache.cxx SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx
+--- SimGear-2.0.0/simgear/scene/sky/bbcache.cxx	2010-02-17 18:39:21.000000000 +0300
++++ SimGear-2.0.0.my/simgear/scene/sky/bbcache.cxx	2011-07-12 15:14:16.000000000 +0400
+@@ -31,6 +31,7 @@
+ #include <simgear/screen/extensions.hxx>
+ #include <simgear/screen/RenderTexture.h>
+ #include <osg/GLU>
++#include <GL/glu.h>
+ 
+ #include "bbcache.hxx"
+ 
+diff -wbBur SimGear-2.0.0/simgear/screen/tr.cxx SimGear-2.0.0.my/simgear/screen/tr.cxx
+--- SimGear-2.0.0/simgear/screen/tr.cxx	2010-02-17 18:39:22.000000000 +0300
++++ SimGear-2.0.0.my/simgear/screen/tr.cxx	2011-07-12 15:16:01.000000000 +0400
+@@ -145,6 +145,7 @@
+ #endif
+ 
+ #include <osg/GLU>
++#include <GL/glu.h>
+ 
+ #include "tr.h"
+ 
diff --git a/community/acpitool/PKGBUILD b/community/acpitool/PKGBUILD
index 51050e0e6..7fc0ac9d3 100644
--- a/community/acpitool/PKGBUILD
+++ b/community/acpitool/PKGBUILD
@@ -1,28 +1,29 @@
-# $Id: PKGBUILD 24573 2010-08-26 12:50:31Z lcarlier $
+# $Id: PKGBUILD 54004 2011-08-11 17:55:53Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Gerhard Brauer <gerhard.brauer@web.de>
 # Contributor: Milosz Piglas <archeofuture@gmail.com>
 
 pkgname=acpitool
 pkgver=0.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="ACPI client - replacement for apm tool"
 url="http://sourceforge.net/projects/acpitool/"
 arch=('i686' 'x86_64')
 license=('GPL')
-source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2)
 depends=('gcc-libs')
-md5sums=('9e4ec55201be0be71ffbc56d38b42b57')
+source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2
+	linux-3.0.patch)
+md5sums=('9e4ec55201be0be71ffbc56d38b42b57'
+         'eb149edb32be6cdf20a7d16beb3e9f70')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
+  patch -p1 <$srcdir/linux-3.0.patch
   ./configure --prefix=/usr
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
-
   make prefix="$pkgdir/usr" install
 }
diff --git a/community/acpitool/linux-3.0.patch b/community/acpitool/linux-3.0.patch
new file mode 100644
index 000000000..ba454a0c2
--- /dev/null
+++ b/community/acpitool/linux-3.0.patch
@@ -0,0 +1,18 @@
+diff -wbBur acpitool-0.5.1/src/acpitool.cpp acpitool-0.5.1.my/src/acpitool.cpp
+--- acpitool-0.5.1/src/acpitool.cpp	2009-08-13 23:37:48.000000000 +0400
++++ acpitool-0.5.1.my/src/acpitool.cpp	2011-08-11 21:53:17.000000000 +0400
+@@ -205,8 +205,12 @@
+ 	Kernel_24 = 1;           
+ 	Kernel_26 = 0;
+     }
+-        
+-    if(strncmp(str,"2.6",3)==0)
++    else if(strncmp(str,"2.6",3)==0)
++    {
++	Kernel_24 = 0;
++	Kernel_26 = 1;
++    }
++    else
+     {
+ 	Kernel_24 = 0;           
+ 	Kernel_26 = 1;
diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD
index cccf98d96..728a5cab9 100644
--- a/community/gambas3/PKGBUILD
+++ b/community/gambas3/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 53990 2011-08-11 07:04:13Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 
 pkgbase=gambas3
@@ -11,8 +12,8 @@ pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gamba
          'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
          'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
          'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') 
-pkgver=2.99.1
-pkgrel=4
+pkgver=2.99.2
+pkgrel=1
 pkgdesc="A free development environment based on a Basic interpreter."
 arch=('i686' 'x86_64')
 url="http://gambas.sourceforge.net/"
@@ -21,12 +22,12 @@ groups=('gambas3')
 makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
          'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'qt' 'gtk2' 'imlib2' 'gdk-pixbuf2'
          'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
-         'curl' 'poppler' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
+         'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre'
          'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
         'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('ab4c182b9d7dfec06b3a42bb002a779a'
+md5sums=('247a13e28972985766855a6bc4d6d368'
          'b284be39d147ec799f1116a6abc068b4'
          'a8ec8e5a6aba7a7e453ce7a35c1800a9')
 
diff --git a/community/parcellite/PKGBUILD b/community/parcellite/PKGBUILD
index 2685f08d3..71b4f568b 100644
--- a/community/parcellite/PKGBUILD
+++ b/community/parcellite/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 53903 2011-08-09 19:26:51Z spupykin $
+# $Id: PKGBUILD 54009 2011-08-11 18:03:17Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Alexander Fehr <pizzapunk gmail com>
 
 pkgname=parcellite
 pkgver=1.0.2rc3
-pkgrel=1
+pkgrel=2
 pkgdesc="Lightweight GTK+ clipboard manager"
 arch=('i686' 'x86_64')
 url="http://parcellite.sourceforge.net/"
 license=('GPL3')
 depends=('gtk2')
 makedepends=('intltool')
-source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz)
-md5sums=('3fe1196cc2bb3f34d57d0e34e10449b3')
+source=(http://downloads.sourceforge.net/parcellite/parcellite-$pkgver.tar.gz
+	history_menu_crash_patch)
+md5sums=('3fe1196cc2bb3f34d57d0e34e10449b3'
+         '8fd6e07fa907865ca4db7b3e13441ce6')
 
 build() {
   cd "$srcdir/parcellite-$pkgver"
+  (cd src && patch -p0 <$srcdir/history_menu_crash_patch)
   ./configure --prefix=/usr --sysconfdir=/etc
   make
   make DESTDIR="$pkgdir" install
diff --git a/community/parcellite/history_menu_crash_patch b/community/parcellite/history_menu_crash_patch
new file mode 100644
index 000000000..961106839
--- /dev/null
+++ b/community/parcellite/history_menu_crash_patch
@@ -0,0 +1,39 @@
+Index: main.c
+===================================================================
+--- main.c	(revision 232)
++++ main.c	(working copy)
+@@ -1199,24 +1199,28 @@
+     {
+       GString* string = g_string_new((gchar*)element->data);
+       /* Ellipsize text */
+-      if (string->len > prefs.item_length)
++      glong len = g_utf8_strlen(string->str, string->len);
++      if (len > prefs.item_length)
+       {
+         switch (prefs.ellipsize)
+         {
+           case PANGO_ELLIPSIZE_START:
+-            string = g_string_erase(string, 0, string->len-(prefs.item_length));
++            string = g_string_erase(string, 0, g_utf8_offset_to_pointer(string->str, len - prefs.item_length) - string->str);
+             string = g_string_prepend(string, "...");
+             break;
+           case PANGO_ELLIPSIZE_MIDDLE:
+-            string = g_string_erase(string, (prefs.item_length/2), string->len-(prefs.item_length));
+-            string = g_string_insert(string, (string->len/2), "...");
++            ; /* to avoid wierd gcc error */
++            gchar* p1 = g_utf8_offset_to_pointer(string->str, prefs.item_length / 2);
++            gchar* p2 = g_utf8_offset_to_pointer(string->str, len - prefs.item_length / 2);
++            string = g_string_erase(string, p1 - string->str, p2 - p1);
++            string = g_string_insert(string, p1 - string->str, "...");
+             break;
+           case PANGO_ELLIPSIZE_END:
+-            string = g_string_truncate(string, prefs.item_length);
++            string = g_string_truncate(string, g_utf8_offset_to_pointer(string->str, prefs.item_length) - string->str);
+             string = g_string_append(string, "...");
+             break;
+         }
+-      }
++      }
+ 		  /* Remove control characters */
+       gsize i = 0;
+       while (i < string->len)
diff --git a/community/qps/PKGBUILD b/community/qps/PKGBUILD
index c6a528fe6..4e3e69e34 100644
--- a/community/qps/PKGBUILD
+++ b/community/qps/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 52003 2011-07-19 16:41:14Z spupykin $
+# $Id: PKGBUILD 54014 2011-08-11 18:04:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: David Rosenstrauch <darose@darose.net>
 
 pkgname=qps
 pkgver=1.10.15
 _dlpkgver=5946
-pkgrel=1
+pkgrel=2
 pkgdesc="a visual process manager, an X11 version of 'top' or 'ps'."
 url="http://qps.kldp.net/projects/qps"
 depends=('qt')
 arch=('i686' 'x86_64')
 license="GPL"
-source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2)
-md5sums=('25a6c6f8ac9172a6874e3514edf1eda1')
+source=(http://kldp.net/frs/download.php/${_dlpkgver}/qps-$pkgver.tar.bz2
+	version-patch.diff)
+md5sums=('25a6c6f8ac9172a6874e3514edf1eda1'
+         'e323a796a3dbf44a99af386e867f7848')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  patch -p0 <$srcdir/version-patch.diff
   qmake
   make
 }
diff --git a/community/qps/version-patch.diff b/community/qps/version-patch.diff
new file mode 100644
index 000000000..bfddd2a0a
--- /dev/null
+++ b/community/qps/version-patch.diff
@@ -0,0 +1,14 @@
+--- proc_linux.cpp	2011-07-17 08:03:52.000000000 -0400
++++ proc_linux.cpp.new	2011-08-09 11:09:47.278589772 -0400
+@@ -1962,7 +1962,10 @@
+ 	    int result;
+ 
+         result = sscanf(p, "%d.%d.%d", &major, &minor, &patch);
+-        if(result < 3) {
++        if(result == 2) {
++		patch = 0;
++	}
++        else if(result < 3) {
+ 			fprintf(stderr, "Qps: can't determine version, read %s \n",	p);
+ 			fprintf(stderr, "please report this bug.\n");
+ 			exit(1);
diff --git a/community/tomoyo-tools/PKGBUILD b/community/tomoyo-tools/PKGBUILD
index 1a141b782..0eb11d0fd 100644
--- a/community/tomoyo-tools/PKGBUILD
+++ b/community/tomoyo-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 48297 2011-05-31 09:33:14Z spupykin $
+# $Id: PKGBUILD 53999 2011-08-11 17:49:23Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk>
 
 pkgname=tomoyo-tools
-_basever=2.3.0
-_timestamp=20110511
+_basever=2.4.0
+_timestamp=20110806
 pkgver=${_basever}.${_timestamp}
 pkgrel=1
 pkgdesc='TOMOYO Linux 2.3.x userspace tools for Linux kernel 2.6.36 and later'
@@ -15,15 +15,18 @@ depends=('ncurses')
 makedepends=('help2man')
 conflicts=('ccs-tools')
 install=tomoyo-tools.install
-source=("http://sourceforge.jp/frs/redir.php?f=/tomoyo/48663/${pkgname}-${_basever}-${_timestamp}.tar.gz")
-md5sums=('bbbbaeb145ae12e5fe6154707807b90e')
+source=("tomoyo-tools-${_basever}-${_timestamp}.tar.gz::http://sourceforge.jp/frs/redir.php?m=iij&f=%2Ftomoyo%2F52848%2Ftomoyo-tools-${_basever}-${_timestamp}.tar.gz"
+	build-fix.patch)
+md5sums=('111109a71684f48bcac58bba07b8f49e'
+         '063c85ec6c56b90796ced9c203098f41')
 
 build() {
-    cd "${srcdir}/${pkgname}"
-    make -j1
+  cd "${srcdir}/${pkgname}"
+  patch -p1 <$srcdir/build-fix.patch
+  make
 }
 
 package() {
-    cd "${srcdir}/${pkgname}"
-    make INSTALLDIR="${pkgdir}" install
+  cd "${srcdir}/${pkgname}"
+  make INSTALLDIR="${pkgdir}" install
 }
diff --git a/community/tomoyo-tools/build-fix.patch b/community/tomoyo-tools/build-fix.patch
new file mode 100644
index 000000000..ca949072b
--- /dev/null
+++ b/community/tomoyo-tools/build-fix.patch
@@ -0,0 +1,11 @@
+diff -wbBur tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c tomoyo-tools.my/usr_lib_tomoyo/tomoyo-editpolicy-agent.c
+--- tomoyo-tools/usr_lib_tomoyo/tomoyo-editpolicy-agent.c	2011-08-06 04:00:00.000000000 +0400
++++ tomoyo-tools.my/usr_lib_tomoyo/tomoyo-editpolicy-agent.c	2011-08-11 21:47:05.000000000 +0400
+@@ -35,6 +35,7 @@
+ #include <dirent.h>
+ #define _GNU_SOURCE
+ #include <sched.h>
++#include <linux/sched.h>
+ #include <sys/mount.h>
+ 
+ static _Bool wait_data(const int fd)
diff --git a/extra/hydrogen/PKGBUILD b/extra/hydrogen/PKGBUILD
index 33e3805b1..b78606f9c 100644
--- a/extra/hydrogen/PKGBUILD
+++ b/extra/hydrogen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 115128 2011-03-17 06:06:23Z schiv $
+# $Id: PKGBUILD 135233 2011-08-11 10:28:18Z schiv $
 # Maintainer: tobias <tobias@archlinux.org>
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: K. Piche <kpiche@rogers.com>
@@ -14,13 +14,16 @@ url="http://www.hydrogen-music.org/"
 depends=('libarchive' 'liblrdf' 'qt' 'jack')
 makedepends=('scons')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e96f291d60e58f5d62fe616cee577dc0')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        lrdf_raptor2.patch)
+md5sums=('e96f291d60e58f5d62fe616cee577dc0'
+         '2124851e890f46158189b5fa90006d40')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   export QTDIR=/usr
+  patch -Np1 -i "${srcdir}/lrdf_raptor2.patch"
   scons prefix=/usr libarchive=1
 }
 
diff --git a/extra/hydrogen/lrdf_raptor2.patch b/extra/hydrogen/lrdf_raptor2.patch
new file mode 100644
index 000000000..ec176b716
--- /dev/null
+++ b/extra/hydrogen/lrdf_raptor2.patch
@@ -0,0 +1,11 @@
+diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
+--- hydrogen-0.9.5.old/Sconstruct	2011-08-11 18:00:07.889112348 +0800
++++ hydrogen-0.9.5/Sconstruct	2011-08-11 18:00:34.945632437 +0800
+@@ -83,6 +83,7 @@
+ 	includes.append( './' )
+ 	includes.append( 'gui/src/' )
+ 	includes.append( '3rdparty/install/include' )
++	includes.append( '/usr/include/raptor2' )
+ 
+ 	if sys.platform == "darwin":
+ 		ldflags.append( '-L/opt/local/lib' )
diff --git a/extra/kdebindings-python/PKGBUILD b/extra/kdebindings-python/PKGBUILD
index 3fa56c015..239a2ca67 100644
--- a/extra/kdebindings-python/PKGBUILD
+++ b/extra/kdebindings-python/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 132576 2011-07-25 00:12:30Z andrea $
+# $Id: PKGBUILD 135257 2011-08-11 16:57:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebindings-python
 pkgver=4.7.0
-pkgrel=1
-pkgdesc="KDE bindings for python"
+pkgrel=2
+pkgdesc="KDE bindings for Python"
 url="http://kde.org/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
diff --git a/extra/libxfont/PKGBUILD b/extra/libxfont/PKGBUILD
index d42d1ede8..9d62d6835 100644
--- a/extra/libxfont/PKGBUILD
+++ b/extra/libxfont/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 97682 2010-11-01 09:15:00Z jgc $
+# $Id: PKGBUILD 135207 2011-08-11 07:14:39Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxfont
-pkgver=1.4.3
+pkgver=1.4.4
 pkgrel=1
 pkgdesc="X11 font rasterisation library"
 arch=(i686 x86_64)
@@ -12,7 +12,7 @@ depends=('freetype2' 'libfontenc' 'xproto' 'fontsproto')
 makedepends=('xorg-util-macros' 'xtrans')
 options=('!libtool')
 source=(${url}/archive/individual/lib/libXfont-${pkgver}.tar.bz2)
-sha1sums=('191b40c566f80737cf6838747d86ebaee7b0c7d7')
+sha1sums=('189dd7a3756cb80bcf41b779bf05ec3c366e3041')
 
 build() {
   cd "${srcdir}/libXfont-${pkgver}"
diff --git a/extra/pyqt/PKGBUILD b/extra/pyqt/PKGBUILD
index cedae286a..d3e0493b0 100644
--- a/extra/pyqt/PKGBUILD
+++ b/extra/pyqt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 122181 2011-05-02 17:31:08Z andrea $
+# $Id: PKGBUILD 135252 2011-08-11 16:55:55Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt
 pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.8.4
+pkgver=4.8.5
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
@@ -13,7 +13,7 @@ license=('GPL')
 makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
              'python-opengl' 'qt-assistant-compat')
 source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('97c5dc1042feb5b3fe20baabad055af1')
+md5sums=('0e4264bb912edfbda319bb236ac84407')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/rosegarden/PKGBUILD b/extra/rosegarden/PKGBUILD
index e3227ab9d..967e6d1ea 100644
--- a/extra/rosegarden/PKGBUILD
+++ b/extra/rosegarden/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 124858 2011-05-24 19:56:15Z schiv $
+# $Id: PKGBUILD 135263 2011-08-11 18:35:34Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -13,22 +13,23 @@ url="http://www.rosegardenmusic.com/"
 license=('GPL')
 depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils'
          'perl' 'qt' 'shared-mime-info')
-makedepends=('pkgconfig' 'imake')
+makedepends=('imake')
 optdepends=('lilypond: notation display'
             'cups: printing support'
             'okular: print preview, or any other PDF viewer'
             'timidity++: MIDI playback, or any other softsynth'
             'flac'
             'wavpack')
-[ "$CARCH" = "i686" ] && optdepends=("${optdepends[@]}"
-                                     'dssi-vst: win32 VST support')
+[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
 install=$pkgname.install
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2)
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
 md5sums=('77ab43d06de53ace338843ff82e26288')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
+  # lrdf + raptor2 compatibility
+  export lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
   ./configure --prefix=/usr
   make
 }
@@ -36,7 +37,7 @@ build() {
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/scummvm/PKGBUILD b/extra/scummvm/PKGBUILD
index 061962a8e..1ed7ff194 100644
--- a/extra/scummvm/PKGBUILD
+++ b/extra/scummvm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 106447 2011-01-17 06:22:16Z angvp $
+# $Id: PKGBUILD 135227 2011-08-11 09:16:00Z juergen $
 # Maintainer: juergen <juergen@hoetzel.info>
 # Contributor: Manolis Tzanidakis, Petter Gundersen
 
 pkgname=scummvm
-pkgver=1.2.1
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="A 'virtual machine' for several classic graphical point-and-click adventure games."
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('GPL')
 url="http://www.scummvm.org/"
 depends=('gcc-libs' 'alsa-lib' 'libmad' 'libvorbis' 'zlib' 'flac>=1.1.4' 'sdl' 'fluidsynth')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('b1d224d7640bc7fdccaca958164b31df')
+md5sums=('87e5076e93bfa762f1c5d7f45b41d4e2')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 5d73e1d73..b326c385e 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,25 +1,20 @@
-# $Id: PKGBUILD 130000 2011-06-30 19:02:46Z andrea $
+# $Id: PKGBUILD 135247 2011-08-11 16:54:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python2-sip')
-pkgver=4.12.3
-pkgrel=2
+pkgver=4.12.4
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.riverbankcomputing.com/software/sip/"
 license=('custom:"sip"')
 makedepends=('python' 'python2')
-source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz"
-        'fix-regression.patch')
-md5sums=('d0f1fa60494db04b4d115d4c2d92f79e'
-         '598ffc65ebaf1c0e8855a352b02c43e7')
+source=("http://www.riverbankcomputing.com/static/Downloads/sip4/${pkgbase}-${pkgver}.tar.gz")
+md5sums=('6cbd56abb7d35aad833789c98ae61652')
 
 build() {
-  cd "${srcdir}"/${pkgbase}-${pkgver}
-  patch -p1 -i "${srcdir}"/fix-regression.patch
-
   cd "${srcdir}"
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
 
diff --git a/staging/libepc/PKGBUILD b/staging/libepc/PKGBUILD
new file mode 100644
index 000000000..55d302e51
--- /dev/null
+++ b/staging/libepc/PKGBUILD
@@ -0,0 +1,27 @@
+# $Id: PKGBUILD 135240 2011-08-11 10:52:34Z ibiru $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=libepc
+pkgver=0.3.11
+pkgrel=2
+pkgdesc="Easy Publish and Consume Library"
+arch=(i686 x86_64)
+license=('LGPL')
+url="http://live.gnome.org/libepc"
+depends=('gtk2' 'avahi' 'libsoup')
+makedepends=('intltool')
+options=('!libtool' '!makeflags')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('ec38fe4206fab7a8939fb351d7b419cc681ac44afcdd5aab9bdb8fc3386df25c')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/loudmouth/01-fix-sasl-md5-digest-uri.patch b/staging/loudmouth/01-fix-sasl-md5-digest-uri.patch
new file mode 100644
index 000000000..5bca69c0c
--- /dev/null
+++ b/staging/loudmouth/01-fix-sasl-md5-digest-uri.patch
@@ -0,0 +1,24 @@
+diff --git a/loudmouth/lm-connection.c b/loudmouth/lm-connection.c
+index 21c1bc2..ae8de94 100644
+--- a/loudmouth/lm-connection.c
++++ b/loudmouth/lm-connection.c
+@@ -1441,11 +1441,18 @@ lm_connection_authenticate (LmConnection      *connection,
+ 	connection->effective_jid = g_strdup_printf ("%s/%s", 
+ 		connection->jid, connection->resource);
+ 
+ 	if (connection->use_sasl) {
++		gchar *domain = NULL;
++
++		if (!connection_get_server_from_jid (connection->jid, &domain)) {
++			domain = g_strdup (connection->server);
++		}
++
+ 		lm_sasl_authenticate (connection->sasl,
+ 				      username, password,
+-				      connection->server,
++				      domain,
+ 				      connection_sasl_auth_finished);
++		g_free (domain);
+ 
+ 		connection->features_cb  =
+ 			lm_message_handler_new (connection_features_cb,
diff --git a/staging/loudmouth/03-drop-stanzas-on-fail.patch b/staging/loudmouth/03-drop-stanzas-on-fail.patch
new file mode 100644
index 000000000..87b86a998
--- /dev/null
+++ b/staging/loudmouth/03-drop-stanzas-on-fail.patch
@@ -0,0 +1,45 @@
+From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
+Date: Tue, 13 Jan 2009 11:28:44 +0000
+Subject: [PATCH] Drop stanzas when failing to convert them to LmMessages
+
+when a stanza comes in that for some reason can't be parsed into an LmMessage,
+just drop them on the floor instead of blocking the parser. I've seen this
+issue happen in practise because some (buggy?) client sending an iq with a
+prefix e.g. <client:iq xmlns:client="jabber:client" ... />
+---
+ loudmouth/lm-parser.c |   15 ++++++---------
+ 1 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/loudmouth/lm-parser.c b/loudmouth/lm-parser.c
+index 1938d56..89f6675 100644
+--- a/loudmouth/lm-parser.c
++++ b/loudmouth/lm-parser.c
+@@ -151,19 +151,16 @@ parser_end_node_cb (GMarkupParseContext  *context,
+ 		if (!m) {
+ 			g_warning ("Couldn't create message: %s\n",
+ 				   parser->cur_root->name);
+-			return;
+-		}
+-
+-		g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
++		} else {
++			g_log (LM_LOG_DOMAIN, LM_LOG_LEVEL_PARSER,
+ 		       "Have a new message\n");
+-		if (parser->function) {
+-			(* parser->function) (parser, m, parser->user_data);
++			if (parser->function) {
++				(* parser->function) (parser, m, parser->user_data);
++			}
++			lm_message_unref (m);
+ 		}
+ 
+-		lm_message_unref (m);
+ 		lm_message_node_unref (parser->cur_root);
+-		
+-			
+ 		parser->cur_node = parser->cur_root = NULL;
+ 	} else {
+ 		LmMessageNode *tmp_node;
+-- 
+1.5.6.5
+
diff --git a/staging/loudmouth/04-use-pkg-config-for-gnutls.patch b/staging/loudmouth/04-use-pkg-config-for-gnutls.patch
new file mode 100644
index 000000000..20f388e89
--- /dev/null
+++ b/staging/loudmouth/04-use-pkg-config-for-gnutls.patch
@@ -0,0 +1,23 @@
+Description: use pkg-config to detect gnutls
+Debian: http://bugs.debian.org/529835
+Origin: http://groups.google.com/group/loudmouth-dev/browse_thread/thread/3f78255837048daf#
+
+--- a/configure.ac.orig	2009-08-16 20:29:36.000000000 +0200
++++ b/configure.ac	2009-08-16 20:30:43.000000000 +0200
+@@ -146,10 +146,12 @@ AC_ARG_WITH(openssl-libs,
+ enable_ssl=no
+ if test "x$ac_ssl" = "xgnutls"; then
+   dnl Look for GnuTLS
+-  AM_PATH_LM_LIBGNUTLS($GNUTLS_REQUIRED, have_libgnutls=yes, have_libgnutls=no)
+-  if test "x$have_libgnutls" = "xyes"; then
+-    CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+-    LIBS="$LIBS $LIBGNUTLS_LIBS"
++  PKG_CHECK_MODULES(GNUTLS, gnutls >= $GNUTLS_REQUIRED, have_gnutls=yes, have_gnutls=no)
++  if test "x$have_gnutls" = "xyes"; then 
++    AC_SUBST(ASYNCNS_CFLAGS)
++    AC_SUBST(ASYNCNS_LIBS)
++    CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
++    LIBS="$LIBS $GNUTLS_LIBS"
+     AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
+     enable_ssl=GnuTLS
+   else
diff --git a/staging/loudmouth/PKGBUILD b/staging/loudmouth/PKGBUILD
new file mode 100644
index 000000000..d1686df56
--- /dev/null
+++ b/staging/loudmouth/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Contributor: damir <damir@archlinux.org>
+# Contributor: Brice Carpentier <brice.carpentier@orange.fr>
+
+pkgname=loudmouth
+pkgver=1.4.3
+pkgrel=3
+pkgdesc="A lightweight Jabber client library written in C/Glib"
+arch=('i686' 'x86_64')
+license=('LGPL')
+url="http://groups.google.com/group/loudmouth-dev"
+depends=('glib2' 'gnutls' 'libidn')
+options=('!libtool')
+makedepends=('intltool' 'pkgconfig' 'gtk-doc')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.4/${pkgname}-${pkgver}.tar.bz2
+        01-fix-sasl-md5-digest-uri.patch
+        03-drop-stanzas-on-fail.patch
+        04-use-pkg-config-for-gnutls.patch)
+md5sums=('55339ca42494690c3942ee1465a96937'
+         'dc799cea18b24847b1e008c7424010a3'
+         'b7b2d81b01a5eee5fd5e21cae67b4af7'
+         'bffb25b9551df43255fe1706588582f3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/01-fix-sasl-md5-digest-uri.patch"
+  patch -Np1 -i "${srcdir}/03-drop-stanzas-on-fail.patch"
+  patch -Np1 -i "${srcdir}/04-use-pkg-config-for-gnutls.patch"
+  libtoolize --force
+  autoreconf
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/xf86-input-wacom/70-wacom.rules b/staging/xf86-input-wacom/70-wacom.rules
new file mode 100644
index 000000000..f6aa20835
--- /dev/null
+++ b/staging/xf86-input-wacom/70-wacom.rules
@@ -0,0 +1,12 @@
+ACTION!="add|change", GOTO="wacom_end"
+
+# Match all serial wacom tablets with a serial ID starting with WACf
+# Notes: We assign NAME though we shouldn't, but currently the server requires it
+#        We assign the lot to subsystem pnp too because server reads NAME from
+#        the parent device. Once all that's fixed, as simple SUBSYSTEM="tty"
+#        will do and the ENV{NAME} can be removed.
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="WACf*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
+SUBSYSTEM=="tty|pnp", SUBSYSTEMS=="pnp", ATTRS{id}=="FUJ*", ENV{ID_MODEL}="Serial Wacom Tablet $attr{id}", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", ENV{NAME}="Serial Wacom Tablet $attr{id}"
+
+LABEL="wacom_end"
+
diff --git a/staging/xf86-input-wacom/PKGBUILD b/staging/xf86-input-wacom/PKGBUILD
new file mode 100644
index 000000000..9f693c3c5
--- /dev/null
+++ b/staging/xf86-input-wacom/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 135212 2011-08-11 07:18:08Z jgc $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# Contributor: M Rawash <mrawash@gmail.com>
+
+pkgname=xf86-input-wacom
+pkgver=0.11.1
+pkgrel=3
+pkgdesc="X.Org Wacom tablet driver"
+arch=('i686' 'x86_64')
+url="http://linuxwacom.sourceforge.net/"
+license=('GPL')
+backup=('etc/X11/xorg.conf.d/50-wacom.conf')
+depends=('libxi' 'libxrandr')
+makedepends=('xorg-server-devel>=1.10.99.902' 'libxext' 'libxi')
+conflicts=('xorg-server<1.10.99.902')
+options=(!libtool)
+source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        70-wacom.rules)
+md5sums=('0aec4a338cc583ed497b6af68d6d80ab'
+         '10db4f8272286690255c1bcc18bfdd92')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr --with-xorg-conf-dir=/etc/X11/xorg.conf.d
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+
+  install -m755 -d "${pkgdir}/lib/udev/rules.d"
+  install -m644 "${srcdir}/70-wacom.rules"  "${pkgdir}/lib/udev/rules.d/"
+}
diff --git a/staging/xf86-video-voodoo/PKGBUILD b/staging/xf86-video-voodoo/PKGBUILD
new file mode 100644
index 000000000..10d718da0
--- /dev/null
+++ b/staging/xf86-video-voodoo/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 135221 2011-08-11 07:49:16Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-voodoo
+pkgver=1.2.4
+pkgrel=5
+pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto')
+conflicts=('xorg-server<1.10.99.902')
+groups=('xorg-drivers' 'xorg')
+options=('!libtool')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('7ecd232cc0b7fe507e18e08799791eefa9fdaf48')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/staging/xf86-video-xgi/PKGBUILD b/staging/xf86-video-xgi/PKGBUILD
new file mode 100644
index 000000000..731c3ea69
--- /dev/null
+++ b/staging/xf86-video-xgi/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 135218 2011-08-11 07:46:30Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-xgi
+pkgver=1.6.0
+pkgrel=4
+pkgdesc="X.org XGI video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto')
+conflicts=('xorg-server<1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git-fixes.patch)
+sha1sums=('826f14d6ba799cd2aae9f0c818f84cf8b75f1ddb'
+          '61ce13325c69befaa710c3389a85a8aa9d1cf28d')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-xgi/git-fixes.patch b/staging/xf86-video-xgi/git-fixes.patch
new file mode 100644
index 000000000..f15fea88a
--- /dev/null
+++ b/staging/xf86-video-xgi/git-fixes.patch
@@ -0,0 +1,451 @@
+diff --git a/man/xgi.man b/man/xgi.man
+index 19880f2..5699ae4 100644
+--- a/man/xgi.man
++++ b/man/xgi.man
+@@ -1,4 +1,3 @@
+-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi.man,v 1.14 2003/11/12 16:50:36 twini Exp $
+ .\" shorthand for double quote that works everywhere.
+ .ds q \N'34'
+ .TH XGI __drivermansuffix__ __vendorversion__
+diff --git a/src/vb_init.c b/src/vb_init.c
+index 8338410..50980c4 100755
+--- a/src/vb_init.c
++++ b/src/vb_init.c
+@@ -131,6 +131,8 @@ static void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT,
+ static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT, 
+     PVB_DEVICE_INFO);
+ static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO);
++/* horrible */
++#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType
+ 
+ static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo,
+     UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5],
+@@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension ,
+     }
+ 
+     temp3 = 0 ;
+-    for( k = 0 ; k < 4 ; k++ )
++    for( k = 1 ; k < 4 ; k++ )
+     {
+         XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ;		/* CR6E_D[1:0] select channel */
+         temp2 = 0 ;
+diff --git a/src/vgatypes.h b/src/vgatypes.h
+index 8a60927..7484661 100755
+--- a/src/vgatypes.h
++++ b/src/vgatypes.h
+@@ -1,5 +1,3 @@
+-/* $XFree86$ */
+-/* $XdotOrg$ */
+ /*
+  * General type definitions for universal mode switching modules
+  *
+diff --git a/src/xgi.h b/src/xgi.h
+index 715502f..e818631 100755
+--- a/src/xgi.h
++++ b/src/xgi.h
+@@ -981,6 +981,7 @@ int compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div,
+ void XGI_WaitBeginRetrace(XGIIOADDRESS RelIO);
+ void XGI_WaitEndRetrace(XGIIOADDRESS RelIO);
+ 
++#include <unistd.h>
+ /* 2005/11/21 added by jjtseng */
+ #define DelayS(sec) usleep((sec)*1000000)
+ #define DelayMS(millisec) usleep((millisec)*1000)
+diff --git a/src/xgi_accel.c b/src/xgi_accel.c
+index c072691..4c298ed 100755
+--- a/src/xgi_accel.c
++++ b/src/xgi_accel.c
+@@ -200,20 +200,7 @@ extern int FbDevExist;
+ #endif
+ 
+ #if X_BYTE_ORDER == X_BIG_ENDIAN
+-static CARD32 BE_SWAP32 (CARD32 val)
+-{
+-	PDEBUG(ErrorF("X_BIG_ENDIAN...\n"));
+-    if (CurrentColorDepth == 8)
+-	    return   ((((val) & 0x000000ff) << 24) | \
+-                  (((val) & 0x0000ff00) << 8) |  \
+-                  (((val) & 0x00ff0000) >> 8) |  \
+-                  (((val) & 0xff000000) >> 24));
+-    if (CurrentColorDepth == 24)
+-        return val;
+-    if (CurrentColorDepth == 16)
+-        return ((((val) & 0x0000ffff) << 16) | \
+-		         (((val) & 0xffff0000) >> 16));
+-}    
++#define BE_SWAP32(x) lswapl(x)
+ #else 
+ static CARD32 BE_SWAP32 (CARD32 val)
+ {
+diff --git a/src/xgi_dga.c b/src/xgi_dga.c
+index 04f90aa..8bd84bc 100755
+--- a/src/xgi_dga.c
++++ b/src/xgi_dga.c
+@@ -103,18 +103,18 @@ XGISetupDGAMode(
+ 
+ 	if(pMode->HDisplay != otherPitch) {
+ 
+-	    newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec));
++	    newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec));
+ 	    oneMore  = TRUE;
+ 
+ 	} else {
+ 
+-	    newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec));
++	    newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec));
+ 	    oneMore  = FALSE;
+ 
+ 	}
+ 
+ 	if(!newmodes) {
+-	    xfree(modes);
++	    free(modes);
+ 	    return NULL;
+ 	}
+ 	modes = newmodes;
+diff --git a/src/xgi_dri.c b/src/xgi_dri.c
+index 93687e1..e575c19 100755
+--- a/src/xgi_dri.c
++++ b/src/xgi_dri.c
+@@ -46,7 +46,6 @@
+ 
+ #include "xf86.h"
+ #include "xf86_OSproc.h"
+-#include "xf86Priv.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+@@ -145,13 +144,13 @@ XGIInitVisualConfigs(ScreenPtr pScreen)
+     }
+     if (!(pXGIConfigs = (XGIConfigPrivPtr)xnfcalloc(sizeof(XGIConfigPrivRec),
+ 						    numConfigs))) {
+-      xfree(pConfigs);
++      free(pConfigs);
+       return FALSE;
+     }
+     if (!(pXGIConfigPtrs = (XGIConfigPrivPtr*)xnfcalloc(sizeof(XGIConfigPrivPtr),
+ 							  numConfigs))) {
+-      xfree(pConfigs);
+-      xfree(pXGIConfigs);
++      free(pConfigs);
++      free(pXGIConfigs);
+       return FALSE;
+     }
+     for (i=0; i<numConfigs; i++)
+@@ -333,7 +332,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen)
+   pDRIInfo->bufferRequests = DRI_ALL_WINDOWS;
+ 
+   if (!DRIScreenInit(pScreen, pDRIInfo, &pXGI->drmSubFD)) {
+-    xfree(pDRIInfo->devPrivate);
++    free(pDRIInfo->devPrivate);
+     pDRIInfo->devPrivate=0;
+     DRIDestroyInfoRec(pXGI->pDRIInfo);
+     pXGI->pDRIInfo=0;
+@@ -537,14 +536,14 @@ XGIDRICloseScreen(ScreenPtr pScreen)
+ 
+   if (pXGI->pDRIInfo) {
+     if (pXGI->pDRIInfo->devPrivate) {
+-      xfree(pXGI->pDRIInfo->devPrivate);
++      free(pXGI->pDRIInfo->devPrivate);
+       pXGI->pDRIInfo->devPrivate=0;
+     }
+     DRIDestroyInfoRec(pXGI->pDRIInfo);
+     pXGI->pDRIInfo=0;
+   }
+-  if (pXGI->pVisualConfigs) xfree(pXGI->pVisualConfigs);
+-  if (pXGI->pVisualConfigsPriv) xfree(pXGI->pVisualConfigsPriv);
++  if (pXGI->pVisualConfigs) free(pXGI->pVisualConfigs);
++  if (pXGI->pVisualConfigsPriv) free(pXGI->pVisualConfigsPriv);
+ 
+   if(pXGI->agpSize){
+ /* ErrorF("Freeing agp memory\n"); */
+diff --git a/src/xgi_driver.c b/src/xgi_driver.c
+index b4f83b8..b8b8679 100755
+--- a/src/xgi_driver.c
++++ b/src/xgi_driver.c
+@@ -54,7 +54,7 @@
+ #include "fb.h"
+ #include "micmap.h"
+ #include "xf86.h"
+-#include "xf86Priv.h"
++#include "xf86Module.h"
+ #include "xf86_OSproc.h"
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+@@ -106,6 +106,10 @@
+ #include <unistd.h>
+ #endif
+ 
++#ifndef DEFAULT_DPI
++#define DEFAULT_DPI 96
++#endif
++
+ /* Jong 01/22/2009; compiler error; type conflict */
+ /*
+ #include <fcntl.h>
+@@ -556,13 +560,13 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+              * head.
+              */
+             if (pXGIEnt->BIOS)
+-                xfree(pXGIEnt->BIOS);
++                free(pXGIEnt->BIOS);
+             pXGIEnt->BIOS = pXGI->BIOS = NULL;
+             if (pXGIEnt->XGI_Pr)
+-                xfree(pXGIEnt->XGI_Pr);
++                free(pXGIEnt->XGI_Pr);
+             pXGIEnt->XGI_Pr = pXGI->XGI_Pr = NULL;
+             if (pXGIEnt->RenderAccelArray)
+-                xfree(pXGIEnt->RenderAccelArray);
++                free(pXGIEnt->RenderAccelArray);
+             pXGIEnt->RenderAccelArray = pXGI->RenderAccelArray = NULL;
+         }
+         else {
+@@ -573,19 +577,19 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+     }
+     else {
+         if (pXGI->BIOS)
+-            xfree(pXGI->BIOS);
++            free(pXGI->BIOS);
+         pXGI->BIOS = NULL;
+         if (pXGI->XGI_Pr)
+-            xfree(pXGI->XGI_Pr);
++            free(pXGI->XGI_Pr);
+         pXGI->XGI_Pr = NULL;
+         if (pXGI->RenderAccelArray)
+-            xfree(pXGI->RenderAccelArray);
++            free(pXGI->RenderAccelArray);
+         pXGI->RenderAccelArray = NULL;
+     }
+ 
+ #ifdef XGIMERGED
+     if (pXGI->MetaModes)
+-        xfree(pXGI->MetaModes);
++        free(pXGI->MetaModes);
+     pXGI->MetaModes = NULL;
+ 
+     if (pXGI->CRT1Modes) {
+@@ -595,8 +599,8 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+                 do {
+                     DisplayModePtr p = pScrn->currentMode->next;
+                     if (pScrn->currentMode->Private)
+-                        xfree(pScrn->currentMode->Private);
+-                    xfree(pScrn->currentMode);
++                        free(pScrn->currentMode->Private);
++                    free(pScrn->currentMode);
+                     pScrn->currentMode = p;
+                 } while (pScrn->currentMode != pScrn->modes);
+             }
+@@ -612,7 +616,7 @@ XGIFreeRec(ScrnInfoPtr pScrn)
+     pXGI->pVbe = NULL;
+     if (pScrn->driverPrivate == NULL)
+         return;
+-    xfree(pScrn->driverPrivate);
++    free(pScrn->driverPrivate);
+     pScrn->driverPrivate = NULL;
+ }
+ 
+@@ -975,7 +979,7 @@ XGIProbe(DriverPtr drv, int flags)
+                                     numDevSections, drv, &usedChips);
+ 
+     /* Free it since we don't need that list after this */
+-    xfree(devSections);
++    free(devSections);
+     if (numUsed <= 0)
+         return FALSE;
+ 
+@@ -1015,7 +1019,7 @@ XGIProbe(DriverPtr drv, int flags)
+ 
+ #endif
+         }
+-    xfree(usedChips);
++    free(usedChips);
+ 
+     return foundScreen;
+ }
+@@ -1044,11 +1048,11 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
+ 
+ 	ErrorF("XGICopyModeNLink()...Use Virtual Size-1\n");
+ 
+-    if (!((mode = xalloc(sizeof(DisplayModeRec)))))
++    if (!((mode = malloc(sizeof(DisplayModeRec)))))
+         return dest;
+     memcpy(mode, i, sizeof(DisplayModeRec));
+-    if (!((mode->Private = xalloc(sizeof(XGIMergedDisplayModeRec))))) {
+-        xfree(mode);
++    if (!((mode->Private = malloc(sizeof(XGIMergedDisplayModeRec))))) {
++        free(mode);
+         return dest;
+     }
+     ((XGIMergedDisplayModePtr) mode->Private)->CRT1 = i;
+@@ -1125,8 +1129,8 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest,
+         xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
+                    "Skipped %dx%d, not enough video RAM or beyond hardware specs\n",
+                    mode->HDisplay, mode->VDisplay);
+-        xfree(mode->Private);
+-        xfree(mode);
++        free(mode->Private);
++        free(mode);
+ 
+         return dest;
+     }
+@@ -1559,10 +1563,10 @@ XGIFreeCRT2Structs(XGIPtr pXGI)
+                                    pXGI->CRT2pScrn->monitor->Modes);
+             }
+             if (pXGI->CRT2pScrn->monitor->DDC)
+-                xfree(pXGI->CRT2pScrn->monitor->DDC);
+-            xfree(pXGI->CRT2pScrn->monitor);
++                free(pXGI->CRT2pScrn->monitor->DDC);
++            free(pXGI->CRT2pScrn->monitor);
+         }
+-        xfree(pXGI->CRT2pScrn);
++        free(pXGI->CRT2pScrn);
+         pXGI->CRT2pScrn = NULL;
+     }
+ }
+@@ -2438,7 +2442,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
+ 
+ #ifdef XGIMERGED
+     if (pXGI->MergedFB) {
+-        pXGI->CRT2pScrn->monitor = xalloc(sizeof(MonRec));
++        pXGI->CRT2pScrn->monitor = malloc(sizeof(MonRec));
+         if (pXGI->CRT2pScrn->monitor) {
+             DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL;
+             memcpy(pXGI->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec));
+@@ -2446,11 +2450,11 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
+             pXGI->CRT2pScrn->monitor->Modes = NULL;
+             tempm = pScrn->monitor->Modes;
+             while (tempm) {
+-                if (!(newm = xalloc(sizeof(DisplayModeRec))))
++                if (!(newm = malloc(sizeof(DisplayModeRec))))
+                     break;
+                 memcpy(newm, tempm, sizeof(DisplayModeRec));
+-                if (!(newm->name = xalloc(strlen(tempm->name) + 1))) {
+-                    xfree(newm);
++                if (!(newm->name = malloc(strlen(tempm->name) + 1))) {
++                    free(newm);
+                     break;
+                 }
+                 strcpy(newm->name, tempm->name);
+@@ -2490,7 +2494,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn)
+                         "Failed to allocate memory for CRT2 monitor, %s.\n",
+                         mergeddisstr);
+             if (pXGI->CRT2pScrn)
+-                xfree(pXGI->CRT2pScrn);
++                free(pXGI->CRT2pScrn);
+             pXGI->CRT2pScrn = NULL;
+             pXGI->MergedFB = FALSE;
+         }
+@@ -3540,7 +3544,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
+         /* Do some MergedFB mode initialisation */
+ #ifdef XGIMERGED
+         if (pXGI->MergedFB) {
+-        pXGI->CRT2pScrn = xalloc(sizeof(ScrnInfoRec));
++        pXGI->CRT2pScrn = malloc(sizeof(ScrnInfoRec));
+         if (!pXGI->CRT2pScrn) {
+             XGIErrorLog(pScrn,
+                         "Failed to allocate memory for 2nd pScrn, %s\n",
+@@ -3586,7 +3590,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
+                     XGIErrorLog(pScrn, mergednocrt1, mergeddisstr);
+                 }
+                 if (pXGI->CRT2pScrn)
+-                    xfree(pXGI->CRT2pScrn);
++                    free(pXGI->CRT2pScrn);
+                 pXGI->CRT2pScrn = NULL;
+                 pXGI->MergedFB = FALSE;
+             }
+@@ -3627,7 +3631,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags)
+                 XGIErrorLog(pScrn, mergednocrt2, mergeddisstr);
+             }
+             if (pXGI->CRT2pScrn)
+-                xfree(pXGI->CRT2pScrn);
++                free(pXGI->CRT2pScrn);
+             pXGI->CRT2pScrn = NULL;
+             pXGI->MergedFB = FALSE;
+         }
+@@ -4901,7 +4905,7 @@ XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+ 
+     if (pXGI->ShadowFB) {
+         pXGI->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width);
+-        pXGI->ShadowPtr = xalloc(pXGI->ShadowPitch * height);
++        pXGI->ShadowPtr = malloc(pXGI->ShadowPitch * height);
+         displayWidth = pXGI->ShadowPitch / (pScrn->bitsPerPixel >> 3);
+         FBStart = pXGI->ShadowPtr;
+     }
+@@ -5777,17 +5781,17 @@ XGICloseScreen(int scrnIndex, ScreenPtr pScreen)
+     }
+ 
+     if (pXGI->ShadowPtr) {
+-        xfree(pXGI->ShadowPtr);
++        free(pXGI->ShadowPtr);
+         pXGI->ShadowPtr = NULL;
+     }
+ 
+     if (pXGI->DGAModes) {
+-        xfree(pXGI->DGAModes);
++        free(pXGI->DGAModes);
+         pXGI->DGAModes = NULL;
+     }
+ 
+     if (pXGI->adaptor) {
+-        xfree(pXGI->adaptor);
++        free(pXGI->adaptor);
+         pXGI->adaptor = NULL;
+         pXGI->ResetXv = pXGI->ResetXvGamma = NULL;
+     }
+diff --git a/src/xgi_opt.c b/src/xgi_opt.c
+index 09346e4..c0608d5 100755
+--- a/src/xgi_opt.c
++++ b/src/xgi_opt.c
+@@ -195,7 +195,7 @@ xgiOptions(ScrnInfoPtr pScrn)
+     xf86CollectOptions(pScrn, NULL);
+ 
+     /* Process the options */
+-    if(!(pXGI->Options = xalloc(sizeof(XGIOptions)))) return;
++    if(!(pXGI->Options = malloc(sizeof(XGIOptions)))) return;
+ 
+     memcpy(pXGI->Options, XGIOptions, sizeof(XGIOptions));
+ 
+diff --git a/src/xgi_setup.c b/src/xgi_setup.c
+index c1d2cdc..6641b09 100755
+--- a/src/xgi_setup.c
++++ b/src/xgi_setup.c
+@@ -678,7 +678,7 @@ bAccessVGAPCIInfo(PXGI_HW_DEVICE_INFO pHwDevInfo, ULONG ulOffset, ULONG ulSet, U
+ 	err = pci_device_cfg_write_u32(pXGI->PciInfo, *pulValue,
+ 				       ulOffset & ~3);
+     } else {
+-	err = pci_device_cfg_write_u32(pXGI->PciInfo, pulValue,
++	err = pci_device_cfg_read_u32(pXGI->PciInfo, pulValue,
+ 				       ulOffset & ~3);
+     }
+ 
+diff --git a/src/xgi_video.c b/src/xgi_video.c
+index 31cffd5..df76d14 100755
+--- a/src/xgi_video.c
++++ b/src/xgi_video.c
+@@ -142,7 +142,7 @@ void XGIInitVideo(ScreenPtr pScreen)
+             adaptors = &newAdaptor;
+         } else {
+             newAdaptors =  /* need to free this someplace */
+-                xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
++                malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*));
+             if(newAdaptors) {
+                 memcpy(newAdaptors, adaptors, num_adaptors *
+                                         sizeof(XF86VideoAdaptorPtr));
+@@ -157,7 +157,7 @@ void XGIInitVideo(ScreenPtr pScreen)
+         xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+ 
+     if(newAdaptors)
+-        xfree(newAdaptors);
++        free(newAdaptors);
+ 
+ }
+ 
+@@ -395,7 +395,7 @@ XGISetupImageVideo(ScreenPtr pScreen)
+     struct v4l2_standard 	standard;
+ # endif//VC    
+ 
+-    if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) +
++    if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) +
+                             sizeof(XGIPortPrivRec) +
+                             sizeof(DevUnion))))
+         return NULL;
diff --git a/staging/xf86-video-xgixp/PKGBUILD b/staging/xf86-video-xgixp/PKGBUILD
new file mode 100644
index 000000000..afe49186d
--- /dev/null
+++ b/staging/xf86-video-xgixp/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 135215 2011-08-11 07:24:33Z jgc $
+# Maintainer: Jan de Groot <jgc@archlinux.org>
+
+pkgname=xf86-video-xgixp
+pkgver=1.8.0
+pkgrel=4
+pkgdesc="X.org XGIXP video driver"
+arch=(i686 x86_64)
+url="http://xorg.freedesktop.org/"
+license=('custom')
+depends=('glibc')
+makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto')
+conflicts=('xorg-server<1.10.99.902')
+options=('!libtool')
+groups=('xorg-drivers' 'xorg')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        api-compat-fix-for-DRAWABLE_BUFFER.patch)
+sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3'
+          'ea140a13963bbf33cdff1ad75789d765867ec53b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch"
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}
diff --git a/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
new file mode 100644
index 000000000..f8cb64673
--- /dev/null
+++ b/staging/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch
@@ -0,0 +1,23 @@
+From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Fri, 25 Mar 2011 22:46:55 +0000
+Subject: API compat fix for DRAWABLE_BUFFER
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/xgi_driver.c b/src/xgi_driver.c
+index e54d8c7..189b84a 100644
+--- a/src/xgi_driver.c
++++ b/src/xgi_driver.c
+@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr,
+ {
+     switch (pDraw->type) {
+     case DRAWABLE_WINDOW:
++#ifdef DRAWABLE_BUFFER
+     case DRAWABLE_BUFFER:
++#endif
+ 	*read_ptr = xg47_read_memory_swap_func;
+ 	*write_ptr = xg47_write_memory_swap_func;
+ 	break;
+--
+cgit v0.8.3-6-g21f6