Tue Mar 19 00:04:27 PDT 2013

127 files changed, 2217 insertions, 1779 deletions

diff --git a/community/bitcoin/PKGBUILD b/community/bitcoin/PKGBUILD
index c9ac8a87d..e001e112a 100644
--- a/community/bitcoin/PKGBUILD
+++ b/community/bitcoin/PKGBUILD
@@ -1,19 +1,17 @@
-# $Id: PKGBUILD 85453 2013-03-01 19:08:27Z andrea $
+# $Id: PKGBUILD 86527 2013-03-18 17:04:57Z tredaelli $
 # Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
 # Contributor: shahid <helllamer@gmail.com>
 
 pkgbase=bitcoin
 pkgname=('bitcoin-daemon' 'bitcoin-qt')
-pkgver=0.8.0
-pkgrel=2
+pkgver=0.8.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.bitcoin.org/"
 makedepends=('boost' 'automoc4' 'qrencode' 'miniupnpc')
-conflicts=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
-replaces=('bitcoin' 'bitcoin-bin' 'bitcoin-git')
 license=('MIT')
 source=(http://sourceforge.net/projects/bitcoin/files/Bitcoin/bitcoin-$pkgver/bitcoin-$pkgver-linux.tar.gz)
-sha256sums=('e31529147d307b2240e08af3a5a4606fe2c112d1b0e91e3cce4a2bac2583cecc')
+sha256sums=('6d7f023a9df1a436c51de83f7cd751f162be9b4fb1c06da05545f9fba7cb2a98')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver-linux/src"
diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD
index 9ec0de701..4ce9bf0a0 100644
--- a/community/chmsee/PKGBUILD
+++ b/community/chmsee/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 86352 2013-03-15 14:34:33Z lcarlier $
+# $Id: PKGBUILD 86523 2013-03-18 14:47:32Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: dionydonny <dionydonny@gmail.com>
 # Contributor: Ermanno <erm67@yahoo.it>
 
 pkgname=chmsee
 pkgver=2.0
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner."
 url="http://chmsee.googlecode.com/"
 license=('GPL')
-depends=('xulrunner>=18.0' 'xulrunner<=19.0' 'chmlib' 'desktop-file-utils')
+depends=('xulrunner>18.0' 'xulrunner<20.0' 'chmlib' 'desktop-file-utils')
 makedepends=('python2')
 #source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver
 #source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip
@@ -25,7 +25,7 @@ build() {
 
   cp Makefile.arch Makefile
   sed -i -e 's/17.*/18.0/g' ../application.ini
-  sed -i -e 's/19.*/19.0/g' ../application.ini
+  sed -i -e 's/19.*/20.0/g' ../application.ini
 
   make -j1
 }
diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index b3e7e4114..289faa868 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79547 2012-11-07 09:14:43Z spupykin $
+# $Id: PKGBUILD 86508 2013-03-18 12:20:58Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=darkstat
 pkgver=3.0.715
-pkgrel=7
+pkgrel=8
 pkgdesc="Network statistics gatherer (packet sniffer)"
 url="http://dmr.ath.cx/net/darkstat/"
 license=("GPL")
@@ -17,7 +17,7 @@ source=(http://dmr.ath.cx/net/darkstat/darkstat-$pkgver.tar.bz2
 install=darkstat.install
 md5sums=('5b7abc7538dcd8e30667dac150e81d77'
          '1021f95fabe16cfab4c95f6264d535e5'
-         'e2d9efc856201146e2abae145b4c5a1f'
+         '91dd1cf9d01c2b37896f01b4570b5521'
          'aa9a9effd1e8f08860afcd6439fc94c5')
 
 build() {
diff --git a/community/darkstat/darkstat.service b/community/darkstat/darkstat.service
index 5b7180e45..b92eff85c 100644
--- a/community/darkstat/darkstat.service
+++ b/community/darkstat/darkstat.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Network statistics gatherer (packet sniffer)
+After=network.target
 
 [Service]
 Type=simple
diff --git a/community/gpsmanshp/PKGBUILD b/community/gpsmanshp/PKGBUILD
new file mode 100644
index 000000000..89cfa99af
--- /dev/null
+++ b/community/gpsmanshp/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 86486 2013-03-18 11:13:27Z andrea $
+# Maintainer:  Federico Cinelli   <cinelli@aur.archlinux.org>
+
+pkgname=gpsmanshp
+pkgver=1.2.1
+pkgrel=3
+pkgdesc="A Tcl package to read and write shapefiles"
+arch=('i686' 'x86_64')
+url="http://gpsmanshp.sourceforge.net/"
+license=('GPL')
+depends=('glibc' 'shapelib' 'tcl')
+source=("http://sourceforge.net/projects/$pkgname/files/distr/${pkgname}_$pkgver.tgz")
+md5sums=('c2876d7f67c8215b46b336b5b859d49f')
+
+build() {
+  cd "${pkgname}_$pkgver"
+
+  mv Makefile8.5 Makefile
+  sed -i -e "s:shapefil.h:libshp/shapefil.h:g" gpsmanshp.c
+
+  install -d "$srcdir/${pkgname}_$pkgver/usr/lib/"
+
+  sed -i -e "s|/usr/lib/tcl\$(TCLVERSION)|$srcdir/${pkgname}_$pkgver/usr/lib/gpsmanshp|g" Makefile
+  sed -i -e "s|tclsh\$(TCLVERSION)|tclsh|g" Makefile
+  sed -i "s|package-8.3.tcl|/usr/lib/tcl8.6/package.tcl|g" Makefile
+  sed -i "s|8.4|8.6|g" Makefile
+  
+  make
+}
+
+package() {
+  cd "${pkgname}_$pkgver"
+
+  make install
+}
diff --git a/community/meteorjs/PKGBUILD b/community/meteorjs/PKGBUILD
index ac731580e..76a775371 100644
--- a/community/meteorjs/PKGBUILD
+++ b/community/meteorjs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 86245 2013-03-14 08:59:11Z mtorromeo $
+# $Id: PKGBUILD 86490 2013-03-18 11:33:33Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Parth Buch <parthbuch115 at gmail dot com>
 # Contributor: Tom Vincent <http://tlvince.com/contact/>
 
 pkgname=meteorjs
-pkgver=0.5.8
+pkgver=0.5.9
 pkgrel=1
 pkgdesc="Open-source platform for building top-quality web apps in a fraction of the time."
 arch=('i686' 'x86_64')
@@ -13,14 +13,14 @@ license=('MIT')
 depends=('nodejs' 'mongodb')
 options=('!strip')
 
-sha256sums=('232d7a0bf0947e29fcd6ff8e7314d5783c1b4b7e5c6b5b68ed9ef2ed8d75c6cc'
+sha256sums=('43e228e09c66bc167108c2a8375e23e472d19e82b216ad0875efed94073ef5ba'
             'a3ac659c52b652676da0530f2148025e0f8bfa84bccf63431c20eb72d3bc5cb7')
 
 if [ "$CARCH" = "x86_64" ]; then
     _arch="amd64"
 else
     _arch="i386"
-    sha256sums[0]='b9c45ad56b2ccd2d6fa41740b20c671ea642ce84271474c319ddc8a67a0c77ff'
+    sha256sums[0]='f28ca14d923e19e1035adff506cac8f839c1ec97410d4617a2c2a20cc733d879'
 fi
 
 source=("http://d3sqy0vbqsdhku.cloudfront.net/meteor_$pkgver-1_$_arch.deb" meteor)
diff --git a/community/openbsd-netcat/PKGBUILD b/community/openbsd-netcat/PKGBUILD
index 5f41c273c..ffc02fc9b 100644
--- a/community/openbsd-netcat/PKGBUILD
+++ b/community/openbsd-netcat/PKGBUILD
@@ -1,11 +1,10 @@
-# $Id: PKGBUILD 80338 2012-11-20 10:54:30Z spupykin $
+# $Id: PKGBUILD 86494 2013-03-18 11:55:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
 
 pkgname="openbsd-netcat"
-pkgver=1.105
-pkgrel=5
-_patch=7
+pkgver=1.105_7
+pkgrel=6
 pkgdesc="TCP/IP swiss army knife. OpenBSD variant."
 arch=('i686' 'x86_64')
 url="http://packages.debian.org/sid/netcat-openbsd"
@@ -14,13 +13,13 @@ depends=('libbsd')
 makedepends=('gcc' 'make')
 provides=('netcat')
 conflicts=('gnu-netcat')
-source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}.orig.tar.gz"
-	"http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver}-${_patch}.debian.tar.gz")
+source=("http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver%_*}.orig.tar.gz"
+	"http://ftp.debian.org/debian/pool/main/n/netcat-openbsd/netcat-openbsd_${pkgver/_/-}.debian.tar.gz")
 md5sums=('7e67b22f1ad41a1b7effbb59ff28fca1'
          'e914f8eb7eda5c75c679dd77787ac76b')
 
 build() {
-  cd $srcdir/netcat-openbsd-${pkgver}
+  cd $srcdir/netcat-openbsd-${pkgver%_*}
   for i in `cat ../debian/patches/series`; do
 	echo "** patch $i" 1>&2
 	cat "../debian/patches/$i"
@@ -31,7 +30,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/netcat-openbsd-${pkgver}
+  cd $srcdir/netcat-openbsd-${pkgver%_*}
   install -Dm0755 nc $pkgdir/usr/bin/nc
   ln -s nc $pkgdir/usr/bin/netcat
   install -Dm0644 nc.1 $pkgdir/usr/share/man/man1/nc.1
diff --git a/community/projectm/PKGBUILD b/community/projectm/PKGBUILD
index 45f08ddea..b1114c451 100644
--- a/community/projectm/PKGBUILD
+++ b/community/projectm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85384 2013-03-01 10:37:13Z andrea $
+# $Id: PKGBUILD 86488 2013-03-18 11:20:57Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
@@ -7,7 +7,7 @@
 pkgbase=projectm
 pkgname=('projectm' 'projectm-libvisual' 'projectm-pulseaudio' 'projectm-qt' 'projectm-test')
 pkgver=2.1.0
-pkgrel=4
+pkgrel=5
 arch=('x86_64' 'i686')
 url='http://projectm.sourceforge.net/'
 license=('LGPL')
@@ -50,6 +50,8 @@ package_projectm() {
 package_projectm-libvisual() {
   pkgdesc='ProjectM plugin for XMMS'
   depends=('projectm' 'libvisual' 'gcc-libs')
+  replaces=('libvisual-projectm')
+  provides=('libvisual-projectm')
   
   cd "$srcdir/build/src/projectM-libvisual"
   make DESTDIR="$pkgdir" install
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 67986e7f4..1dfecd096 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84202 2013-02-13 15:56:36Z spupykin $
+# $Id: PKGBUILD 86498 2013-03-18 11:56:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.6.10
+pkgver=2.6.11
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64')
@@ -18,7 +18,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.service"
 	"redis.logrotate")
-md5sums=('711b472b14084863699987786a378d87'
+md5sums=('99d4d79ca7021899001b9c737097bf88'
          '8d843919d9f165e9a47e56cadb4ac2ed'
          '5ab9fdb200e15c13b450fda77fa030b6'
          '9e2d75b7a9dc421122d673fe520ef17f')
diff --git a/community/spacefm/PKGBUILD b/community/spacefm/PKGBUILD
index 1ffc88019..50a3db338 100644
--- a/community/spacefm/PKGBUILD
+++ b/community/spacefm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84210 2013-02-13 18:46:24Z bpiotrowski $
+# $Id: PKGBUILD 86533 2013-03-18 17:58:18Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/
 # Contributor: ridikulus_rat <the.ridikulus.rat@gmail.com>
 
 pkgname=spacefm
-pkgver=0.8.6
+pkgver=0.8.7
 pkgrel=1
 pkgdesc='Multi-panel tabbed file manager'
 arch=('i686' 'x86_64')
@@ -21,7 +21,7 @@ optdepends=('lsof: device processes'
             'udisks: mount as non-root user'
             'udisks2: mount as non-root user')
 source=(https://raw.github.com/IgnorantGuru/$pkgname/master/packages/$pkgver/$pkgname-$pkgver.tar.xz)
-sha256sums=('27f898d180c8a679568f0b40a05b470d728d38c892f4032654c4f696bab476e5')
+sha256sums=('3e48f276df4505b69d24fbeb4b5a869cf316503e2395bef467a29a5207b23947')
 
 build() {
 	cd $srcdir/$pkgname-$pkgver
diff --git a/community/tcc/PKGBUILD b/community/tcc/PKGBUILD
index c5cc9d845..ebb5f21b3 100644
--- a/community/tcc/PKGBUILD
+++ b/community/tcc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 59917 2002-02-02 03:01:25Z spupykin $
+# $Id: PKGBUILD 86525 2013-03-18 16:24:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer : Gergely Imreh <imrehgATgmailDOTcom>
 # Contributor : dschauer <dschauerATgmailDOTcom>
@@ -6,8 +6,8 @@
 # Contributor : Jeremy Cowgar <jeremy@cowgar.com>
 
 pkgname=tcc
-pkgver=0.9.25
-pkgrel=2
+pkgver=0.9.26
+pkgrel=1
 pkgdesc="Tiny C Compiler"
 arch=('i686' 'x86_64')
 url="http://bellard.org/tcc/"
@@ -15,7 +15,7 @@ license=('LGPL')
 makedepends=('gcc')
 options=('docs')
 source=(http://download.savannah.nongnu.org/releases/tinycc/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('991c2a1986cce15f03ca6ddc86ea5f43')
+md5sums=('5fb28e4abc830c46a7f54c1f637fb25d')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -33,6 +33,10 @@ build() {
 
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
   make tccdir=${pkgdir}/usr/lib/tcc libdir=${pkgdir}/usr/lib \
     mandir=${pkgdir}/usr/share/man bindir=${pkgdir}/usr/bin \
     includedir=${pkgdir}/usr/include \
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index 58222e900..97f40159f 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 86369 2013-03-16 00:45:50Z seblu $
+# $Id: PKGBUILD 86481 2013-03-18 07:55:54Z tpowa $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
 pkgver=4.2.10
-_extramodules=extramodules-3.7-ARCH
-pkgrel=1
+_extramodules=extramodules-3.8-ARCH
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 45a8d1b9c..95218e757 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85427 2013-03-01 10:42:53Z andrea $
+# $Id: PKGBUILD 86485 2013-03-18 11:06:47Z andrea $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
@@ -12,7 +12,7 @@ arch=('i686' 'x86_64')
 url="http://www.webtoolkit.eu/"
 license=('GPL')
 depends=('boost-libs' 'libharu')
-makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qtbase')
+makedepends=('boost' 'cmake>=2.8' 'postgresql-libs' 'zlib' 'fcgi' 'sqlite' 'graphicsmagick' 'pango' 'mysql++' 'qt5-base')
 optdepends=('openssl: for SSL support in built-in webserver'
 	    'zlib: for compression in HTTP protocol'
 	    'fcgi: for FastCGI support'
diff --git a/community/zathura-pdf-mupdf/PKGBUILD b/community/zathura-pdf-mupdf/PKGBUILD
index ceb1748c8..f9b084b63 100644
--- a/community/zathura-pdf-mupdf/PKGBUILD
+++ b/community/zathura-pdf-mupdf/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Moritz Lipp <mlq@pwmt.org>
 
 pkgname=zathura-pdf-mupdf
-pkgver=0.2.2
+pkgver=0.2.3
 pkgrel=1
 pkgdesc="Adds pdf support to zathura by using the mupdf library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('custom')
 depends=('mupdf>=1.1' 'zathura')
 conflicts=('zathura-pdf-poppler')
 source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz")
-md5sums=('b66656d7c8cede5db92e1f66e472985d')
+md5sums=('777ba69a321ef4bb9cbced8f6733927a')
 
 build() {
   make -C "${srcdir}/$pkgname-$pkgver"
diff --git a/core/perl/CVE-2013-1667.patch b/core/perl/CVE-2013-1667.patch
deleted file mode 100644
index 8a8f98d32..000000000
--- a/core/perl/CVE-2013-1667.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-commit 9ec0b001b87d32f1d39b038b72846a5c20417be3 (refs/remotes/origin/maint-5.16)
-Author: Andy Dougherty <doughera@lafayette.edu>
-Date:   Wed Jan 16 12:30:43 2013 -0500
-
-    Avoid wraparound when casting unsigned size_t to signed ssize_t.
-    
-    Practically, this only affects a perl compiled with 64-bit IVs on a 32-bit
-    system.  In that instance a value of count >= 2**31 would turn negative
-    when cast to (ssize_t).
-
-diff --git a/perlio.c b/perlio.c
-index 7782728..cccfdcd 100644
---- a/perlio.c
-+++ b/perlio.c
-@@ -2164,7 +2164,7 @@ PerlIOBase_read(pTHX_ PerlIO *f, void *vbuf, Size_t count)
- 	    SSize_t avail = PerlIO_get_cnt(f);
- 	    SSize_t take = 0;
- 	    if (avail > 0)
--		take = ((SSize_t)count < avail) ? (SSize_t)count : avail;
-+		take = (((SSize_t) count >= 0) && ((SSize_t)count < avail)) ? (SSize_t)count : avail;
- 	    if (take > 0) {
- 		STDCHAR *ptr = PerlIO_get_ptr(f);
- 		Copy(ptr, buf, take, STDCHAR);
-@@ -4098,7 +4098,7 @@ PerlIOBuf_unread(pTHX_ PerlIO *f, const void *vbuf, Size_t count)
- 	     */
- 	    b->posn -= b->bufsiz;
- 	}
--	if (avail > (SSize_t) count) {
-+	if ((SSize_t) count >= 0 && avail > (SSize_t) count) {
- 	    /*
- 	     * If we have space for more than count, just move count
- 	     */
-@@ -4148,7 +4148,7 @@ PerlIOBuf_write(pTHX_ PerlIO *f, const void *vbuf, Size_t count)
-     }
-     while (count > 0) {
- 	SSize_t avail = b->bufsiz - (b->ptr - b->buf);
--	if ((SSize_t) count < avail)
-+	if ((SSize_t) count >= 0 && (SSize_t) count < avail)
- 	    avail = count;
- 	if (flushptr > buf && flushptr <= buf + avail)
- 	    avail = flushptr - buf;
-@@ -4423,7 +4423,7 @@ PerlIOPending_read(pTHX_ PerlIO *f, void *vbuf, Size_t count)
- {
-     SSize_t avail = PerlIO_get_cnt(f);
-     SSize_t got = 0;
--    if ((SSize_t)count < avail)
-+    if ((SSize_t) count >= 0 && (SSize_t)count < avail)
- 	avail = count;
-     if (avail > 0)
- 	got = PerlIOBuf_read(aTHX_ f, vbuf, avail);
diff --git a/core/perl/PKGBUILD b/core/perl/PKGBUILD
index 31f7520d3..1dd0db9fb 100644
--- a/core/perl/PKGBUILD
+++ b/core/perl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179840 2013-03-10 11:43:57Z bluewind $
+# $Id: PKGBUILD 180140 2013-03-18 08:31:17Z bluewind $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: kevin <kevin.archlinux.org>
@@ -6,8 +6,8 @@
 # Contributor: francois <francois.archlinux.org>
 
 pkgname=perl
-pkgver=5.16.2
-pkgrel=4
+pkgver=5.16.3
+pkgrel=1
 pkgdesc="A highly capable, feature-rich programming language"
 arch=(i686 x86_64)
 license=('GPL' 'PerlArtistic')
@@ -16,15 +16,13 @@ groups=('base')
 depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
 source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2
         cgi-cr-escaping.diff
-		CVE-2013-1667.patch
         perlbin.sh
         perlbin.csh
         provides.pl)
 install=perl.install
 options=('makeflags' '!purge')
-md5sums=('2818ab01672f005a4e552a713aa27b08'
+md5sums=('025102de0e4a597cf541e57da80c6aa3'
          '0486659c9eefe682364a3e364d814296'
-         '3725d479a42547c6bae33b793b948054'
          '5ed2542fdb9a60682f215bd33701e61a'
          '1f0cbbee783e8a6d32f01be5118e0d5e'
          '999c3eea6464860704abbb055a0f0896')
@@ -37,7 +35,6 @@ build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   patch -i "$srcdir/cgi-cr-escaping.diff" -p1
-  patch -i "$srcdir/CVE-2013-1667.patch" -p1
 
   if [ "${CARCH}" = "x86_64" ]; then
     # for x86_64
diff --git a/core/perl/digest_eval_hole.diff b/core/perl/digest_eval_hole.diff
deleted file mode 100644
index 47904137b..000000000
--- a/core/perl/digest_eval_hole.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-From 4b6a7324284e7435a361c58f7ddb32fc0c635bd0 Mon Sep 17 00:00:00 2001
-From: "Michael G. Schwern" <schwern@pobox.com>
-Date: Mon, 3 Oct 2011 19:05:29 +0100
-Subject: Close the eval "require $module" security hole in
- Digest->new($algorithm)
-
-Also the filter was incomplete.
-
-Bug-Debian: http://bugs.debian.org/644108
-
-Patch-Name: fixes/digest_eval_hole.diff
----
- cpan/Digest/Digest.pm    |    6 ++++--
- cpan/Digest/t/security.t |   14 ++++++++++++++
- 2 files changed, 18 insertions(+), 2 deletions(-)
- create mode 100644 cpan/Digest/t/security.t
-
-diff --git a/cpan/Digest/Digest.pm b/cpan/Digest/Digest.pm
-index 384dfc8..d714434 100644
---- a/cpan/Digest/Digest.pm
-+++ b/cpan/Digest/Digest.pm
-@@ -24,7 +24,7 @@ sub new
-     shift;  # class ignored
-     my $algorithm = shift;
-     my $impl = $MMAP{$algorithm} || do {
--	$algorithm =~ s/\W+//;
-+	$algorithm =~ s/\W+//g;
- 	"Digest::$algorithm";
-     };
-     $impl = [$impl] unless ref($impl);
-@@ -35,7 +35,9 @@ sub new
- 	($class, @args) = @$class if ref($class);
- 	no strict 'refs';
- 	unless (exists ${"$class\::"}{"VERSION"}) {
--	    eval "require $class";
-+	    my $pm_file = $class . ".pm";
-+	    $pm_file =~ s{::}{/}g;
-+	    eval { require $pm_file };
- 	    if ($@) {
- 		$err ||= $@;
- 		next;
-diff --git a/cpan/Digest/t/security.t b/cpan/Digest/t/security.t
-new file mode 100644
-index 0000000..5cba122
---- /dev/null
-+++ b/cpan/Digest/t/security.t
-@@ -0,0 +1,14 @@
-+#!/usr/bin/env perl
-+
-+# Digest->new() had an exploitable eval
-+
-+use strict;
-+use warnings;
-+
-+use Test::More tests => 1;
-+
-+use Digest;
-+
-+$LOL::PWNED = 0;
-+eval { Digest->new(q[MD;5;$LOL::PWNED = 42]) };
-+is $LOL::PWNED, 0;
diff --git a/core/perl/fix-h2ph-and-tests.patch b/core/perl/fix-h2ph-and-tests.patch
deleted file mode 100644
index a2d176ec6..000000000
--- a/core/perl/fix-h2ph-and-tests.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001
-From: Robin Barker <rmbarker@cpan.org>
-Date: Thu, 22 Apr 2010 11:51:20 +0100
-Subject: [PATCH 1/1] Fix h2ph and test
-
----
- lib/h2ph.t    |   12 ++++++++++--
- utils/h2ph.PL |   28 +++++++++++++++++++++++-----
- 2 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/lib/h2ph.t b/lib/h2ph.t
-index 27dd7b9..8d62d46 100644
---- a/lib/h2ph.t
-+++ b/lib/h2ph.t
-@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) {
-     exit 0;
- }
- 
--plan(4);
-+plan(5);
- 
- # quickly compare two text files
- sub txt_compare {
-@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht',
-                    stderr => 1 );
- like( $result, qr/syntax OK$/, "output compiles");
- 
-+$result = runperl( progfile => '_h2ph_pre.ph',
-+                   switches => ['-c'],
-+                   stderr => 1 );
-+like( $result, qr/syntax OK$/, "preamble compiles");
-+
- $result = runperl( switches => ["-w"], 
--                   prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
-+                   stderr => 1,
-+                   prog => <<'PROG' );
-+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
-+PROG
- is( $result, '', "output free of warnings" );
- 
- # cleanup
-diff --git a/utils/h2ph.PL b/utils/h2ph.PL
-index 8f56db4..1255807 100644
---- a/utils/h2ph.PL
-+++ b/utils/h2ph.PL
-@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
- exit $Exit;
- 
- sub expr {
--    $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
-+    if (/\b__asm__\b/) {	# freak out
-+	$new = '"(assembly code)"';
-+	return
-+    }
-     my $joined_args;
-     if(keys(%curargs)) {
- 	$joined_args = join('|', keys(%curargs));
-@@ -770,7 +773,7 @@ sub inc_dirs
- sub build_preamble_if_necessary
- {
-     # Increment $VERSION every time this function is modified:
--    my $VERSION     = 2;
-+    my $VERSION     = 3;
-     my $preamble    = "$Dest_dir/_h2ph_pre.ph";
- 
-     # Can we skip building the preamble file?
-@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
- 		# parenthesized value:  d=(v)
- 		$define{$_} = $1;
- 	    }
--	    if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
-+	    if (/^(\w+)\((\w)\)$/) {
-+		my($macro, $arg) = ($1, $2);
-+		my $def = $define{$_};
-+		$def =~ s/$arg/\$\{$arg\}/g;
-+		print PREAMBLE <<DEFINE;
-+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
-+
-+DEFINE
-+	    } elsif
-+		($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
- 		# float:
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
-@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { $1 } }\n\n";
- 	    } elsif ($define{$_} =~ /^\w+$/) {
--		print PREAMBLE
--		    "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
-+		my $def = $define{$_};
-+		if ($isatype{$def}) {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
-+		} else {
-+		  print PREAMBLE
-+		    "unless (defined &$_) { sub $_() { &$def } }\n\n";
-+	        }
- 	    } else {
- 		print PREAMBLE
- 		    "unless (defined &$_) { sub $_() { \"",
--- 
-1.6.5.2.74.g610f9.dirty
-
diff --git a/extra/apache/PKGBUILD b/extra/apache/PKGBUILD
index 295d98174..abc33e580 100644
--- a/extra/apache/PKGBUILD
+++ b/extra/apache/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166855 2012-09-19 22:46:12Z jgc $
+# $Id: PKGBUILD 180169 2013-03-18 14:04:21Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=apache
-pkgver=2.2.23
+pkgver=2.2.24
 pkgrel=1
 pkgdesc='A high performance Unix-based HTTP server'
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ backup=(etc/conf.d/apache etc/httpd/conf/httpd.conf
         etc/httpd/conf/extra/httpd-{manual,mpm,multilang-errordoc}.conf
         etc/httpd/conf/extra/httpd-{ssl,userdir,vhosts}.conf
         etc/logrotate.d/httpd)
-depends=('openssl' 'zlib' 'apr-util' 'pcre')
+depends=('openssl' 'zlib' 'apr-util' 'pcre' 'systemd')
 optdepends=('lynx: apachectl status')
 install=apache.install
 _itkurl=http://mpm-itk.sesse.net/apache2.2-mpm-itk-2.2.17-01
@@ -39,8 +39,8 @@ source=(http://www.apache.org/dist/httpd/httpd-${pkgver}.tar.bz2
         httpd
         httpd.service
         arch.layout)
-md5sums=('ca133de0e4b4b15316990a97186b9993'
-         '3289ae3b16e1a2dc633c811d6569abb6'
+md5sums=('91bd1484aca13a7095d6432be37fc7ae'
+         'f8f0d879b5fda028aad7ac9f329e057b'
          'f1d9d41360908ceb2374da55ae99197a'
          'cdfa04985a0efa850976aef01c2a0c40'
          '0930d2d0612eb0a53a0d00aea7e8687f'
diff --git a/extra/apache/apache.install b/extra/apache/apache.install
index 9b74e607c..e7b72b74f 100644
--- a/extra/apache/apache.install
+++ b/extra/apache/apache.install
@@ -1,3 +1,7 @@
 post_install() {
-  systemd-tmpfiles --create usr/lib/tmpfiles.d/apache.conf
+  systemd-tmpfiles --create apache.conf
+}
+
+post_upgrade() {
+  systemd-tmpfiles --create apache.conf
 }
diff --git a/extra/colord/PKGBUILD b/extra/colord/PKGBUILD
index dc774b906..2976ba21e 100644
--- a/extra/colord/PKGBUILD
+++ b/extra/colord/PKGBUILD
@@ -1,18 +1,20 @@
-# $Id: PKGBUILD 180120 2013-03-17 17:43:41Z heftig $
+# $Id: PKGBUILD 180252 2013-03-18 22:06:34Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 
-pkgbase=colord
-pkgname=(colord colord-sane)
+pkgname=colord
 pkgver=0.1.30
-pkgrel=1
+pkgrel=2
 pkgdesc="System daemon for managing color devices"
 arch=(i686 x86_64)
 url="http://www.freedesktop.org/software/colord"
 license=(GPL2)
 depends=(lcms2 libgusb polkit shared-color-profiles sqlite udev dconf dbus)
 makedepends=(intltool gobject-introspection vala docbook2x sane)
+optdepends=('sane: UseSANE support [/etc/colord.conf]')
 options=('!libtool')
+install=colord.install
+backup=(etc/colord.conf)
 source=($url/releases/$pkgname-$pkgver.tar.xz)
 sha1sums=('54442a4736192aab65a7fa306142ae1cc30cda15')
 
@@ -26,29 +28,14 @@ build() {
     --sysconfdir=/etc --libexecdir=/usr/lib/colord \
     --localstatedir=/var --disable-static \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
-    --enable-vala --enable-sane
+    --enable-vala --enable-sane --disable-volume-search
   make
 }
 
-package_colord() {
-  install=colord.install
-
+package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install \
     bashcompletiondir=/usr/share/bash-completion/completions
-
-# Split colord-sane
-  cd ..
-  mkdir -p sane/usr/lib/colord{,-plugins}
-  mv {"$pkgdir","$srcdir/sane"}/usr/lib/colord/colord-sane
-  mv {"$pkgdir","$srcdir/sane"}/usr/lib/colord-plugins/libcd_plugin_sane.so
-}
-
-package_colord-sane() {
-  pkgdesc=("SANE plugin for colord")
-  depends=(colord sane)
-
-  mv sane/* "$pkgdir"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/ecl/PKGBUILD b/extra/ecl/PKGBUILD
index ace572370..b1b7cb44d 100644
--- a/extra/ecl/PKGBUILD
+++ b/extra/ecl/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 164666 2012-08-02 09:27:21Z juergen $
+# $Id: PKGBUILD 180165 2013-03-18 13:33:10Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Maintainer: juergen <juergen@archlinux.org>
 
 pkgname=ecl
-pkgver=12.7.1
+pkgver=12.12.1
 pkgrel=1
 pkgdesc="Embeddable Common Lisp"
 arch=('i686' 'x86_64')
@@ -13,8 +13,8 @@ depends=('bash' 'gmp')
 makedepends=('texinfo')
 provides=('common-lisp' 'cl-asdf')
 options=('!makeflags')
-source=(http://downloads.sourceforge.net/project/ecls/ecls/12.7/ecl-12.7.1.tar.gz)
-md5sums=('ce8dd2136fbbc74e44a1c41b32db1f3c')
+source=(http://downloads.sourceforge.net/project/ecls/ecls/12.12/ecl-${pkgver}.tgz)
+md5sums=('014856bdfe265672f9d4b86a060a7aba')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
diff --git a/extra/glamor-egl/PKGBUILD b/extra/glamor-egl/PKGBUILD
index 002ae2ace..bc7954587 100644
--- a/extra/glamor-egl/PKGBUILD
+++ b/extra/glamor-egl/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=glamor-egl
 pkgver=0.5.0
-pkgrel=3
+pkgrel=4
 pkgdesc='OpenGL based 2D rendering acceleration library	'
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
@@ -26,7 +26,7 @@ sha256sums=('5dc8679ccb3e42bf431b6316c7907b9df2db89745d523e04721f34aee6c84991'
             'fc3d937f2cb996586d3a9cc7427050d04d2d19d3f745055cc9d3556428a7cf93'
             'a7fac65474af636995d0181dbf7f8f091d8657260162eb172ae816b75ad98b54'
             'dcf38a7ac303c1636a3b1b7810dcb6ee65ba7e81b6e590840e164ce0e28010dc'
-            '5c0d1dd79a8b50f6720ba2d4dbe288dca11cc19131bb502c6ad2920298ccf843')
+            'c56e677456fb8555b009b1d3b95e939b5a38f37c2a345fff48f2b723e44045e9')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -41,7 +41,7 @@ build() {
   ./configure --prefix=/usr \
     --disable-static \
     --enable-glx-tls \
-
+    #--with-xorg-conf-dir=/etc/X11/xorg.conf.d
 
     #--help
     #--enable-glamor-gles2 \ https://bugs.archlinux.org/task/34284
@@ -58,6 +58,6 @@ package() {
   # http://lists.x.org/archives/xorg-devel/2013-March/035719.html
   
   # add glamor library path to ld.so.conf.d
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo "/usr/lib/xorg/modules" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
+#  install -d ${pkgdir}/etc/ld.so.conf.d
+#  echo "/usr/lib/xorg/modules" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
 }
diff --git a/extra/glamor-egl/git-fixes.patch b/extra/glamor-egl/git-fixes.patch
index 4cf1b9fa0..7a03a225e 100644
--- a/extra/glamor-egl/git-fixes.patch
+++ b/extra/glamor-egl/git-fixes.patch
@@ -175,3 +175,254 @@ index 36beb49..d307838 100644
  	} else {						\
 --
 cgit v0.9.0.2-2-gbebe
+From 61879504f86c5cb326cc06a5873283234cfbbcd2 Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@amd.com>
+Date: Wed, 13 Mar 2013 16:15:33 +0000
+Subject: glamoregl: Use xf86ScreenToScrn()
+
+Fixes crashes when glamor is used for a GPU screen with xserver 1.13 or
+newer.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57200#c17
+
+Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/glamor_egl.c b/src/glamor_egl.c
+index a248aa2..cd0bdc0 100644
+--- a/src/glamor_egl.c
++++ b/src/glamor_egl.c
+@@ -116,7 +116,7 @@ glamor_egl_get_screen_private(ScrnInfoPtr scrn)
+ _X_EXPORT void
+ glamor_egl_make_current(ScreenPtr screen)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+ 
+@@ -139,7 +139,7 @@ glamor_egl_make_current(ScreenPtr screen)
+ _X_EXPORT void
+ glamor_egl_restore_context(ScreenPtr screen)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+ 
+@@ -221,7 +221,7 @@ glamor_create_texture_from_image(struct glamor_egl_screen_private
+ Bool
+ glamor_egl_create_textured_screen(ScreenPtr screen, int handle, int stride)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl;
+ 	PixmapPtr	screen_pixmap;
+ 
+@@ -245,7 +245,7 @@ glamor_egl_create_textured_screen_ext(ScreenPtr screen,
+ 				      int stride,
+ 				      PixmapPtr *back_pixmap)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl;
+ 
+ 	glamor_egl = glamor_egl_get_screen_private(scrn);
+@@ -272,7 +272,7 @@ Bool
+ glamor_egl_create_textured_pixmap(PixmapPtr pixmap, int handle, int stride)
+ {
+ 	ScreenPtr screen = pixmap->drawable.pScreen;
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl;
+ 	EGLImageKHR image;
+ 	GLuint texture;
+@@ -318,7 +318,7 @@ done:
+ static void
+ _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[pixmap->drawable.pScreen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen);
+ 	EGLImageKHR image;
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+@@ -338,7 +338,7 @@ _glamor_egl_destroy_pixmap_image(PixmapPtr pixmap)
+ _X_EXPORT void
+ glamor_egl_exchange_buffers(PixmapPtr front, PixmapPtr back)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[front->drawable.pScreen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(front->drawable.pScreen);
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+ 	EGLImageKHR old_front_image;
+@@ -371,7 +371,7 @@ glamor_egl_close_screen(CLOSE_SCREEN_ARGS_DECL)
+ 	PixmapPtr screen_pixmap;
+ 	EGLImageKHR back_image;
+ 
+-	scrn = xf86Screens[screen->myNum];
++	scrn = xf86ScreenToScrn(screen);
+ 	glamor_egl = glamor_egl_get_screen_private(scrn);
+ 	screen_pixmap = screen->GetScreenPixmap(screen);
+ 
+@@ -417,7 +417,7 @@ glamor_egl_has_extension(struct glamor_egl_screen_private *glamor_egl,
+ void
+ glamor_egl_screen_init(ScreenPtr screen)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+ 
+@@ -588,7 +588,7 @@ glamor_gl_dispatch_init(ScreenPtr screen,
+ 			struct glamor_gl_dispatch *dispatch,
+ 			int gl_version)
+ {
+-	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
++	ScrnInfoPtr scrn = xf86ScreenToScrn(screen);
+ 	struct glamor_egl_screen_private *glamor_egl =
+ 	    glamor_egl_get_screen_private(scrn);
+ 	if (!glamor_gl_dispatch_init_impl
+--
+cgit v0.9.0.2-2-gbebe
+From 3cd34ba9f0708ab7d816eeee80139257fafcb4ad Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi@email.com>
+Date: Wed, 13 Mar 2013 17:28:57 +0000
+Subject: Silence Automake 1.13 warnings
+
+warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
+
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 55721f6..2140b81 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,7 @@ endif
+ 
+ instdir = $(moduledir)
+ 
+-INCLUDES = \
++AM_CPPFLAGS = \
+ 	$(XORG_INCS)
+ 
+ AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
+--
+cgit v0.9.0.2-2-gbebe
+From c7241f097ddb4d3bfb832f6b4ee6fafe8b4d2cfe Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi@email.com>
+Date: Wed, 13 Mar 2013 17:28:58 +0000
+Subject: Properly dist necesary headers
+
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2140b81..0879287 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -31,6 +31,7 @@ libglamor_la_SOURCES = \
+ 	glamor_fill.c \
+ 	glamor_fillspans.c \
+ 	glamor_getspans.c \
++	glamor_glext.h \
+ 	glamor_glyphs.c \
+ 	glamor_polyfillrect.c \
+ 	glamor_polylines.c \
+--
+cgit v0.9.0.2-2-gbebe
+From f2d7f1cf351bdc3a8a00fe564cd6a937db3b4e19 Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi@email.com>
+Date: Wed, 13 Mar 2013 17:49:32 +0000
+Subject: First attempt to make libglamor.so shared versioned library
+
+As recommended by Michel in this thread reply:
+http://lists.freedesktop.org/archives/glamor/2013-March/000305.html
+
+v2: Correct shared library location in glamor.pc.in
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=62259
+
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/glamor.pc.in b/glamor.pc.in
+index 74ecd2e..5257468 100644
+--- a/glamor.pc.in
++++ b/glamor.pc.in
+@@ -2,12 +2,11 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ includedir=@includedir@
+-moduledir=@moduledir@
+ sdkdir=@sdkdir@
+ GLAMOR_GL_CFLAGS=@GLAMOR_GL_CFLAGS@
+ 
+ Name: glamor
+ Description: X.Org glamor common library.
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${sdkdir} -L${moduledir} -lglamor ${GLAMOR_GL_CFLAGS}
+-
++Cflags: -I${sdkdir} ${GLAMOR_GL_CFLAGS}
++Libs: -L${libdir} -lglamor
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 0879287..4beb559 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,4 @@
+-inst_LTLIBRARIES = libglamor.la
++lib_LTLIBRARIES = libglamor.la
+ 
+ # Override these since glamor doesn't need them and the needed files aren't
+ # built (in hw/xfree86/os-support/solaris) until after glamor is built
+@@ -10,14 +10,12 @@ else
+ libglamor_la_LIBADD = $(GL_LIBS)
+ endif
+ 
+-instdir = $(moduledir)
+-
+ AM_CPPFLAGS = \
+ 	$(XORG_INCS)
+ 
+ AM_CFLAGS = $(CWARNFLAGS) $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
+ 
+-libglamor_la_LDFLAGS = -avoid-version
++libglamor_la_LDFLAGS = -version-info 0:0:0
+ 
+ libglamor_la_SOURCES = \
+ 	compat-api.h \
+@@ -65,7 +63,8 @@ if EGL
+ LIBGLAMOREGL = libglamoregl.la
+ module_LTLIBRARIES = $(LIBGLAMOREGL)
+ libglamoregl_la_DEPENDENCIES = libglamor.la
+-libglamoregl_la_LDFLAGS = -avoid-version -module $(EGL_LIBS) -lglamor $(GLX_SYS_LIBS)
++libglamoregl_la_LDFLAGS = -avoid-version -module
++libglamoregl_la_LIBADD = $(EGL_LIBS) $(GLX_SYS_LIBS) libglamor.la
+ libglamoregl_la_SOURCES = glamor_eglmodule.c $(top_srcdir)/src/glamor_egl.c
+ libglamoregl_la_CFLAGS = $(AM_CFLAGS) $(GLX_DEFINES) -I$(top_srcdir)/src $(LIBDRM_CFLAGS) $(EGL_CFLAGS)
+ endif
+--
+cgit v0.9.0.2-2-gbebe
+From 81aadb8ae204f58d77a948c8624f1e72659dcdf0 Mon Sep 17 00:00:00 2001
+From: Armin K <krejzi@email.com>
+Date: Wed, 13 Mar 2013 17:49:33 +0000
+Subject: Don't use AC_PROG_LIBTOOL
+
+Autoconf only needs libtool macros which are copied when
+autoreconf is run. There is no need for looking for
+"libtool" program in PATH. This properly disables static
+libraries from being built and installed.
+
+Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 230543c..5ff6ae1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -37,7 +37,6 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ AM_MAINTAINER_MODE([enable])
+ 
+ # Initialize libtool
+-AC_PROG_LIBTOOL
+ LT_PREREQ([2.2])
+ LT_INIT([disable-static])
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/gtk2/PKGBUILD b/extra/gtk2/PKGBUILD
index eb887b40e..fca801bf2 100644
--- a/extra/gtk2/PKGBUILD
+++ b/extra/gtk2/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178912 2013-02-28 18:37:56Z ioni $
+# $Id: PKGBUILD 180158 2013-03-18 12:05:08Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gtk2
 pkgname=('gtk2' 'gtk-update-icon-cache')
-pkgver=2.24.16
+pkgver=2.24.17
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.gtk.org/"
@@ -13,7 +13,7 @@ options=('!libtool')
 license=('LGPL')
 source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz
         xid-collision-debug.patch)
-sha256sums=('93cd69cc2cecf9a3aa31a50caf4a24752a6928a48c527ae967b109df6f9302d3'
+sha256sums=('e947b2b460156d98e8e38930b82458e1d613a71eb26e927f966f7081a640f415'
             'd758bb93e59df15a4ea7732cf984d1c3c19dff67c94b957575efea132b8fe558')
 
 build() {
diff --git a/extra/gv/PKGBUILD b/extra/gv/PKGBUILD
index 0d2926a8f..ab381a8f3 100644
--- a/extra/gv/PKGBUILD
+++ b/extra/gv/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 154831 2012-03-31 01:32:23Z eric $
+# $Id: PKGBUILD 180131 2013-03-18 05:57:27Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=gv
-pkgver=3.7.3.90
+pkgver=3.7.4
 pkgrel=1
 pkgdesc="A program to view PostScript and PDF documents"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/gv/"
 license=('GPL3')
-depends=('xaw3d>=1.6' 'ghostscript' 'desktop-file-utils')
+depends=('xaw3d' 'ghostscript' 'desktop-file-utils')
+options=('emptydirs')
 install=gv.install
-#source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png)
-source=(ftp://alpha.gnu.org/gnu/gv/${pkgname}-${pkgver}.tar.gz gv.desktop gv.png)
-md5sums=('3eba9b449ccae2537e7d14ce85ca9e66'
-         'cf04652952f2d0903bc7578b4826f50c'
-         'ab0e3879dbe39e59ad1c923020c28a86')
+source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig} gv.desktop)
+sha1sums=('d5bc11a37136dff69248f943a632544a4036b63f'
+          '7d8b7edd60617b189ba39ca982252b0d59c0755d'
+          'b40ccad8a8d837791598075f543edce9aa1f4352')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -27,5 +27,5 @@ package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -D -m644 ../gv.desktop "${pkgdir}/usr/share/applications/gv.desktop"
-  install -D -m644 ../gv.png "${pkgdir}/usr/share/pixmaps/gv.png"
+  install -D -m644 src/gv_icon.xbm "${pkgdir}/usr/share/pixmaps/gv.xbm"
 }
diff --git a/extra/gv/gv.desktop b/extra/gv/gv.desktop
index 6332ee859..e75a27653 100644
--- a/extra/gv/gv.desktop
+++ b/extra/gv/gv.desktop
@@ -4,7 +4,7 @@ Name=GV
 MimeType=application/pdf;application/postscript;image/x-eps;application/illustrator
 GenericName=Postscript Viewer
 Exec=gv
-Icon=gv
+Icon=gv.xbm
 Categories=Application;Graphics;Viewer;Office;
 Type=Application
 Terminal=false
diff --git a/extra/gv/gv.png b/extra/gv/gv.png
deleted file mode 100644
index 59e832a48..000000000
--- a/extra/gv/gv.png
+++ /dev/null
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index b66b9963a..9e890ef91 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178842 2013-02-27 16:20:48Z andyrtr $
+# $Id: PKGBUILD 180226 2013-03-18 16:47:18Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.4.4
+pkgver=4.4.5
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('f1fa7aec113219952d18e4dd87d531ca')
+md5sums=('a8abdc87a00174571908ffaf5cdffd45')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libdc1394/PKGBUILD b/extra/libdc1394/PKGBUILD
index aaba1b8d3..e750c3440 100644
--- a/extra/libdc1394/PKGBUILD
+++ b/extra/libdc1394/PKGBUILD
@@ -1,32 +1,20 @@
-# $Id: PKGBUILD 137888 2011-09-12 08:33:12Z andrea $
+# $Id: PKGBUILD 180144 2013-03-18 09:10:25Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdc1394
-pkgver=2.1.3
-pkgrel=2
+pkgver=2.2.1
+pkgrel=1
 pkgdesc="High level programming interface to control IEEE 1394 based cameras"
 arch=('i686' 'x86_64')
 license=('LGPL')
 url="http://sourceforge.net/projects/libdc1394/"
-depends=('libraw1394>=2.0.7' 'libusb')
+depends=('libraw1394' 'libusb')
 options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
-        'rename-usb_init.patch'
-        'videodev-compile-fix.patch')
-md5sums=('d8b2cbfae1b329fdeaa638da80427334'
-         'bc7a4146b4d2d688305d0d42c4111941'
-         '9dd11c96241b14073c3a7dd7e270fb7a')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5c4b78bb8265d6dc971433ec1da381ab')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # FS#25652
-  patch -p2 -i "${srcdir}"/rename-usb_init.patch
-  # Fix build when linux/video.h exists
-  patch -p2 -i "${srcdir}"/videodev-compile-fix.patch
-
-  
-  autoreconf -i
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/libproxy/PKGBUILD b/extra/libproxy/PKGBUILD
index ca6d9e2d0..8cd9bb63d 100644
--- a/extra/libproxy/PKGBUILD
+++ b/extra/libproxy/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libproxy
-pkgver=0.4.7
-pkgrel=2
+pkgver=0.4.11
+pkgrel=1
 pkgdesc="A library that provides automatic proxy configuration management"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -14,19 +14,13 @@ optdepends=('kdelibs: KDE configuration module'
             'python2: Python bindings')
 makedepends=('cmake' 'networkmanager' 'automoc4' 'python2' 'kdelibs' 'perl')
 url="http://libproxy.googlecode.com"
-source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz
-        libproxy-0.4.7-unistd.patch)
+source=(http://libproxy.googlecode.com/files/${pkgname}-${pkgver}.tar.gz)
 options=('!libtool')
-md5sums=('509e03a488a61cd62bfbaf3ab6a2a7a5'
-         'e90c03f296e553ace347b46f4fea3625')
+md5sums=('3cd1ae2a4abecf44b3f24d6639d2cd84')
 
 build() {
   cd "${srcdir}"
 
-  # Fix build with GCC 4.7 (patch from Fedora)
-  patch -d "${pkgname}-${pkgver}" -Np1 -i \
-    "${srcdir}/libproxy-0.4.7-unistd.patch"
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
diff --git a/extra/libproxy/libproxy-0.4.7-unistd.patch b/extra/libproxy/libproxy-0.4.7-unistd.patch
deleted file mode 100644
index 803f81970..000000000
--- a/extra/libproxy/libproxy-0.4.7-unistd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libproxy-0.4.7/libproxy/url.cpp.orig	2012-02-28 21:05:15.572948027 +0000
-+++ libproxy-0.4.7/libproxy/url.cpp	2012-02-28 21:05:45.635937474 +0000
-@@ -27,6 +27,7 @@
- #define close _close
- #endif
- #include <fcntl.h> // For ::open()
-+#include <unistd.h> // For ::read() and ::close()
- #include <cstring> // For memcpy()
- #include <sstream> // For int/string conversion (using stringstream)
- #include <cstdio>  // For sscanf()
---- libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp.orig	2012-02-28 21:06:01.552943358 +0000
-+++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp	2012-02-28 21:11:21.429953982 +0000
-@@ -18,6 +18,7 @@
-  ******************************************************************************/
- 
- #include <sys/stat.h>
-+#include <unistd.h>
- #include <cstdlib>
- #include <map>
- #include <fstream>
---- libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp.orig	2012-02-28 21:06:11.637943033 +0000
-+++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp	2012-02-28 21:11:46.560961409 +0000
-@@ -17,6 +17,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
-  ******************************************************************************/
- 
-+#include <unistd.h> // for ::gethostname()
- #include <cstring> // ?
- 
- #include "../extension_pacrunner.hpp"
---- libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp.orig	2012-02-28 21:06:29.615943614 +0000
-+++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp	2012-02-28 21:12:35.530965553 +0000
-@@ -17,6 +17,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
-  ******************************************************************************/
- 
-+#include <unistd.h> // for ::gethostname()
- #include "../extension_pacrunner.hpp"
- using namespace libproxy;
- 
diff --git a/extra/libraw1394/PKGBUILD b/extra/libraw1394/PKGBUILD
index 5bee5d935..227415d70 100644
--- a/extra/libraw1394/PKGBUILD
+++ b/extra/libraw1394/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 149545 2012-02-08 13:57:56Z tpowa $
+# $Id: PKGBUILD 180142 2013-03-18 09:02:21Z jgc $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=libraw1394
-pkgver=2.0.7
-pkgrel=2
+pkgver=2.1.0
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL2.1')
 pkgdesc="Provides an API to the Linux IEEE1394 (FireWire) driver"
@@ -12,7 +12,8 @@ depends=('glibc')
 makedepends=('pkgconfig')
 url="https://ieee1394.wiki.kernel.org/index.php/Main_Page"
 options=(!libtool)
-source=(ftp://ftp.kernel.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.bz2)
+source=(ftp://ftp.kernel.org/pub/linux/libs/ieee1394/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('0b3126d8158d156de9da2ff4d861c47857acc4318a7ac260258015a22071964f')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
@@ -24,4 +25,3 @@ package () {
    cd "${srcdir}/${pkgname}-${pkgver}"
    make DESTDIR="${pkgdir}" install
 }
-md5sums=('997ef18ab8e2e21f3966dff00e92be28')
diff --git a/extra/libxi/PKGBUILD b/extra/libxi/PKGBUILD
index 70071774d..55d19260d 100644
--- a/extra/libxi/PKGBUILD
+++ b/extra/libxi/PKGBUILD
@@ -1,8 +1,9 @@
-# $Id: PKGBUILD 175509 2013-01-17 15:47:55Z andyrtr $
+# $Id: PKGBUILD 180177 2013-03-18 16:08:49Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxi
-pkgver=1.6.2
+pkgver=1.7
 pkgrel=1
 pkgdesc="X11 Input extension library"
 arch=('i686' 'x86_64')
@@ -12,7 +13,7 @@ makedepends=('pkgconfig' 'xorg-util-macros')
 options=(!libtool)
 license=('custom')
 source=(${url}/releases/individual/lib/libXi-${pkgver}.tar.bz2)
-sha256sums=('3250fd34cdd099a15b78abdb87c7e1a9b7a2188ab893f273e90d831dbc604058')
+sha256sums=('4ebcf2b02c16ff51e41e9d045de01416d6430b6a4af6a82b17b6bfa4d6f9cbfc')
 
 build() {
   cd "${srcdir}/libXi-${pkgver}"
diff --git a/extra/polkit/PKGBUILD b/extra/polkit/PKGBUILD
index 4c5a22e39..412f69cbc 100644
--- a/extra/polkit/PKGBUILD
+++ b/extra/polkit/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 174766 2013-01-07 11:39:56Z jgc $
+# $Id: PKGBUILD 180235 2013-03-18 18:19:32Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=polkit
-pkgver=0.109
+pkgver=0.110
 pkgrel=1
 pkgdesc="Application development toolkit for controlling system-wide privileges"
 arch=(i686 x86_64)
@@ -14,17 +14,13 @@ replaces=('policykit')
 options=('!libtool')
 install=polkit.install
 source=(http://www.freedesktop.org/software/polkit/releases/$pkgname-$pkgver.tar.gz
-        polkit.pam
-        fix-xauthority.patch)
-md5sums=('8c3f08287dd3e1e546e3c2ae00090908'
-         '6564f95878297b954f0572bc1610dd15'
-         '78db344a30d7aa089b4705009ec95b58')
+        polkit.pam)
+md5sums=('06e0d3b72e566ac277fc35c8206d2a28'
+         '6564f95878297b954f0572bc1610dd15')
 
 build() {
   cd $pkgname-$pkgver
 
-  patch -Np1 -i ../fix-xauthority.patch
-
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/polkit-1 \
       --with-systemdsystemunitdir=/usr/lib/systemd/system \
diff --git a/extra/polkit/fix-xauthority.patch b/extra/polkit/fix-xauthority.patch
deleted file mode 100644
index cf00b929c..000000000
--- a/extra/polkit/fix-xauthority.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From d6acecdd0ebb42e28ff28e04e0207cb01fa20910 Mon Sep 17 00:00:00 2001
-From: David Zeuthen <zeuthen@gmail.com>
-Date: Wed, 19 Dec 2012 19:28:29 +0000
-Subject: Set XAUTHORITY environment variable if is unset
-
-The way it works is that if XAUTHORITY is unset, then its default
-value is $HOME/.Xauthority. But since we're changing user identity
-this will not work since $HOME will now change. Therefore, if
-XAUTHORITY is unset, just set its default value before changing
-identity. This bug only affected login managers using X Window
-Authorization but not explicitly setting the XAUTHORITY variable.
-
-You can argue that XAUTHORITY is broken since it forces uid-changing
-apps like pkexec(1) to do more work - and get involved in intimate
-details of how X works and so on - but that doesn't change how things
-work.
-
-Based on a patch from Peter Wu <lekensteyn@gmail.com>.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=51623
-
-Signed-off-by: David Zeuthen <zeuthen@gmail.com>
----
-diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c
-index 840eb3c..da9784a 100644
---- a/src/programs/pkexec.c
-+++ b/src/programs/pkexec.c
-@@ -608,6 +608,28 @@ main (int argc, char *argv[])
-       g_ptr_array_add (saved_env, g_strdup (value));
-     }
- 
-+  /* $XAUTHORITY is "special" - if unset, we need to set it to ~/.Xauthority. Yes,
-+   * this is broken but it's unfortunately how things work (see fdo #51623 for
-+   * details)
-+   */
-+  if (g_getenv ("XAUTHORITY") == NULL)
-+    {
-+      const gchar *home;
-+
-+      /* pre-2.36 GLib does not examine $HOME (it always looks in /etc/passwd) and
-+       * this is not what we want
-+       */
-+      home = g_getenv ("HOME");
-+      if (home == NULL)
-+        home = g_get_home_dir ();
-+
-+      if (home != NULL)
-+        {
-+          g_ptr_array_add (saved_env, g_strdup ("XAUTHORITY"));
-+          g_ptr_array_add (saved_env, g_build_filename (home, ".Xauthority", NULL));
-+        }
-+    }
-+
-   /* Nuke the environment to get a well-known and sanitized environment to avoid attacks
-    * via e.g. the DBUS_SYSTEM_BUS_ADDRESS environment variable and similar.
-    */
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/samba/PKGBUILD b/extra/samba/PKGBUILD
index fd1b468b0..20d337625 100644
--- a/extra/samba/PKGBUILD
+++ b/extra/samba/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 178542 2013-02-25 16:00:30Z tpowa $
+# $Id: PKGBUILD 180160 2013-03-18 13:15:20Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 pkgbase=samba
 pkgname=('libwbclient' 'smbclient' 'samba')
-pkgver=3.6.12
+pkgver=3.6.13
 # We use the 'A' to fake out pacman's version comparators.  Samba chooses
 # to append 'a','b',etc to their subsequent releases, which pamcan
 # misconstrues as alpha, beta, etc.  Bad samba!
-_realver=3.6.12
-pkgrel=2
+_realver=3.6.13
+pkgrel=1
 arch=(i686 x86_64)
 url="http://www.samba.org"
 license=('GPL3')
@@ -169,7 +169,7 @@ install='samba.install'
   mkdir -p ${pkgdir}/usr/lib/pkgconfig
   install -m644 pkgconfig/smbsharemodes.pc ${pkgdir}/usr/lib/pkgconfig/
 }
-md5sums=('430fd21a1acd26964d3ccf366df8709a'
+md5sums=('b9fe8413cbb6fa4b970a159968db2fb4'
          '5697da77590ec092cc8a883bae06093c'
          'a4bbfa39fee95bba2e7ad6b535fae7e6'
          '96f82c38f3f540b53f3e5144900acf17'
diff --git a/extra/samba/samba.install b/extra/samba/samba.install
index d9baeac90..d8c6c49ef 100644
--- a/extra/samba/samba.install
+++ b/extra/samba/samba.install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 post_install() {
-  systemd-tmpfiles --create /usr/lib/tmpfiles.d/samba.conf
+  systemd-tmpfiles --create samba.conf
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/sg3_utils/PKGBUILD b/extra/sg3_utils/PKGBUILD
index 7392bd2d6..d932b06ab 100644
--- a/extra/sg3_utils/PKGBUILD
+++ b/extra/sg3_utils/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 147121 2012-01-22 10:55:51Z andyrtr $
+#$Id: PKGBUILD 180167 2013-03-18 13:36:39Z jgc $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=sg3_utils
-pkgver=1.33
+pkgver=1.35
 pkgrel=1
 pkgdesc="Generic SCSI utilities"
 arch=(i686 x86_64)
@@ -11,7 +11,7 @@ license=('GPL' 'custom:BSD')
 depends=('glibc')
 options=('!libtool')
 source=(http://sg.danny.cz/sg/p/${pkgname}-${pkgver}.tgz)
-md5sums=('261e39f7161337330ba6bd57999be801')
+md5sums=('55c32fb95a5b3907687b023f392fbd3c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/sg3_utils/stdint.patch b/extra/sg3_utils/stdint.patch
deleted file mode 100644
index 8f8c5f581..000000000
--- a/extra/sg3_utils/stdint.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- include/sg_cmds_basic.h	2008/06/26 23:27:40	1.1
-+++ include/sg_cmds_basic.h	2008/06/26 23:28:06
-@@ -30,6 +30,8 @@
-  *
-  */
- 
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
---- include/sg_cmds_extra.h	2008/06/26 23:27:40	1.1
-+++ include/sg_cmds_extra.h	2008/06/26 23:29:02
-@@ -30,6 +30,8 @@
-  *
-  */
- 
-+#include <stdint.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
diff --git a/extra/tsocks/PKGBUILD b/extra/tsocks/PKGBUILD
index ae03265d3..6b5aec3f2 100644
--- a/extra/tsocks/PKGBUILD
+++ b/extra/tsocks/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 149054 2012-02-05 15:38:18Z bisson $
+# $Id: PKGBUILD 180127 2013-03-17 23:33:27Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=tsocks
 pkgver=1.8beta5
-pkgrel=5
+pkgrel=6
 pkgdesc='Transparent SOCKS proxying library'
 url='http://tsocks.sourceforge.net/'
 license=('GPL')
@@ -20,6 +20,6 @@ build() {
 package() {
 	cd "${srcdir}/${pkgname}-1.8"
 	make DESTDIR="${pkgdir}" install
-	install -d "${pkgdir}"/etc
-	install -m644 tsocks.conf.{simple,complex}.example "${pkgdir}"/etc
+	install -d "${pkgdir}/usr/share/${pkgname}"
+	install -m644 tsocks.conf.{simple,complex}.example "${pkgdir}/usr/share/${pkgname}"
 }
diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD
index 922530b2c..e462b8550 100644
--- a/extra/upower/PKGBUILD
+++ b/extra/upower/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 174773 2013-01-07 12:34:08Z jgc $
+# $Id: PKGBUILD 180239 2013-03-18 19:28:47Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=upower
-pkgver=0.9.19
+pkgver=0.9.20
 pkgrel=1
 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics"
 arch=('i686' 'x86_64')
@@ -11,10 +11,8 @@ license=('GPL')
 depends=('systemd-tools' 'libsystemd' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice')
 makedepends=('intltool' 'docbook-xsl' 'gobject-introspection' 'systemd')
 options=('!libtool')
-source=($url/releases/$pkgname-$pkgver.tar.xz
-        lg-unifying-fix-K750-features-name-use-1-second-interval.patch)
-md5sums=('f96955ff1a2e4f006937d6b5ea95afb8'
-         '04b2a6141e80e422a9fe2820b5b3a613')
+source=($url/releases/$pkgname-$pkgver.tar.xz)
+md5sums=('f175984d142dc8d2353a7da609836b69')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -22,12 +20,11 @@ build() {
   # put udev files in /usr/lib
   sed -i "/slashlibdir=/s#/lib#/usr/lib#" configure
 
-  patch -Np1 -i ../lg-unifying-fix-K750-features-name-use-1-second-interval.patch
-
   ./configure --prefix=/usr --sysconfdir=/etc \
     --localstatedir=/var \
     --libexecdir=/usr/lib/$pkgname \
-    --disable-static
+    --disable-static \
+    --enable-deprecated
   make
 }
 
diff --git a/extra/upower/lg-unifying-fix-K750-features-name-use-1-second-interval.patch b/extra/upower/lg-unifying-fix-K750-features-name-use-1-second-interval.patch
deleted file mode 100644
index 27c4dc51e..000000000
--- a/extra/upower/lg-unifying-fix-K750-features-name-use-1-second-interval.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 35b0d25b49d04cf7d33699c34f42a196c8e92a2e Mon Sep 17 00:00:00 2001
-From: Julien Danjou <julien@danjou.info>
-Date: Sat, 01 Dec 2012 12:30:03 +0000
-Subject: lg-unifying: fix K750 features name, use 1 second interval
-
-I've recently got access to some spec on this, so I'm now able to document
-his a bit better. Also, change the 0x78 value for the function sending
-BattLightMeasureBroadcastEvent to 0x1 since this is the number of event we
-want, and one is enough.
-
-Signed-off-by: Julien Danjou <julien@danjou.info>
-Signed-off-by: Richard Hughes <richard@hughsie.com>
----
-diff --git a/src/linux/up-device-lg-unifying.c b/src/linux/up-device-lg-unifying.c
-index e8997c0..eddd1ec 100644
---- a/src/linux/up-device-lg-unifying.c
-+++ b/src/linux/up-device-lg-unifying.c
-@@ -84,10 +84,9 @@
- #define HIDPP_FEATURE_GETDEVICENAMETYPE_FUNCTION_GETCOUNT      (0x00 << 4)
- #define HIDPP_FEATURE_GETDEVICENAMETYPE_FUNCTION_GETDEVICENAME (0x01 << 4)
- 
--/* I wish i has the spec for this, but I don't so I invented the name */
--#define HIDPP_FEATURE_K750_BATTERY                                   0x4301
--#define HIDPP_FEATURE_K750_BATTERY_FUNCTION_STARTLUXANDBATTERY   (0x00 << 4)
--#define HIDPP_FEATURE_K750_BATTERY_FUNCTION_LUXANDBATTERYEVENT   (0x01 << 4)
-+#define HIDPP_FEATURE_SOLAR_DASHBOARD                                     0x4301
-+#define HIDPP_FEATURE_SOLAR_DASHBOARD_FUNCTION_SetLightMeasure       (0x00 << 4)
-+#define HIDPP_FEATURE_SOLAR_DASHBOARD_BattLightMeasureBroadcastEvent (0x01 << 4)
- 
- #define HIDPP_FEATURE_FUNCTION_AS_ARG(feature)	\
- 	feature >> 8, feature, 0x00
-@@ -105,7 +104,7 @@ struct UpDeviceUnifyingPrivate
- 	int			 fd;
- 	/* Device index on the Unifying "bus" */
- 	gint			 device_index;
--	gint			 feature_k750_battery_index;
-+	gint			 feature_solar_dashboard_index;
- 	GIOChannel		*channel;
- 	guint			 channel_source_id;
- };
-@@ -130,8 +129,8 @@ up_device_unifying_event_io (GIOChannel *channel, GIOCondition condition, gpoint
- 	while (read (unifying->priv->fd, buf, sizeof(buf)) > 0)
- 		if (buf[0] == HIDPP_HEADER_RESPONSE &&
- 		    buf[1] == unifying->priv->device_index &&
--		    buf[2] == unifying->priv->feature_k750_battery_index &&
--		    buf[3] == HIDPP_FEATURE_K750_BATTERY_FUNCTION_LUXANDBATTERYEVENT) {
-+		    buf[2] == unifying->priv->feature_solar_dashboard_index &&
-+		    buf[3] == HIDPP_FEATURE_SOLAR_DASHBOARD_BattLightMeasureBroadcastEvent) {
- 			lux = (buf[5] << 8) | buf[6];
- 			if (lux > 200) {
- 				g_object_set (device,
-@@ -283,25 +282,24 @@ up_device_unifying_hidpp2_set_battery (UpDeviceUnifying *unifying)
- 		0x00, 0x00, 0x00, 0x00, 0x00,
- 	};
- 
--	if (unifying->priv->feature_k750_battery_index == -1)
--		unifying->priv->feature_k750_battery_index =
--			up_device_unifying_hidpp2_get_feature_index (unifying, HIDPP_FEATURE_K750_BATTERY);
-+	if (unifying->priv->feature_solar_dashboard_index == -1)
-+		unifying->priv->feature_solar_dashboard_index =
-+			up_device_unifying_hidpp2_get_feature_index (unifying, HIDPP_FEATURE_SOLAR_DASHBOARD);
- 
--	if (unifying->priv->feature_k750_battery_index == 0) {
--		/* Probably not a K750 */
-+	if (unifying->priv->feature_solar_dashboard_index == 0) {
-+		/* Probably not a solar keyboard */
- 		/* TODO: add support for BatteryLevelStatus */
- 	} else {
- 		/* This request will make the keyboard send a bunch of packets
- 		 * (events) with lux-meter and battery information */
--		request[2] = unifying->priv->feature_k750_battery_index;
--		request[3] = HIDPP_FEATURE_K750_BATTERY_FUNCTION_STARTLUXANDBATTERY;
--		/* Don't know what this means */
--		request[4] = 0x78;
--		request[5] = 0x01;
-+		request[2] = unifying->priv->feature_solar_dashboard_index;
-+		request[3] = HIDPP_FEATURE_SOLAR_DASHBOARD_FUNCTION_SetLightMeasure;
-+		request[4] = 0x01; /* Max number of reports: number of report sent after function call */
-+		request[5] = 0x01; /* Report period: time between reports, in seconds */
- 
- 
- 		if (write (unifying->priv->fd, request, sizeof(request)) != sizeof(request)) {
--			g_debug ("Unable to send K750 battery/lux events start request to device");
-+			g_debug ("Unable to send solar battery/lux events start request to device");
- 			return FALSE;
- 		}
- 
-@@ -719,7 +717,7 @@ up_device_unifying_init (UpDeviceUnifying *unifying)
- 	unifying->priv = UP_DEVICE_UNIFYING_GET_PRIVATE (unifying);
- 	unifying->priv->poll_timer_id = 0;
- 	unifying->priv->fd = -1;
--	unifying->priv->feature_k750_battery_index = -1;
-+	unifying->priv->feature_solar_dashboard_index = -1;
- }
- 
- /**
---
-cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD
index 3c13488cc..c0b82d671 100644
--- a/extra/xf86-input-acecad/PKGBUILD
+++ b/extra/xf86-input-acecad/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168553 2012-10-13 11:43:16Z andyrtr $
+# $Id: PKGBUILD 180179 2013-03-18 16:08:51Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-acecad
 pkgver=1.5.0
-pkgrel=5
+pkgrel=6
 pkgdesc="X.Org acecad tablet input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('sysfsutils')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
         assign-local-private-after-allocating.patch)
diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD
index 92d0537f3..94f7f5c53 100644
--- a/extra/xf86-input-aiptek/PKGBUILD
+++ b/extra/xf86-input-aiptek/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168554 2012-10-13 11:43:19Z andyrtr $
+# $Id: PKGBUILD 180180 2013-03-18 16:08:51Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-aiptek
 pkgver=1.4.1
-pkgrel=5
+pkgrel=6
 pkgdesc="X.Org Aiptek USB Digital Tablet input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha1sums=('55ea7d12d3e24fd72eacc966a59262864dce7769')
diff --git a/extra/xf86-input-elographics/PKGBUILD b/extra/xf86-input-elographics/PKGBUILD
index ee6ad8451..055524671 100644
--- a/extra/xf86-input-elographics/PKGBUILD
+++ b/extra/xf86-input-elographics/PKGBUILD
@@ -3,14 +3,14 @@
 
 pkgname=xf86-input-elographics
 pkgver=1.4.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Elographics TouchScreen input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('a21af744d57f158e6dff9d60a68aaac46b8d726d602911940cb61f4d6bb2c6a4')
diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD
index daab499b1..e9ee0cb50 100644
--- a/extra/xf86-input-evdev/PKGBUILD
+++ b/extra/xf86-input-evdev/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 168556 2012-10-13 11:43:27Z andyrtr $
+# $Id: PKGBUILD 180182 2013-03-18 16:08:53Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <Alexander@archlinux.org
 
 pkgname=xf86-input-evdev
 pkgver=2.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org evdev input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc' 'systemd-tools' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool' '!makeflags')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD
index 1ced5dcc4..4d71b4467 100644
--- a/extra/xf86-input-joystick/PKGBUILD
+++ b/extra/xf86-input-joystick/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 175202 2013-01-16 16:15:44Z andyrtr $
+# $Id: PKGBUILD 180183 2013-03-18 16:08:54Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-joystick
 pkgver=1.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.Org Joystick input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 backup=('etc/X11/xorg.conf.d/50-joystick.conf')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
diff --git a/extra/xf86-input-keyboard/PKGBUILD b/extra/xf86-input-keyboard/PKGBUILD
index c8f67c5af..f33028ba7 100644
--- a/extra/xf86-input-keyboard/PKGBUILD
+++ b/extra/xf86-input-keyboard/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168558 2012-10-13 11:43:39Z andyrtr $
+# $Id: PKGBUILD 180184 2013-03-18 16:08:54Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-keyboard
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org keyboard input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD
index 15b0f2ce4..e8d4a4b64 100644
--- a/extra/xf86-input-mouse/PKGBUILD
+++ b/extra/xf86-input-mouse/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168559 2012-10-13 11:43:43Z andyrtr $
+# $Id: PKGBUILD 180185 2013-03-18 16:08:55Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-mouse
 pkgver=1.8.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org mouse input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD
index 68c9a4d7e..e5106b7cd 100644
--- a/extra/xf86-input-synaptics/PKGBUILD
+++ b/extra/xf86-input-synaptics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176855 2013-02-01 15:31:40Z andyrtr $
+# $Id: PKGBUILD 180186 2013-03-18 16:08:56Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tobias Powalowski  <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
@@ -6,14 +6,14 @@
 
 pkgname=xf86-input-synaptics
 pkgver=1.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Synaptics driver for notebook touchpads"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('libxtst' 'mtdev')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'libxi' 'libx11' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 replaces=('synaptics')
 provides=('synaptics')
 conflicts=('synaptics')
diff --git a/extra/xf86-input-vmmouse/PKGBUILD b/extra/xf86-input-vmmouse/PKGBUILD
index 009a20aba..15fb2db7f 100644
--- a/extra/xf86-input-vmmouse/PKGBUILD
+++ b/extra/xf86-input-vmmouse/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 175179 2013-01-16 09:55:26Z jgc $
+# $Id: PKGBUILD 180187 2013-03-18 16:08:57Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-vmmouse
 pkgver=13.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org VMWare Mouse input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc' 'sh')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 groups=('xorg-drivers' 'xorg')
 backup=('etc/X11/xorg.conf.d/50-vmmouse.conf')
 options=('!libtool')
diff --git a/extra/xf86-input-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD
index 5dd81a5f2..de307d043 100644
--- a/extra/xf86-input-void/PKGBUILD
+++ b/extra/xf86-input-void/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168562 2012-10-13 11:43:57Z andyrtr $
+# $Id: PKGBUILD 180188 2013-03-18 16:08:57Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-void
 pkgver=1.4.0
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org void input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=18' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD
index b800cdd1e..5363d5555 100644
--- a/extra/xf86-input-wacom/PKGBUILD
+++ b/extra/xf86-input-wacom/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 179522 2013-03-05 21:45:35Z heftig $
+# $Id: PKGBUILD 180189 2013-03-18 16:08:58Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: M Rawash <mrawash@gmail.com>
 
 pkgname=xf86-input-wacom
 pkgver=0.20.0
-pkgrel=1
+pkgrel=2
 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 libxinerama libxrandr)
-makedepends=('X-ABI-XINPUT_VERSION=18' xorg-server-devel resourceproto scrnsaverproto)
-conflicts=('xorg-server<1.13.0' 'X-ABI-XINPUT_VERSION<18' 'X-ABI-XINPUT_VERSION>=19')
+makedepends=('xorg-server-devel' 'X-ABI-XINPUT_VERSION=19' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-XINPUT_VERSION<19' 'X-ABI-XINPUT_VERSION>=20')
 optdepends=('inputattach: support for serial tablets')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/linuxwacom/$pkgname/$pkgname-$pkgver.tar.bz2
diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD
index a6982cb01..b1a17aebf 100644
--- a/extra/xf86-video-apm/PKGBUILD
+++ b/extra/xf86-video-apm/PKGBUILD
@@ -1,22 +1,25 @@
-# $Id: PKGBUILD 168564 2012-10-13 11:44:07Z andyrtr $
+# $Id: PKGBUILD 180190 2013-03-18 16:09:00Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-apm
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Alliance ProMotion video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('953b04320117b14c5b7efb37de45cef45592409f639c2aa87b7e2d77dc8d3d0f'
+            'be06cce5eb0b8eb070321e293f5cd9b7aa947d920d23cc962f7121191ba4180b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-apm/git-fix.diff b/extra/xf86-video-apm/git-fix.diff
new file mode 100644
index 000000000..e48d2c42d
--- /dev/null
+++ b/extra/xf86-video-apm/git-fix.diff
@@ -0,0 +1,23 @@
+From 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 10 Jan 2013 03:03:29 +0000
+Subject: Remove #include "mibstore.h"
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/apm.h b/src/apm.h
+index a3c06f8..365e5e2 100644
+--- a/src/apm.h
++++ b/src/apm.h
+@@ -33,9 +33,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* I2C support */
+ #include "xf86i2c.h"
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-ark/PKGBUILD b/extra/xf86-video-ark/PKGBUILD
index ce16d52cf..ed351f636 100644
--- a/extra/xf86-video-ark/PKGBUILD
+++ b/extra/xf86-video-ark/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 168565 2012-10-13 11:44:11Z andyrtr $
+# $Id: PKGBUILD 180191 2013-03-18 16:09:00Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-ark
 pkgver=0.7.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org ark video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
+sha256sums=('c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e'
+            '257c3db46ef85863cc2d1b2ba250ef6b1a08df75171f2f3cef83cabd8b22399b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/build-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-ark/build-fix.diff b/extra/xf86-video-ark/build-fix.diff
new file mode 100644
index 000000000..3473b327e
--- /dev/null
+++ b/extra/xf86-video-ark/build-fix.diff
@@ -0,0 +1,10 @@
+--- xf86-video-ark-0.7.5/src/ark_driver.c	2012-07-17 06:51:36.000000000 +0200
++++ xf86-video-ark-0.7.5/src/ark_driver.c.new	2013-03-09 12:34:04.336299997 +0100
+@@ -39,7 +39,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "ark.h"
+ 
diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD
index d6dd021e1..ef642098d 100644
--- a/extra/xf86-video-ast/PKGBUILD
+++ b/extra/xf86-video-ast/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 168566 2012-10-13 11:44:15Z andyrtr $
+# $Id: PKGBUILD 180192 2013-03-18 16:09:01Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-ast
 pkgver=0.97.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org ASPEED AST Graphics video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('28fcd4781676485293f6dcd46e0797866f6219e22e1851c9796b037589998e76'
+            '8f032dd9f1441e2af4e443166f0e3d3a6ce4ef7f351af8789158d2dec18a52fa')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-ast/git-fix.diff b/extra/xf86-video-ast/git-fix.diff
new file mode 100644
index 000000000..5b2e4bc12
--- /dev/null
+++ b/extra/xf86-video-ast/git-fix.diff
@@ -0,0 +1,196 @@
+From 358ef4a53e582a2176a163356c7754faf3192270 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 15 Aug 2012 17:22:14 +0000
+Subject: Don't bother to include vbe.h
+
+This driver no longer uses VBE, so this can go.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c
+index bb99f9d..6be9a4f 100644
+--- a/src/ast_2dtool.c
++++ b/src/ast_2dtool.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_accel.c b/src/ast_accel.c
+index 34f9c65..a789b21 100644
+--- a/src/ast_accel.c
++++ b/src/ast_accel.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_cursor.c b/src/ast_cursor.c
+index f967ce9..47ea09d 100644
+--- a/src/ast_cursor.c
++++ b/src/ast_cursor.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_driver.c b/src/ast_driver.c
+index 080b051..5e6a26e 100644
+--- a/src/ast_driver.c
++++ b/src/ast_driver.c
+@@ -40,7 +40,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_mode.c b/src/ast_mode.c
+index 3238f39..50289f1 100644
+--- a/src/ast_mode.c
++++ b/src/ast_mode.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_tool.c b/src/ast_tool.c
+index d11f20d..c701c1e 100644
+--- a/src/ast_tool.c
++++ b/src/ast_tool.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
+index ed8c906..42de52c 100644
+--- a/src/ast_vgatool.c
++++ b/src/ast_vgatool.c
+@@ -36,7 +36,6 @@
+ #include "regionstr.h"
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
+-#include "vbe.h"
+ 
+ #include "xf86PciInfo.h"
+ #include "xf86Pci.h"
+--
+cgit v0.9.0.2-2-gbebe
+From 0833e0086b9712b1c29571919899d5d17fea8382 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:33 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/ast_2dtool.c b/src/ast_2dtool.c
+index 6be9a4f..684e400 100644
+--- a/src/ast_2dtool.c
++++ b/src/ast_2dtool.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/ast_accel.c b/src/ast_accel.c
+index a789b21..0e7e5d3 100644
+--- a/src/ast_accel.c
++++ b/src/ast_accel.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/ast_cursor.c b/src/ast_cursor.c
+index 47ea09d..c672564 100644
+--- a/src/ast_cursor.c
++++ b/src/ast_cursor.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/ast_driver.c b/src/ast_driver.c
+index 5e6a26e..43fcdbc 100644
+--- a/src/ast_driver.c
++++ b/src/ast_driver.c
+@@ -31,7 +31,6 @@
+ #endif
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+@@ -888,7 +887,6 @@ ASTScreenInit(SCREEN_INIT_ARGS_DECL)
+    }
+ #endif /* end of Accel_2D */
+      
+-   miInitializeBackingStore(pScreen);
+    xf86SetBackingStore(pScreen);
+    xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/ast_mode.c b/src/ast_mode.c
+index 50289f1..2e06062 100644
+--- a/src/ast_mode.c
++++ b/src/ast_mode.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/ast_tool.c b/src/ast_tool.c
+index c701c1e..c2bfac6 100644
+--- a/src/ast_tool.c
++++ b/src/ast_tool.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+diff --git a/src/ast_vgatool.c b/src/ast_vgatool.c
+index 42de52c..513cf7b 100644
+--- a/src/ast_vgatool.c
++++ b/src/ast_vgatool.c
+@@ -27,7 +27,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86cmap.h"
+ #include "compiler.h"
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD
index 0376fcc78..e2ec0bdcf 100644
--- a/extra/xf86-video-ati/PKGBUILD
+++ b/extra/xf86-video-ati/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 176906 2013-02-02 07:15:02Z andyrtr $
+# $Id: PKGBUILD 180193 2013-03-18 16:09:02Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-ati
 pkgver=7.1.0
 epoch=1
-pkgrel=1
+pkgrel=3
 pkgdesc="X.org ati video driver"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
-depends=('libdrm>=2.4.41' 'systemd-tools' 'ati-dri')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+depends=('libdrm>=2.4.41' 'systemd-tools' 'ati-dri' 'glamor-egl')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
@@ -20,7 +20,8 @@ sha256sums=('c8ae44051fcb331625217f98c09a3aa69f493052b69d62c03f41fed0bfe610cd')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr \
+    --enable-glamor
   make
 }
 
diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD
index 28b0a216c..265180ab4 100644
--- a/extra/xf86-video-chips/PKGBUILD
+++ b/extra/xf86-video-chips/PKGBUILD
@@ -1,25 +1,27 @@
-# $Id: PKGBUILD 168568 2012-10-13 11:44:27Z andyrtr $
+# $Id: PKGBUILD 180194 2013-03-18 16:09:03Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-chips
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Chips and Technologies video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=(glibc)
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h)
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 iopl.h git-fix.diff)
 sha256sums=('8d3c744d035b3d769049647bb8022ec24500d31b1b224cd0ea4efe61f86bfed2'
-            'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670')
+            'd04607e51f9064fb128beceda9660feadb7775b585466a5b9fb04f942effc670'
+            '36165ebc70926ab5a8fe4331c5ce88c7f5f2e6979170b849ac1c2c99b3d1a804')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   cp ${srcdir}/iopl.h util/
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-chips/git-fix.diff b/extra/xf86-video-chips/git-fix.diff
new file mode 100644
index 000000000..bfd94181e
--- /dev/null
+++ b/extra/xf86-video-chips/git-fix.diff
@@ -0,0 +1,39 @@
+From 151a1ec855a9ada44907cb6bef06a71e9080504b Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:34 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 6f3a5d4..effbc60 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -96,9 +96,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi banking wrapper need this */
+ #ifdef HAVE_ISA
+ #include "mibank.h"
+@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	    pBankInfo = NULL;
+ 	    return FALSE;
+ 	}
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* Initialise cursor functions */
+@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	    }
+ 	}
+ 	
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ #ifdef ENABLE_SILKEN_MOUSE
+ 	xf86SetSilkenMouse(pScreen);
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD
index 7f838e741..b1b470008 100644
--- a/extra/xf86-video-cirrus/PKGBUILD
+++ b/extra/xf86-video-cirrus/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 174961 2013-01-09 16:02:11Z andyrtr $
+# $Id: PKGBUILD 180195 2013-03-18 16:09:03Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-cirrus
 pkgver=1.5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org Cirrus Logic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD
index 93fd4e3ad..dedde219f 100644
--- a/extra/xf86-video-dummy/PKGBUILD
+++ b/extra/xf86-video-dummy/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 168570 2012-10-13 11:44:35Z andyrtr $
+# $Id: PKGBUILD 180196 2013-03-18 16:09:04Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-dummy
 pkgver=0.3.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org dummy video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('44335b640126d339700256dae731bd5af79afd027da172bad8a991a33a1de798'
+            '06fe79ba658712a1abb0612a049c1061618d30e72d4939fc59c8c905d9d4d5bb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-dummy/git-fix.diff b/extra/xf86-video-dummy/git-fix.diff
new file mode 100644
index 000000000..4b0b46ef3
--- /dev/null
+++ b/extra/xf86-video-dummy/git-fix.diff
@@ -0,0 +1,31 @@
+From 44f04fd3046043ed31369025f34353c4e0e5c1cd Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:36 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 62066d6..6062c39 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -14,9 +14,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
+@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   , lines - pScrn->virtualY);
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 	
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD
index 62f0c0314..6d7cec9fe 100644
--- a/extra/xf86-video-fbdev/PKGBUILD
+++ b/extra/xf86-video-fbdev/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 168571 2012-10-13 11:44:39Z andyrtr $
+# $Id: PKGBUILD 180197 2013-03-18 16:09:06Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-fbdev
 pkgver=0.4.3
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org framebuffer video driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('ff7b037ad110040a4e2db5c84e9741125dbbaf3a08107db47760f3e11f9c4831'
+            '4eb30cc4db5d1789429861d2d8f15238b21204d4311763ab7a1f4f32ff2b0321')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-fbdev/git-fix.diff b/extra/xf86-video-fbdev/git-fix.diff
new file mode 100644
index 000000000..138d5bc2a
--- /dev/null
+++ b/extra/xf86-video-fbdev/git-fix.diff
@@ -0,0 +1,29 @@
+From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:37 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/fbdev.c b/src/fbdev.c
+index cd7ebc5..f5a7378 100644
+--- a/src/fbdev.c
++++ b/src/fbdev.c
+@@ -14,7 +14,6 @@
+ #include "xf86_OSproc.h"
+ 
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	}
+ 
+ 	xf86SetBlackWhitePixels(pScreen);
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* software cursor */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-glint/PKGBUILD b/extra/xf86-video-glint/PKGBUILD
index e3105fdc9..df917019d 100644
--- a/extra/xf86-video-glint/PKGBUILD
+++ b/extra/xf86-video-glint/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 168573 2012-10-13 11:44:48Z andyrtr $
+# $Id: PKGBUILD 180198 2013-03-18 16:09:07Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-glint
 pkgver=1.2.8
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org GLINT/Permedia video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('657f883bb3a4e4278399eba73840862c3642706ae8b0a4798ec97a31b3524221'
+            '8bf833751bea92543835c7f0c55b6a6ed7c4df62034372f5f6ae122b3ba8f231')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  patch -Np1 -i ${srcdir}/git-fix.diff
+ ./configure --prefix=/usr
   make
 }
 
diff --git a/extra/xf86-video-glint/git-fix.diff b/extra/xf86-video-glint/git-fix.diff
new file mode 100644
index 000000000..6bc5738c8
--- /dev/null
+++ b/extra/xf86-video-glint/git-fix.diff
@@ -0,0 +1,30 @@
+From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:38 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/glint_driver.c b/src/glint_driver.c
+index b6d20a9..aa78516 100644
+--- a/src/glint_driver.c
++++ b/src/glint_driver.c
+@@ -52,8 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ 
+-#include "mibstore.h"
+-
+ #include "pm3_regs.h"
+ #include "glint_regs.h"
+ #include "IBM.h"
+@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL)
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-i128/PKGBUILD b/extra/xf86-video-i128/PKGBUILD
index f48ca85ab..3b54ba963 100644
--- a/extra/xf86-video-i128/PKGBUILD
+++ b/extra/xf86-video-i128/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 168574 2012-10-13 11:44:52Z andyrtr $
+# $Id: PKGBUILD 180199 2013-03-18 16:09:08Z andyrtr $
 # Maintainer:Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-i128
 pkgver=1.3.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Number 9 I128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c'
+            '3805461dd71ff6675fd08afd5c21a230e7f36d6cda6830adac38ceee36d96f4b')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-i128/git-fix.diff b/extra/xf86-video-i128/git-fix.diff
new file mode 100644
index 000000000..de3287d13
--- /dev/null
+++ b/extra/xf86-video-i128/git-fix.diff
@@ -0,0 +1,53 @@
+From 3226d66c951f3621fb940cc5844098d892089eb1 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Wed, 15 Aug 2012 17:03:11 +0000
+Subject: Don't bother to include vbe.h
+
+Just copied from xf86 boilerplate afaict.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index 66fdee0..a0f08c0 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -55,7 +55,6 @@
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+-#include "vbe.h"
+ 
+ #include "xf86cmap.h"
+ #include "fb.h"
+--
+cgit v0.9.0.2-2-gbebe
+From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:40 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i128_driver.c b/src/i128_driver.c
+index a0f08c0..51a4135 100644
+--- a/src/i128_driver.c
++++ b/src/i128_driver.c
+@@ -50,8 +50,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL)
+         return FALSE;
+     }
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-i740/PKGBUILD b/extra/xf86-video-i740/PKGBUILD
index a8ec213ce..2d94138ca 100644
--- a/extra/xf86-video-i740/PKGBUILD
+++ b/extra/xf86-video-i740/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 168575 2012-10-13 11:44:55Z andyrtr $
+# $Id: PKGBUILD 180200 2013-03-18 16:09:08Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-i740
 pkgver=1.3.4
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Intel i740 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fix.diff)
+sha256sums=('1a24009bb2223b722fb41e1a2737a6e74bfecb0829e5583e270d267ee4ecca78'
+            '2b004773fe8090dea727590a7fc0389c53a16d068537fd1968ae320b0f1e36ca')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-i740/git-fix.diff b/extra/xf86-video-i740/git-fix.diff
new file mode 100644
index 000000000..a33dc7e3d
--- /dev/null
+++ b/extra/xf86-video-i740/git-fix.diff
@@ -0,0 +1,32 @@
+From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 10 Jan 2013 03:21:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i740_driver.c b/src/i740_driver.c
+index 1c82198..7c1051d 100644
+--- a/src/i740_driver.c
++++ b/src/i740_driver.c
+@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index adaad515b..3f576ae3b 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178462 2013-02-23 11:12:21Z andyrtr $
+# $Id: PKGBUILD 180201 2013-03-18 16:09:09Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.21.3
+pkgver=2.21.4
 pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -11,15 +11,15 @@ license=('custom')
 install=$pkgname.install
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
 depends=('intel-dri' 'libxvmc' 'xcb-util>=0.3.9' 'systemd')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
 replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14'
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15'
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('1ce672a042226dba776649e9067827c24fbb27383c78919a372265bb0d939dbb')
+sha256sums=('2f5983627013170db5b53d5c3ca7ad5fe843f3a0fa16ea136d6a4aa684c9cb03')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD
index 79f3fcaf6..991fe6400 100644
--- a/extra/xf86-video-mach64/PKGBUILD
+++ b/extra/xf86-video-mach64/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 173679 2012-12-20 20:15:31Z andyrtr $
+# $Id: PKGBUILD 180202 2013-03-18 16:09:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mach64
 pkgver=6.9.4
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org mach64 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto' )
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' )
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('mach64-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool' '!emptydirs')
diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD
index 4d19ea417..a0db87db9 100644
--- a/extra/xf86-video-mga/PKGBUILD
+++ b/extra/xf86-video-mga/PKGBUILD
@@ -1,19 +1,17 @@
-# $Id: PKGBUILD 168578 2012-10-13 11:45:11Z andyrtr $
+# $Id: PKGBUILD 180203 2013-03-18 16:09:11Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-mga
 pkgver=1.6.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org mga video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
-#makedepends=('xorg-server-devel>=1.12.0' 'libdrm' 'xf86driproto' 'mesa')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('mga-dri: DRI1 support from community repo')
-#conflicts=('xorg-server<1.12.0')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD
index f0cee485d..403a14ee6 100644
--- a/extra/xf86-video-modesetting/PKGBUILD
+++ b/extra/xf86-video-modesetting/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 174965 2013-01-09 16:04:11Z andyrtr $
+# $Id: PKGBUILD 180204 2013-03-18 16:09:12Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=xf86-video-modesetting
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org generic modesetting video driver"
 arch=('i686' 'x86_64')
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libdrm>=2.4.37' 'systemd')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD
index 67abbdac7..1ef669cbd 100644
--- a/extra/xf86-video-neomagic/PKGBUILD
+++ b/extra/xf86-video-neomagic/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 173943 2012-12-28 18:53:54Z andyrtr $
+# $Id: PKGBUILD 180205 2013-03-18 16:09:12Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-neomagic
 pkgver=1.2.7
-pkgrel=4
+pkgrel=5
 pkgdesc="X.org neomagic video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD
index 0d310d6fa..23a61f013 100644
--- a/extra/xf86-video-nouveau/PKGBUILD
+++ b/extra/xf86-video-nouveau/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 174803 2013-01-07 18:10:24Z andyrtr $
+# $Id: PKGBUILD 180206 2013-03-18 16:09:13Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: buddabrod <buddabrod@gmail.com>
 
 pkgname=xf86-video-nouveau
 pkgver=1.0.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source 2D acceleration driver for nVidia cards"
 arch=('i686' 'x86_64')
 url="http://nouveau.freedesktop.org/"
 license=('GPL')
 depends=('libdrm' 'udev' 'nouveau-dri')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 install=$pkgname.install
diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD
index 692363280..2a7ab0367 100644
--- a/extra/xf86-video-nv/PKGBUILD
+++ b/extra/xf86-video-nv/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 169436 2012-10-21 08:18:01Z andyrtr $
+# $Id: PKGBUILD 180207 2013-03-18 16:09:14Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer:Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-nv
 pkgver=2.1.20
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org nv video driver"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf'
+            '0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-nv/git-fixes.patch b/extra/xf86-video-nv/git-fixes.patch
new file mode 100644
index 000000000..ef5a4f2d9
--- /dev/null
+++ b/extra/xf86-video-nv/git-fixes.patch
@@ -0,0 +1,81 @@
+From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:49 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/g80_driver.c b/src/g80_driver.c
+index cc4e197..719b96c 100644
+--- a/src/g80_driver.c
++++ b/src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include <xf86Resources.h>
+ #endif
+ #include <mipointer.h>
+-#include <mibstore.h>
+ #include <micmap.h>
+ #include <xf86cmap.h>
+ #include <fb.h>
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 6dad6e5..8f35334 100644
+--- a/src/nv_driver.c
++++ b/src/nv_driver.c
+@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pNv->NoAccel)
+ 	NVAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_include.h b/src/nv_include.h
+index fb190bf..f174eef 100644
+--- a/src/nv_include.h
++++ b/src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index e0667ef..759501e 100644
+--- a/src/riva_driver.c
++++ b/src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pRiva->NoAccel)
+ 	RivaAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/riva_include.h b/src/riva_include.h
+index f2c5302..c7aeef7 100644
+--- a/src/riva_include.h
++++ b/src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD
index 4451a8cca..9c926c1b2 100644
--- a/extra/xf86-video-openchrome/PKGBUILD
+++ b/extra/xf86-video-openchrome/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 178621 2013-02-25 21:00:20Z andyrtr $
+# $Id: PKGBUILD 180208 2013-03-18 16:09:15Z andyrtr $
 # Contributor: Paul Mattal <paul@mattal.com>
 # Maintainer: Juergen Hoetzel <juergen@hoetzel.info>
 
 pkgname=xf86-video-openchrome
 pkgver=0.3.1
-pkgrel=3
+pkgrel=4
 pkgdesc="X.Org Openchrome drivers"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.openchrome.org"
 depends=('libdrm' 'libxvmc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15' 'xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'unichrome-dri')
 replaces=('openchrome' 'xf86-video-via')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool' '!emptydirs' '!makeflags')
diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD
index 62273c1b0..2553045d2 100644
--- a/extra/xf86-video-r128/PKGBUILD
+++ b/extra/xf86-video-r128/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168582 2012-10-13 11:45:27Z andyrtr $
+# $Id: PKGBUILD 180209 2013-03-18 16:09:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-r128
 pkgver=6.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org ati Rage128 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('r128-dri: DRI1 support from community repo')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
diff --git a/extra/xf86-video-rendition/PKGBUILD b/extra/xf86-video-rendition/PKGBUILD
index a44856620..4caf52ecf 100644
--- a/extra/xf86-video-rendition/PKGBUILD
+++ b/extra/xf86-video-rendition/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 168583 2012-10-13 11:45:31Z andyrtr $
+# $Id: PKGBUILD 180210 2013-03-18 16:09:16Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-rendition
 pkgver=4.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Rendition video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool' '!strip')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('930e99e4d44418b1e55f11a2a8525b42b0e2d3b5')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('39b5569338237de6e17b2a2c6be73ac6c405ee596079c41a7028cfd6e54134cb'
+            '93a59e9deed98af201c8bb231fdf3214fcd02dae8ef2f880b044b4fd100cdb4c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-rendition/git-fixes.patch b/extra/xf86-video-rendition/git-fixes.patch
new file mode 100644
index 000000000..77c4d34de
--- /dev/null
+++ b/extra/xf86-video-rendition/git-fixes.patch
@@ -0,0 +1,35 @@
+From 3a3ee1c45e54a808947cc26ca11f0a5299571053 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:50 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/rendition.c b/src/rendition.c
+index 7c74f76..888bb4a 100644
+--- a/src/rendition.c
++++ b/src/rendition.c
+@@ -1173,7 +1173,6 @@ renditionScreenInit(SCREEN_INIT_ARGS_DECL)
+     fbPictureInit (pScreen, 0, 0);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+    
+     /*********************************************************/
+     /* The actual setup of the driver-specific code          */
+diff --git a/src/rendition.h b/src/rendition.h
+index f7f13d4..297117e 100644
+--- a/src/rendition.h
++++ b/src/rendition.h
+@@ -28,9 +28,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-s3/PKGBUILD b/extra/xf86-video-s3/PKGBUILD
index 1cc340295..238c7721a 100644
--- a/extra/xf86-video-s3/PKGBUILD
+++ b/extra/xf86-video-s3/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 168584 2012-10-13 11:45:35Z andyrtr $
+# $Id: PKGBUILD 180211 2013-03-18 16:09:17Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-s3
 pkgver=0.6.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org S3 video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 build-fix.diff)
+sha256sums=('4778cd4f1d61490c3562f9be03664576f065fa3acf22fe0d0689212d7ea3ad39'
+            'ad5ce4569c16f28801f4f89d8271fccc5706ef8508a6051ca094854d92a19d1a')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/build-fix.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-s3/build-fix.diff b/extra/xf86-video-s3/build-fix.diff
new file mode 100644
index 000000000..457674571
--- /dev/null
+++ b/extra/xf86-video-s3/build-fix.diff
@@ -0,0 +1,10 @@
+--- xf86-video-s3-0.6.5/src/s3_driver.c	2012-07-17 06:50:05.000000000 +0200
++++ xf86-video-s3-0.6.5/src/s3_driver.c.new	2013-03-09 17:01:39.639220318 +0100
+@@ -52,7 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ #include "micmap.h"
+-#include "mibstore.h"
+ #include "fb.h"
+ #include "inputstr.h"
+ #include "shadowfb.h"
diff --git a/extra/xf86-video-s3virge/PKGBUILD b/extra/xf86-video-s3virge/PKGBUILD
index 9ed62f972..db233becc 100644
--- a/extra/xf86-video-s3virge/PKGBUILD
+++ b/extra/xf86-video-s3virge/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 168585 2012-10-13 11:45:39Z andyrtr $
+# $Id: PKGBUILD 180212 2013-03-18 16:09:18Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-s3virge
 pkgver=1.10.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org S3 Virge video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
 sha256sums=('85e1f6bdd3f39d0348c53602f481b974c13fc752c94931882817751c8ec8363e')
diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index 423c0af69..d31735366 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168586 2012-10-13 11:45:43Z andyrtr $
+# $Id: PKGBUILD 180213 2013-03-18 16:09:19Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-savage
 pkgver=2.3.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org savage video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('savage-dri: DRI1 support from community repo')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD
index 149367f7c..454ab2d52 100644
--- a/extra/xf86-video-siliconmotion/PKGBUILD
+++ b/extra/xf86-video-siliconmotion/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 168587 2012-10-13 11:45:47Z andyrtr $
+# $Id: PKGBUILD 180214 2013-03-18 16:09:20Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
 pkgname=xf86-video-siliconmotion
 pkgver=1.7.7
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org siliconmotion video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD
index fb0840cb0..e61593772 100644
--- a/extra/xf86-video-sis/PKGBUILD
+++ b/extra/xf86-video-sis/PKGBUILD
@@ -1,27 +1,33 @@
-# $Id: PKGBUILD 171889 2012-11-22 14:24:06Z jgc $
+# $Id: PKGBUILD 180222 2013-03-18 16:10:35Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sis
 pkgver=0.10.7
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org SiS video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('sis-dri: DRI1 support from community repo')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	0001-Disable-UploadToScreen-and-DownloadFromScreen.patch)
+	0001-Disable-UploadToScreen-and-DownloadFromScreen.patch
+	git-fixes.patch
+	Xi.patch)
 sha256sums=('be2eb6acba081e88dabc5be9db379e3da89a4d4edeb68064f204bf343a411cd0'
-            '3108c60b3030c894fbdb1426b05d7a8281e5fa4f385e1a80e22c8813a3fb6f5b')
+            '3108c60b3030c894fbdb1426b05d7a8281e5fa4f385e1a80e22c8813a3fb6f5b'
+            '7c56b4becd4334a6bdd600ea073226bdb3e0768e4c6b81aaf98b36f1e02f5217'
+            '7a1a0b784664a0f011bd13395be1854dee407e901d2707ab1a6b8d20caa0a672')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/0001-Disable-UploadToScreen-and-DownloadFromScreen.patch"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
+  patch -Np1 -i ${srcdir}/Xi.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-sis/Xi.patch b/extra/xf86-video-sis/Xi.patch
new file mode 100644
index 000000000..74732f33a
--- /dev/null
+++ b/extra/xf86-video-sis/Xi.patch
@@ -0,0 +1,19 @@
+--- xf86-video-sis-0.10.7/src/sis_driver.c	2013-03-10 13:57:50.000000000 +0100
++++ xf86-video-sis-0.10.7/src/sis_driver.c.new	2013-03-10 13:54:48.645203559 +0100
+@@ -9378,7 +9378,15 @@
+      }
+      if(doit) {
+ 	sigstate = xf86BlockSIGIO();
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18
++        {
++            double dx = x, dy = y;
++            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy,
++                NULL, NULL);
++            x = (int)dx;
++            y = (int)dy;
++        }
++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
+         {
+             double dx = x, dy = y;
+             miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
diff --git a/extra/xf86-video-sis/git-fixes.patch b/extra/xf86-video-sis/git-fixes.patch
new file mode 100644
index 000000000..1f7fb267a
--- /dev/null
+++ b/extra/xf86-video-sis/git-fixes.patch
@@ -0,0 +1,148 @@
+From 339fb3bc032b9f35b07b90480ae82a0fd352e078 Mon Sep 17 00:00:00 2001
+From: Jan Lindemann <jan@jannet.de>
+Date: Thu, 30 Aug 2012 18:09:10 +0000
+Subject: Replace xf86UnMapVidMem with pci_device_unmap_range
+
+Mixing pci_device_map_range with xf86UnMapVidMem doesn't work too well.
+
+X.Org bug#18028 <https://bugs.freedesktop.org/show_bug.cgi?id=18028>
+
+Bug found by Bryan Henderson <bryanh@giraffe-data.com>
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 61e8075..4c9b9cb 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -7344,7 +7344,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+         if(pSiSEnt->MapCountIOBase) {
+ 	    pSiSEnt->MapCountIOBase--;
+ 	    if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) {
++#ifndef XSERVER_LIBPCIACCESS
+ 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
++#else
++	        pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
++#endif
+ 		pSiSEnt->IOBase = NULL;
+ 		pSiSEnt->MapCountIOBase = 0;
+ 		pSiSEnt->forceUnmapIOBase = FALSE;
+@@ -7355,7 +7359,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+ 	if(pSiSEnt->MapCountIOBaseDense) {
+ 	    pSiSEnt->MapCountIOBaseDense--;
+ 	    if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) {
++#ifndef XSERVER_LIBPCIACCESS
+ 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
++#else
++		pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
++#endif
+ 		pSiSEnt->IOBaseDense = NULL;
+ 		pSiSEnt->MapCountIOBaseDense = 0;
+ 		pSiSEnt->forceUnmapIOBaseDense = FALSE;
+@@ -7366,7 +7374,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+ 	if(pSiSEnt->MapCountFbBase) {
+ 	    pSiSEnt->MapCountFbBase--;
+ 	    if((pSiSEnt->MapCountFbBase == 0) || (pSiSEnt->forceUnmapFbBase)) {
++#ifndef XSERVER_LIBPCIACCESS
+ 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
++#else
++		pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->RealFbBase, pSiS->FbMapSize);
++#endif
+ 		pSiSEnt->FbBase = pSiSEnt->RealFbBase = NULL;
+ 		pSiSEnt->MapCountFbBase = 0;
+ 		pSiSEnt->forceUnmapFbBase = FALSE;
+@@ -7376,13 +7388,25 @@ SISUnmapMem(ScrnInfoPtr pScrn)
+ 	}
+     } else {
+ #endif
++#ifndef XSERVER_LIBPCIACCESS
+ 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024));
++#else
++	pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBase, (pSiS->mmioSize * 1024));
++#endif
+ 	pSiS->IOBase = NULL;
+ #ifdef __alpha__
++#ifndef XSERVER_LIBPCIACCESS
+ 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024));
++#else
++	pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->IOBaseDense, (pSiS->mmioSize * 1024));
++#endif
+ 	pSiS->IOBaseDense = NULL;
+ #endif
++#ifndef XSERVER_LIBPCIACCESS
+ 	xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiS->RealFbBase, pSiS->FbMapSize);
++#else
++	pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiS->RealFbBase, pSiS->FbMapSize);
++#endif
+ 	pSiS->FbBase = pSiS->RealFbBase = NULL;
+ #ifdef SISDUALHEAD
+     }
+--
+cgit v0.9.0.2-2-gbebe
+From 926d4f655c8491b68a338f50c810f6729686ec9f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:51 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 4c9b9cb..46cfefd 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -57,7 +57,6 @@
+ #include "fb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "edid.h"
+ 
+ #define SIS_NEED_inSISREG
+@@ -8883,7 +8882,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
+     }
+     pSiS->SiSFastVidCopyDone = TRUE;
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
+From 7d4402786b758de3e6ce2641e15a39d612d5c518 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 15 Oct 2012 23:11:30 +0000
+Subject: Stop including xf86Priv.h
+
+As the name might suggest, it's server-private.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/sis.h b/src/sis.h
+index 46fca2a..20e6134 100644
+--- a/src/sis.h
++++ b/src/sis.h
+@@ -75,7 +75,6 @@
+ 
+ #include "compiler.h"
+ #include "xf86Pci.h"
+-#include "xf86Priv.h"
+ #include "xf86_OSproc.h"
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+ #include "xf86Resources.h"
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 46cfefd..cefe503 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -93,6 +93,10 @@
+ #include "dri.h"
+ #endif
+ 
++#ifndef DEFAULT_DPI
++#define DEFAULT_DPI 96
++#endif
++
+ /*
+  * LookupWindow was removed with video abi 11.
+  */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD
index 3c7340046..add01b89b 100644
--- a/extra/xf86-video-sisimedia/PKGBUILD
+++ b/extra/xf86-video-sisimedia/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 177523 2013-02-06 18:40:48Z jgc $
+# $Id: PKGBUILD 180223 2013-03-18 16:10:37Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisimedia
 pkgver=0.9.1
-pkgrel=6
+pkgrel=7
 pkgdesc="X.org SiS 671 video driver"
 arch=(i686 x86_64)
 url="http://www.linuxconsulting.ro/xorg-drivers/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
 source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2
         xf86-video-sis-0.9.1-20102701.patch
@@ -39,6 +39,7 @@ source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-
         sisimedia-xorg-1.13.patch
         deprecated-sym2.patch
         disable-UploadToScreen-DownloadFromScreen.patch
+        remove_mibstore.h.patch
         COPYING)
 sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
           '61715bb86180decde55a56fad9a12d841c89fbb2'
@@ -67,6 +68,7 @@ sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430'
           '4ea333d659abe2b78f07511467c5356f39bf8695'
           '9bef0b61c0505cc64464073d73684e6933d3f84c'
           'ff95fd41be43560245caa40adc6b481f2dafca7d'
+          'e130b4b4cafa0d54426a9b9c4735ad4bf46686f5'
           'a64e244f274bcb155f892d0488a1a4b1b2f7d70d')
 
 build() {
@@ -95,6 +97,7 @@ build() {
   patch -Np0 -i "${srcdir}/fix-xv-crash.patch"
   patch -Np1 -i "${srcdir}/sisimedia-no-xaa.patch"
   patch -Np1 -i "${srcdir}/sisimedia-xorg-1.13.patch"
+  patch -Np1 -i "${srcdir}/remove_mibstore.h.patch"
 
   patch -Np1 -i "${srcdir}/deprecated-sym2.patch"
   patch -Np1 -i "${srcdir}/disable-UploadToScreen-DownloadFromScreen.patch"
diff --git a/extra/xf86-video-sisimedia/remove_mibstore.h.patch b/extra/xf86-video-sisimedia/remove_mibstore.h.patch
new file mode 100644
index 000000000..ebfa74f5a
--- /dev/null
+++ b/extra/xf86-video-sisimedia/remove_mibstore.h.patch
@@ -0,0 +1,18 @@
+--- xf86-video-sis-0.9.1/src/sis_driver.c	2013-03-10 13:02:25.000000000 +0100
++++ xf86-video-sis-0.9.1/src/sis_driver.c.new	2013-03-10 13:04:24.349309791 +0100
+@@ -86,7 +86,6 @@
+ #include "fb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "edid.h"
+ 
+ #define SIS_NEED_inSISREG
+@@ -9637,7 +9636,6 @@
+     }
+     pSiS->SiSFastVidCopyDone = TRUE;
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD
index 7d9a9ee9f..14617168c 100644
--- a/extra/xf86-video-sisusb/PKGBUILD
+++ b/extra/xf86-video-sisusb/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 168589 2012-10-13 11:45:54Z andyrtr $
+# $Id: PKGBUILD 180224 2013-03-18 16:10:38Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-sisusb
 pkgver=0.9.6
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org SiS USB video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('73dbef43c56a4ce1445c27ebac2ddc062c643c32ca6e2a4d095aea2185b9e046'
+            '9b64f4a9160c1055d3e01e1b603840986163a7880dbbb5c12f3a7d4c66739134')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-sisusb/git-fixes.patch b/extra/xf86-video-sisusb/git-fixes.patch
new file mode 100644
index 000000000..dc920dabd
--- /dev/null
+++ b/extra/xf86-video-sisusb/git-fixes.patch
@@ -0,0 +1,29 @@
+From 293d0902705c272b83432a955fb6a3c96dd6cea7 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/sisusb_driver.c b/src/sisusb_driver.c
+index 539b9f1..0fdc8e9 100644
+--- a/src/sisusb_driver.c
++++ b/src/sisusb_driver.c
+@@ -39,7 +39,6 @@
+ #include "shadowfb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+ 
+ #include "sisusb_regs.h"
+ #include "sisusb_dac.h"
+@@ -1907,7 +1906,6 @@ SISUSBScreenInit(SCREEN_INIT_ARGS_DECL)
+     /* Initialize the accelerators */
+     SiSUSBAccelInit(pScreen);
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* NO SilkenMouse. Never. Ever. */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-tdfx/PKGBUILD b/extra/xf86-video-tdfx/PKGBUILD
index 0e13090fd..997c74f8c 100644
--- a/extra/xf86-video-tdfx/PKGBUILD
+++ b/extra/xf86-video-tdfx/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 168590 2012-10-13 11:45:58Z andyrtr $
+# $Id: PKGBUILD 180215 2013-03-18 16:09:21Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-tdfx
 pkgver=1.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org tdfx video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 optdepends=('tdfx-dri: DRI1 support from community repo')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('70d5fbadfb60fc25e4f90f2a1aad258f64fa3953efbc1059103a8d845870d859'
+            'a79d50f619e6976b90a73f1a9842390e1b3fa37e1ce519bfbb178bd3161af9b5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-tdfx/git-fixes.patch b/extra/xf86-video-tdfx/git-fixes.patch
new file mode 100644
index 000000000..30399cf1a
--- /dev/null
+++ b/extra/xf86-video-tdfx/git-fixes.patch
@@ -0,0 +1,32 @@
+From 10498d2730c651eb7a1890eb9e728269732e9dad Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:59 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
+index ddd5431..412da07 100644
+--- a/src/tdfx_driver.c
++++ b/src/tdfx_driver.c
+@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-trident/PKGBUILD b/extra/xf86-video-trident/PKGBUILD
index 5dee69638..d33c4d24d 100644
--- a/extra/xf86-video-trident/PKGBUILD
+++ b/extra/xf86-video-trident/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 169416 2012-10-20 17:43:29Z andyrtr $
+# $Id: PKGBUILD 180216 2013-03-18 16:09:22Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-trident
 pkgver=1.3.6
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org Trident video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=(!libtool)
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff)
diff --git a/extra/xf86-video-tseng/PKGBUILD b/extra/xf86-video-tseng/PKGBUILD
index a87980924..701c2dcae 100644
--- a/extra/xf86-video-tseng/PKGBUILD
+++ b/extra/xf86-video-tseng/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 168592 2012-10-13 11:46:06Z andyrtr $
+# $Id: PKGBUILD 180217 2013-03-18 16:09:23Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-tseng
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org tseng video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('c06dc5205f627e5afc795ecfa75e18d2d1db4e1f1f195fd017dad60854407819'
+            '8a337e2bab9a5ee7ba15dde6665abcfa9559d769074873cb2a85cc86716bd5da')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-tseng/git-fixes.patch b/extra/xf86-video-tseng/git-fixes.patch
new file mode 100644
index 000000000..88f9cc570
--- /dev/null
+++ b/extra/xf86-video-tseng/git-fixes.patch
@@ -0,0 +1,31 @@
+From d2d5c8437e401181f56804cc68594c4831a0983d Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:55:02 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/tseng_driver.c b/src/tseng_driver.c
+index ffafb19..0db62e5 100644
+--- a/src/tseng_driver.c
++++ b/src/tseng_driver.c
+@@ -39,9 +39,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "fb.h"
+ 
+ #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
+@@ -1453,7 +1450,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	}
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+     /* Initialise cursor functions */
+     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-v4l/PKGBUILD b/extra/xf86-video-v4l/PKGBUILD
index 680323861..d81537960 100644
--- a/extra/xf86-video-v4l/PKGBUILD
+++ b/extra/xf86-video-v4l/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168593 2012-10-13 11:46:14Z andyrtr $
+# $Id: PKGBUILD 180218 2013-03-18 16:09:23Z andyrtr $
 #Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-v4l
 pkgver=0.2.0
-pkgrel=11
+pkgrel=12
 pkgdesc="X.org v4l video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD
index 3f48ff9d6..b05999c60 100644
--- a/extra/xf86-video-vesa/PKGBUILD
+++ b/extra/xf86-video-vesa/PKGBUILD
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD 168594 2012-10-13 11:46:21Z andyrtr $
+# $Id: PKGBUILD 180219 2013-03-18 16:09:24Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-vesa
 pkgver=2.3.2
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org vesa video driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        revert-kernelcheck.patch)
+        revert-kernelcheck.patch
+        git-fixes.patch)
 sha256sums=('144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3'
-            'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c')
+            'ef591a342cea65f1b08e84771ae0de84395c98ac8a71739dbf5c0a7f7a36543c'
+            'beba7e8499b1d0b457762e28e7e413b223cbe87a84a39a3566e96c44da8544a1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-vesa/git-fixes.patch b/extra/xf86-video-vesa/git-fixes.patch
new file mode 100644
index 000000000..fee498d0c
--- /dev/null
+++ b/extra/xf86-video-vesa/git-fixes.patch
@@ -0,0 +1,55 @@
+From 7aafaf56fbca97f36c775462c1ceea3e03700c42 Mon Sep 17 00:00:00 2001
+From: Alexandr Shadchin <alexandr.shadchin@gmail.com>
+Date: Sat, 18 Aug 2012 14:53:34 +0000
+Subject: Fix check function in VESASaveRestore
+
+Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com>
+Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 8ac77da..11cd26c 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -1626,7 +1626,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function)
+ {
+     VESAPtr pVesa;
+ 
+-    if (MODE_QUERY < 0 || function > MODE_RESTORE)
++    if (function < MODE_QUERY || function > MODE_RESTORE)
+ 	return (FALSE);
+ 
+     pVesa = VESAGetRec(pScrn);
+--
+cgit v0.9.0.2-2-gbebe
+From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:55:03 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 11cd26c..b73d104 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -49,9 +49,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* Colormap handling */
+ #include "micmap.h"
+ #include "xf86cmap.h"
+@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
+     VESADGAInit(pScrn, pScreen);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* software cursor */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-vmware/PKGBUILD b/extra/xf86-video-vmware/PKGBUILD
index 47905d4e6..910632835 100644
--- a/extra/xf86-video-vmware/PKGBUILD
+++ b/extra/xf86-video-vmware/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 175177 2013-01-16 09:39:57Z jgc $
+# $Id: PKGBUILD 180220 2013-03-18 16:09:26Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-vmware
 pkgver=13.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org vmware video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('libdrm' 'svga-dri' 'mesa')
-makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool' '!emptydirs')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git-fixes.patch)
+sha256sums=('44919ecd88654f2ab40a1732b5ea6a1dbd1c696b4b0748e68e8b5f1a3486bca6'
+            '0a0fce7ddcb9c53da1b2aa1aa11317c10f0161026f40c82523c4dc0fd496016f')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git-fixes.patch
   ./configure --prefix=/usr --enable-vmwarectrl-client
   make
 }
diff --git a/extra/xf86-video-vmware/git-fixes.patch b/extra/xf86-video-vmware/git-fixes.patch
new file mode 100644
index 000000000..70597def7
--- /dev/null
+++ b/extra/xf86-video-vmware/git-fixes.patch
@@ -0,0 +1,55 @@
+From 23d87c92b7211cc5249eefe4ab3a2c7f370e279e Mon Sep 17 00:00:00 2001
+From: Zack Rusin <zackr@vmware.com>
+Date: Thu, 14 Feb 2013 22:33:01 +0000
+Subject: Kill mibstore
+
+It was a noop for at least 5 years and it has been removed.
+
+Signed-off-by: Zack Rusin <zackr@vmware.com>
+---
+diff --git a/saa/saa_priv.h b/saa/saa_priv.h
+index 6652054..5d81453 100644
+--- a/saa/saa_priv.h
++++ b/saa/saa_priv.h
+@@ -48,7 +48,6 @@
+ #include "pixmapstr.h"
+ #include "windowstr.h"
+ #include "servermd.h"
+-#include "mibstore.h"
+ #include "colormapst.h"
+ #include "gcstruct.h"
+ #include "input.h"
+diff --git a/src/vmware.c b/src/vmware.c
+index 41201f1..6b74e14 100644
+--- a/src/vmware.c
++++ b/src/vmware.c
+@@ -23,7 +23,6 @@ char rcsId_vmware[] =
+ #include "xf86Pci.h"		/* pci */
+ 
+ #include "mipointer.h"		/* sw cursor */
+-#include "mibstore.h"		/* backing store */
+ #include "micmap.h"		/* mi color map */
+ #include "vgaHW.h"		/* VGA hardware */
+ #include "fb.h"
+@@ -1483,7 +1482,6 @@ VMWAREScreenInit(SCREEN_INIT_ARGS_DECL)
+      * If backing store is to be supported (as is usually the case),
+      * initialise it.
+      */
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/vmwgfx/vmwgfx_driver.c b/vmwgfx/vmwgfx_driver.c
+index 9959ffb..7863ba2 100644
+--- a/vmwgfx/vmwgfx_driver.c
++++ b/vmwgfx/vmwgfx_driver.c
+@@ -1036,7 +1036,6 @@ drv_screen_init(SCREEN_INIT_ARGS_DECL)
+ 		   (ms->only_hw_presents) ? "enabled" : "disabled");
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+     miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xf86-video-voodoo/PKGBUILD b/extra/xf86-video-voodoo/PKGBUILD
index abbcae874..a624a2694 100644
--- a/extra/xf86-video-voodoo/PKGBUILD
+++ b/extra/xf86-video-voodoo/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 168596 2012-10-13 11:46:31Z andyrtr $
+# $Id: PKGBUILD 180221 2013-03-18 16:09:27Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-voodoo
 pkgver=1.2.5
-pkgrel=2
+pkgrel=3
 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' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
-conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14')
+makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'xf86dgaproto' 'resourceproto' 'scrnsaverproto')
+conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERSION>=15')
 groups=('xorg-drivers' 'xorg')
 options=('!libtool')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD
index 5f5ca2c30..4a9e967e4 100644
--- a/extra/xorg-server/PKGBUILD
+++ b/extra/xorg-server/PKGBUILD
@@ -1,10 +1,11 @@
-# $Id: PKGBUILD 179653 2013-03-09 07:55:34Z andyrtr $
+# $Id: PKGBUILD 180178 2013-03-18 16:08:50Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=xorg-server
 pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel')
-pkgver=1.13.3
-pkgrel=1
+pkgver=1.14.0
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://xorg.freedesktop.org"
@@ -21,8 +22,8 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
         xvfb-run
         xvfb-run.1
         10-quirks.conf
-        use-pixman-glyph-cache.patch)
-sha256sums=('c9e38eb6404749cab9e3c4a4901d951d4d62958b11f002ce968225ef92902762'
+        git-fixes.patch)
+sha256sums=('1f5107573252c26439fdd165481765a2c0964e02a2e9fab36e02414d08f30630'
             '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
             'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
             'e033f9bcc21980f7f0428e6ed6c362a3d55ad293b05fd6e6c6c1933b86f9e63a'
@@ -30,7 +31,7 @@ sha256sums=('c9e38eb6404749cab9e3c4a4901d951d4d62958b11f002ce968225ef92902762'
             'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
             '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
             '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
-            '7c1dacd30c46b01424c7c75974285cd348dafd0327eb3f211cbe446ad90dd308')
+            'd0832cc16b5e6c1dee2959055a4b327f5c87e2a67b5f427d654663057207b2c1')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -47,6 +48,9 @@ build() {
   # From Fedora. Do not build acpid code, it is buggy and we do not need it
   patch -Np1 -i "${srcdir}/xserver-1.6.0-less-acpi-brokenness.patch"
 
+  # post release git fixes
+  patch -Np1 -i "${srcdir}/git-fixes.patch"
+
   autoreconf -fi
   ./configure --prefix=/usr \
       --enable-ipv6 \
@@ -106,8 +110,8 @@ package_xorg-server() {
   pkgdesc="Xorg X server"
   depends=(libxdmcp libxfont libpciaccess libdrm 'pixman>=0.28.0' libgcrypt libxau xorg-server-common xf86-input-evdev)
   backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf')
-  # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
-  provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
+  # see xorg-server-*/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on
+  provides=('X-ABI-VIDEODRV_VERSION=14' 'X-ABI-XINPUT_VERSION=19' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server')
   groups=('xorg')
   conflicts=('nvidia-utils<=290.10')
 
diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch
index d1817c00f..177f908ef 100644
--- a/extra/xorg-server/git-fixes.patch
+++ b/extra/xorg-server/git-fixes.patch
@@ -1,643 +1,27 @@
-diff --git a/Xi/exevents.c b/Xi/exevents.c
-index 494d07e..106da3a 100644
---- a/Xi/exevents.c
-+++ b/Xi/exevents.c
-@@ -949,8 +949,6 @@ UpdateDeviceState(DeviceIntPtr device, DeviceEvent *event)
- 
-         if (!(event->flags & TOUCH_POINTER_EMULATED))
-             return DONT_PROCESS;
--        if (!(event->flags & TOUCH_END))
--            return DONT_PROCESS;
- 
-         DecreaseButtonCount(device, key, &t->buttonsDown, &t->motionMask,
-                             &t->state);
-@@ -1561,6 +1559,7 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
-     uint32_t touchid;
-     int type = ev->any.type;
-     int emulate_pointer = ! !(ev->device_event.flags & TOUCH_POINTER_EMULATED);
-+    DeviceIntPtr kbd;
- 
-     if (!t)
-         return;
-@@ -1570,9 +1569,6 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
-     else
-         touchid = ev->device_event.touchid;
- 
--    if (emulate_pointer)
--        UpdateDeviceState(dev, &ev->device_event);
--
-     if (type == ET_TouchBegin) {
-         ti = TouchBeginTouch(dev, ev->device_event.sourceid, touchid,
-                              emulate_pointer);
-@@ -1619,9 +1615,14 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
-      * events which _only_ emulate motion just work normally */
-     if (emulate_pointer && ev->any.type != ET_TouchUpdate)
-         DeliverEmulatedMotionEvent(dev, ti, ev);
-+
-     if (emulate_pointer && IsMaster(dev))
-         CheckMotion(&ev->device_event, dev);
- 
-+    kbd = GetMaster(dev, KEYBOARD_OR_FLOAT);
-+    event_set_state(NULL, kbd, &ev->device_event);
-+    ev->device_event.corestate = event_get_corestate(NULL, kbd);
-+
-     /* Make sure we have a valid window trace for event delivery; must be
-      * called after event type mutation. Touch end events are always processed
-      * in order to end touch records. */
-@@ -1643,6 +1644,9 @@ ProcessTouchEvent(InternalEvent *ev, DeviceIntPtr dev)
-         if (ev->any.type == ET_TouchEnd)
-             TouchEndTouch(dev, ti);
-     }
-+
-+    if (emulate_pointer)
-+        UpdateDeviceState(dev, &ev->device_event);
- }
- 
- /**
-@@ -1864,6 +1868,11 @@ DeliverTouchEndEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, InternalEvent *ev,
-         goto out;
-     }
- 
-+    if (listener->state == LISTENER_AWAITING_BEGIN) {
-+        listener->state = LISTENER_HAS_END;
-+        goto out;
-+    }
-+
-     /* Event in response to reject */
-     if (ev->device_event.flags & TOUCH_REJECT) {
-         if (listener->state != LISTENER_HAS_END)
-diff --git a/Xi/xiselectev.c b/Xi/xiselectev.c
-index 0e45cb8..ab1b624 100644
---- a/Xi/xiselectev.c
-+++ b/Xi/xiselectev.c
-@@ -180,8 +180,13 @@ ProcXISelectEvents(ClientPtr client)
-                     if (CLIENT_ID(iclient->resource) == client->index)
-                         continue;
- 
--                    dixLookupDevice(&tmp, evmask->deviceid, serverClient,
--                                    DixReadAccess);
-+                    if (evmask->deviceid == XIAllDevices)
-+                        tmp = inputInfo.all_devices;
-+                    else if (evmask->deviceid == XIAllMasterDevices)
-+                        tmp = inputInfo.all_master_devices;
-+                    else
-+                        dixLookupDevice(&tmp, evmask->deviceid, serverClient,
-+                                        DixReadAccess);
-                     if (!tmp)
-                         return BadImplementation;       /* this shouldn't happen */
- 
-diff --git a/config/udev.c b/config/udev.c
-index c2d00bb..454838f 100644
---- a/config/udev.c
-+++ b/config/udev.c
-@@ -300,9 +300,15 @@ wakeup_handler(pointer data, int err, pointer read_mask)
-             return;
-         action = udev_device_get_action(udev_device);
-         if (action) {
--            if (!strcmp(action, "add") || !strcmp(action, "change")) {
-+            if (!strcmp(action, "add")) {
-                 device_removed(udev_device);
-                 device_added(udev_device);
-+            } else if (!strcmp(action, "change")) {
-+                /* ignore change for the drm devices */
-+                if (strcmp(udev_device_get_subsystem(udev_device), "drm")) {
-+                    device_removed(udev_device);
-+                    device_added(udev_device);
-+                }
-             }
-             else if (!strcmp(action, "remove"))
-                 device_removed(udev_device);
-diff --git a/dix/devices.c b/dix/devices.c
-index 9cf04ed..fd4916a 100644
---- a/dix/devices.c
-+++ b/dix/devices.c
-@@ -306,6 +306,9 @@ AddInputDevice(ClientPtr client, DeviceProc deviceProc, Bool autoStart)
-     /* unity matrix */
-     memset(transform, 0, sizeof(transform));
-     transform[0] = transform[4] = transform[8] = 1.0f;
-+    dev->transform.m[0][0] = 1.0;
-+    dev->transform.m[1][1] = 1.0;
-+    dev->transform.m[2][2] = 1.0;
- 
-     XIChangeDeviceProperty(dev, XIGetKnownProperty(XI_PROP_TRANSFORM),
-                            XIGetKnownProperty(XATOM_FLOAT), 32,
-@@ -440,6 +443,7 @@ DisableDevice(DeviceIntPtr dev, BOOL sendevent)
-     if (*prev != dev)
-         return FALSE;
- 
-+    TouchEndPhysicallyActiveTouches(dev);
-     ReleaseButtonsAndKeys(dev);
-     SyncRemoveDeviceIdleTime(dev->idle_counter);
-     dev->idle_counter = NULL;
-diff --git a/dix/events.c b/dix/events.c
-index 3b40446..ddb5b34 100644
---- a/dix/events.c
-+++ b/dix/events.c
-@@ -1555,11 +1555,13 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time,
-     WindowPtr oldWin;
- 
-     /* slave devices need to float for the duration of the grab. */
--    if (grab->grabtype == XI2 &&
-+    if (grab->grabtype == XI2 && keybd->enabled &&
-         !(passive & ImplicitGrabMask) && !IsMaster(keybd))
-         DetachFromMaster(keybd);
- 
--    if (grabinfo->grab)
-+    if (!keybd->enabled)
-+        oldWin = NULL;
-+    else if (grabinfo->grab)
-         oldWin = grabinfo->grab->window;
-     else if (keybd->focus)
-         oldWin = keybd->focus->win;
-@@ -1569,7 +1571,8 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time,
-         oldWin = keybd->focus->win;
-     if (keybd->valuator)
-         keybd->valuator->motionHintWindow = NullWindow;
--    DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);
-+    if (oldWin)
-+        DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);
-     if (syncEvents.playingEvents)
-         grabinfo->grabTime = syncEvents.time;
-     else
-@@ -1590,13 +1593,10 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
- {
-     GrabPtr grab = keybd->deviceGrab.grab;
-     DeviceIntPtr dev;
--    WindowPtr focusWin = keybd->focus ? keybd->focus->win
--        : keybd->spriteInfo->sprite->win;
-+    WindowPtr focusWin;
-     Bool wasImplicit = (keybd->deviceGrab.fromPassiveGrab &&
-                         keybd->deviceGrab.implicitGrab);
- 
--    if (focusWin == FollowKeyboardWin)
--        focusWin = inputInfo.keyboard->focus->win;
-     if (keybd->valuator)
-         keybd->valuator->motionHintWindow = NullWindow;
-     keybd->deviceGrab.grab = NullGrab;
-@@ -1607,6 +1607,17 @@ DeactivateKeyboardGrab(DeviceIntPtr keybd)
-         if (dev->deviceGrab.sync.other == grab)
-             dev->deviceGrab.sync.other = NullGrab;
-     }
-+
-+    if (keybd->focus)
-+        focusWin = keybd->focus->win;
-+    else if (keybd->spriteInfo->sprite)
-+        focusWin = keybd->spriteInfo->sprite->win;
-+    else
-+        focusWin = NullWindow;
-+
-+    if (focusWin == FollowKeyboardWin)
-+        focusWin = inputInfo.keyboard->focus->win;
-+
-     DoFocusEvents(keybd, grab->window, focusWin, NotifyUngrab);
- 
-     if (!wasImplicit && grab->grabtype == XI2)
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 4e62507..8b4379d 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -896,9 +896,9 @@ scale_to_desktop(DeviceIntPtr dev, ValuatorMask *mask,
- 
-     /* scale x&y to desktop coordinates */
-     *screenx = rescaleValuatorAxis(x, dev->valuator->axes + 0, NULL,
--                                   screenInfo.x, screenInfo.width);
-+                                   screenInfo.x, screenInfo.width - 1);
-     *screeny = rescaleValuatorAxis(y, dev->valuator->axes + 1, NULL,
--                                   screenInfo.y, screenInfo.height);
-+                                   screenInfo.y, screenInfo.height - 1);
- 
-     *devx = x;
-     *devy = y;
-@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
-        coordinates were.
-      */
-     if (flags & POINTER_SCREEN) {
--        screenx = sx;
--        screeny = sy;
-+        scr = miPointerGetScreen(pDev);
-+        screenx = sx + scr->x;
-+        screeny = sy + scr->y;
-     }
- 
-     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
-diff --git a/dix/touch.c b/dix/touch.c
-index 497ad7d..5f77be5 100644
---- a/dix/touch.c
-+++ b/dix/touch.c
-@@ -572,8 +572,8 @@ TouchBuildSprite(DeviceIntPtr sourcedev, TouchPointInfoPtr ti,
-         return FALSE;
- 
-     /* Mark which grabs/event selections we're delivering to: max one grab per
--     * window plus the bottom-most event selection. */
--    ti->listeners = calloc(sprite->spriteTraceGood + 1, sizeof(*ti->listeners));
-+     * window plus the bottom-most event selection, plus any active grab. */
-+    ti->listeners = calloc(sprite->spriteTraceGood + 2, sizeof(*ti->listeners));
-     if (!ti->listeners) {
-         sprite->spriteTraceGood = 0;
-         return FALSE;
-@@ -1029,3 +1029,31 @@ TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
- 
-     return TouchListenerAcceptReject(dev, ti, i, mode);
- }
-+
-+/**
-+ * End physically active touches for a device.
-+ */
-+void
-+TouchEndPhysicallyActiveTouches(DeviceIntPtr dev)
-+{
-+    InternalEvent *eventlist = InitEventList(GetMaximumEventsNum());
-+    int i;
-+
-+    OsBlockSignals();
-+    mieqProcessInputEvents();
-+    for (i = 0; i < dev->last.num_touches; i++) {
-+        DDXTouchPointInfoPtr ddxti = dev->last.touches + i;
-+
-+        if (ddxti->active) {
-+            int j;
-+            int nevents = GetTouchEvents(eventlist, dev, ddxti->ddx_id,
-+                                         XI_TouchEnd, 0, NULL);
-+
-+            for (j = 0; j < nevents; j++)
-+                mieqProcessDeviceEvent(dev, eventlist + j, NULL);
-+        }
-+    }
-+    OsReleaseSignals();
-+
-+    FreeEventList(eventlist, GetMaximumEventsNum());
-+}
-diff --git a/exa/exa_priv.h b/exa/exa_priv.h
-index ea7e7fa..2e4759d 100644
---- a/exa/exa_priv.h
-+++ b/exa/exa_priv.h
-@@ -209,6 +209,7 @@ typedef struct {
-     RegionRec srcReg;
-     RegionRec maskReg;
-     PixmapPtr srcPix;
-+    PixmapPtr maskPix;
- 
-     DevPrivateKeyRec pixmapPrivateKeyRec;
-     DevPrivateKeyRec gcPrivateKeyRec;
-diff --git a/exa/exa_unaccel.c b/exa/exa_unaccel.c
-index 5716138..b0a0011 100644
---- a/exa/exa_unaccel.c
-+++ b/exa/exa_unaccel.c
-@@ -442,6 +442,13 @@ ExaSrcValidate(DrawablePtr pDrawable,
-     RegionPtr dst;
-     int xoff, yoff;
- 
-+    if (pExaScr->srcPix == pPix)
-+        dst = &pExaScr->srcReg;
-+    else if (pExaScr->maskPix == pPix)
-+        dst = &pExaScr->maskReg;
-+    else
-+        return;
-+
-     exaGetDrawableDeltas(pDrawable, pPix, &xoff, &yoff);
- 
-     box.x1 = x + xoff;
-@@ -449,8 +456,6 @@ ExaSrcValidate(DrawablePtr pDrawable,
-     box.x2 = box.x1 + width;
-     box.y2 = box.y1 + height;
- 
--    dst = (pExaScr->srcPix == pPix) ? &pExaScr->srcReg : &pExaScr->maskReg;
--
-     RegionInit(&reg, &box, 1);
-     RegionUnion(dst, dst, &reg);
-     RegionUninit(&reg);
-@@ -495,16 +500,19 @@ ExaPrepareCompositeReg(ScreenPtr pScreen,
-         if (pSrc != pDst)
-             RegionTranslate(pSrc->pCompositeClip,
-                             -pSrc->pDrawable->x, -pSrc->pDrawable->y);
--    }
-+    } else
-+        pExaScr->srcPix = NULL;
- 
-     if (pMask && pMask->pDrawable) {
-         pMaskPix = exaGetDrawablePixmap(pMask->pDrawable);
-         RegionNull(&pExaScr->maskReg);
-         maskReg = &pExaScr->maskReg;
-+        pExaScr->maskPix = pMaskPix;
-         if (pMask != pDst && pMask != pSrc)
-             RegionTranslate(pMask->pCompositeClip,
-                             -pMask->pDrawable->x, -pMask->pDrawable->y);
--    }
-+    } else
-+        pExaScr->maskPix = NULL;
- 
-     RegionTranslate(pDst->pCompositeClip,
-                     -pDst->pDrawable->x, -pDst->pDrawable->y);
-diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
-index f8fcde9..532d87b 100644
---- a/hw/xfree86/common/Makefile.am
-+++ b/hw/xfree86/common/Makefile.am
-@@ -15,6 +15,7 @@ XVSDKINCS = xf86xv.h xf86xvmc.h xf86xvpriv.h
- endif
- 
- if XF86VIDMODE
-+XF86VMODESOURCES = xf86vmode.c
- XF86VMODE_SDK = vidmodeproc.h
- endif
- 
-@@ -47,7 +48,7 @@ libcommon_la_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
-                       xf86VidMode.c xf86fbman.c xf86cmap.c \
-                       xf86Helper.c xf86PM.c xf86Xinput.c xisb.c \
-                       xf86Mode.c xorgHelper.c xf86Extensions.h \
--		      xf86Extensions.c xf86vmode.c \
-+		      xf86Extensions.c $(XF86VMODESOURCES) \
-                       $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES)
- nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h
- libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la
-diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
-index bb2903d..74da438 100644
---- a/hw/xfree86/common/xf86.h
-+++ b/hw/xfree86/common/xf86.h
-@@ -468,4 +468,8 @@ extern _X_EXPORT ScreenPtr xf86ScrnToScreen(ScrnInfoPtr pScrn);
- /* flags passed to xf86 allocate screen */
- #define XF86_ALLOCATE_GPU_SCREEN 1
- 
-+/* Update the internal total dimensions of all ScreenRecs together */
-+extern _X_EXPORT void
-+xf86UpdateDesktopDimensions(void);
-+
- #endif                          /* _XF86_H */
-diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
-index 6de8409..4ffbf7e 100644
---- a/hw/xfree86/common/xf86Bus.c
-+++ b/hw/xfree86/common/xf86Bus.c
-@@ -81,6 +81,8 @@ xf86CallDriverProbe(DriverPtr drv, Bool detect_only)
-     if (drv->platformProbe != NULL) {
-         foundScreen = xf86platformProbeDev(drv);
-     }
-+    if (ServerIsNotSeat0())
-+        return foundScreen;
- #endif
- 
- #ifdef XSERVER_LIBPCIACCESS
-@@ -214,6 +216,8 @@ xf86BusProbe(void)
- {
- #ifdef XSERVER_PLATFORM_BUS
-     xf86platformProbe();
-+    if (ServerIsNotSeat0())
-+        return;
- #endif
- #ifdef XSERVER_LIBPCIACCESS
-     xf86PciProbe();
-diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
-index f681a85..721159d 100644
---- a/hw/xfree86/common/xf86Helper.c
-+++ b/hw/xfree86/common/xf86Helper.c
-@@ -1898,3 +1898,9 @@ xf86ScrnToScreen(ScrnInfoPtr pScrn)
-         return screenInfo.screens[pScrn->scrnIndex];
-     }
- }
-+
-+void
-+xf86UpdateDesktopDimensions(void)
-+{
-+    update_desktop_dimensions();
-+}
-diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
-index 83f9790..f58b87e 100644
---- a/hw/xfree86/common/xf86Module.h
-+++ b/hw/xfree86/common/xf86Module.h
-@@ -80,7 +80,7 @@ typedef enum {
-  * mask is 0xFFFF0000.
-  */
- #define ABI_ANSIC_VERSION	SET_ABI_VERSION(0, 4)
--#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(13, 0)
-+#define ABI_VIDEODRV_VERSION	SET_ABI_VERSION(13, 1)
- #define ABI_XINPUT_VERSION	SET_ABI_VERSION(18, 0)
- #define ABI_EXTENSION_VERSION	SET_ABI_VERSION(7, 0)
- #define ABI_FONT_VERSION	SET_ABI_VERSION(0, 6)
-diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c
-index 24b9473..0525e39 100644
---- a/hw/xfree86/common/xf86platformBus.c
-+++ b/hw/xfree86/common/xf86platformBus.c
-@@ -213,11 +213,12 @@ xf86platformProbe(void)
-     int i;
-     Bool pci = TRUE;
- 
-+    config_odev_probe(xf86PlatformDeviceProbe);
-+
-     if (!xf86scanpci()) {
-         pci = FALSE;
-     }
- 
--    config_odev_probe(&xf86PlatformDeviceProbe);
-     for (i = 0; i < xf86_num_platform_devices; i++) {
-         char *busid = xf86_get_platform_attrib(i, ODEV_ATTRIB_BUSID);
- 
-@@ -358,6 +359,9 @@ xf86platformProbeDev(DriverPtr drvp)
-                     break;
-             }
-             else {
-+                /* for non-seat0 servers assume first device is the master */
-+                if (ServerIsNotSeat0())
-+                    break;
-                 if (xf86_platform_devices[j].pdev) {
-                     if (xf86IsPrimaryPlatform(&xf86_platform_devices[j]))
-                         break;
-diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
-index 23f589c..40963c3 100644
---- a/hw/xfree86/dri2/dri2.c
-+++ b/hw/xfree86/dri2/dri2.c
-@@ -766,6 +766,44 @@ static inline PixmapPtr GetDrawablePixmap(DrawablePtr drawable)
-     }
- }
- 
-+/*
-+ * A TraverseTree callback to invalidate all windows using the same
-+ * pixmap
-+ */
-+static int
-+DRI2InvalidateWalk(WindowPtr pWin, pointer data)
-+{
-+    if (pWin->drawable.pScreen->GetWindowPixmap(pWin) != data)
-+        return WT_DONTWALKCHILDREN;
-+    DRI2InvalidateDrawable(&pWin->drawable);
-+    return WT_WALKCHILDREN;
-+}
-+
-+static void
-+DRI2InvalidateDrawableAll(DrawablePtr pDraw)
-+{
-+    if (pDraw->type == DRAWABLE_WINDOW) {
-+        WindowPtr pWin = (WindowPtr) pDraw;
-+        PixmapPtr pPixmap = pDraw->pScreen->GetWindowPixmap(pWin);
-+
-+        /*
-+         * Find the top-most window using this pixmap
-+         */
-+        while (pWin->parent &&
-+               pDraw->pScreen->GetWindowPixmap(pWin->parent) == pPixmap)
-+            pWin = pWin->parent;
-+
-+        /*
-+         * Walk the sub-tree to invalidate all of the
-+         * windows using the same pixmap
-+         */
-+        TraverseTree(pWin, DRI2InvalidateWalk, pPixmap);
-+        DRI2InvalidateDrawable(&pPixmap->drawable);
-+    }
-+    else
-+        DRI2InvalidateDrawable(pDraw);
-+}
-+
- DrawablePtr DRI2UpdatePrime(DrawablePtr pDraw, DRI2BufferPtr pDest)
- {
-     DRI2DrawablePtr pPriv = DRI2GetDrawable(pDraw);
-@@ -831,6 +869,8 @@ DrawablePtr DRI2UpdatePrime(DrawablePtr pDraw, DRI2BufferPtr pDest)
-     spix->screen_x = mpix->screen_x;
-     spix->screen_y = mpix->screen_y;
- #endif
-+
-+    DRI2InvalidateDrawableAll(pDraw);
-     return &spix->drawable;
- }
- 
-@@ -1048,18 +1088,7 @@ DRI2WaitSwap(ClientPtr client, DrawablePtr pDrawable)
-     return FALSE;
- }
- 
--/*
-- * A TraverseTree callback to invalidate all windows using the same
-- * pixmap
-- */
--static int
--DRI2InvalidateWalk(WindowPtr pWin, pointer data)
--{
--    if (pWin->drawable.pScreen->GetWindowPixmap(pWin) != data)
--        return WT_DONTWALKCHILDREN;
--    DRI2InvalidateDrawable(&pWin->drawable);
--    return WT_WALKCHILDREN;
--}
-+
- 
- int
- DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
-@@ -1162,26 +1191,7 @@ DRI2SwapBuffers(ClientPtr client, DrawablePtr pDraw, CARD64 target_msc,
-      */
-     *swap_target = pPriv->swap_count + pPriv->swapsPending;
- 
--    if (pDraw->type == DRAWABLE_WINDOW) {
--        WindowPtr pWin = (WindowPtr) pDraw;
--        PixmapPtr pPixmap = pScreen->GetWindowPixmap(pWin);
--
--        /*
--         * Find the top-most window using this pixmap
--         */
--        while (pWin->parent &&
--               pScreen->GetWindowPixmap(pWin->parent) == pPixmap)
--            pWin = pWin->parent;
--
--        /*
--         * Walk the sub-tree to invalidate all of the
--         * windows using the same pixmap
--         */
--        TraverseTree(pWin, DRI2InvalidateWalk, pPixmap);
--        DRI2InvalidateDrawable(&pPixmap->drawable);
--    }
--    else
--        DRI2InvalidateDrawable(pDraw);
-+    DRI2InvalidateDrawableAll(pDraw);
- 
-     return Success;
- }
-diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c
-index 37cd8b3..1cf0f02 100644
---- a/hw/xwin/InitOutput.c
-+++ b/hw/xwin/InitOutput.c
-@@ -164,7 +164,7 @@ void XwinExtensionInit(void)
-     int i;
- 
- #ifdef XWIN_GLX_WINDOWS
--    if ((g_fNativeGl) && (serverGeneration == 1)) {
-+    if (g_fNativeGl) {
-         /* install the native GL provider */
-         glxWinPushNativeProvider();
-     }
-@@ -901,7 +901,8 @@ InitOutput(ScreenInfo * screenInfo, int argc, char *argv[])
- {
-     int i;
- 
--    XwinExtensionInit();
-+    if (serverGeneration == 1)
-+        XwinExtensionInit();
- 
-     /* Log the command line */
-     winLogCommandLine(argc, argv);
-diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
-index 4c2f04e..33729a9 100644
---- a/hw/xwin/Makefile.am
-+++ b/hw/xwin/Makefile.am
-@@ -109,13 +109,16 @@ SRCS =	InitInput.c \
- 	winclipboard.h \
- 	winconfig.h \
- 	win.h \
-+	winglobals.h \
- 	winkeybd.h \
- 	winkeynames.h \
- 	winlayouts.h \
- 	winmessages.h \
-+	winmonitors.h \
- 	winmsg.h \
- 	winms.h \
- 	winmultiwindowclass.h \
-+	winmultiwindowicons.h \
- 	winprefs.h \
- 	winresource.h \
- 	winwindow.h \
-diff --git a/hw/xwin/glx/Makefile.am b/hw/xwin/glx/Makefile.am
-index 7222a9f..59f6879 100644
---- a/hw/xwin/glx/Makefile.am
-+++ b/hw/xwin/glx/Makefile.am
-@@ -6,7 +6,8 @@ libXwinGLX_la_SOURCES = \
- 	glwindows.h \
- 	glwrap.c \
- 	indirect.c \
--	wgl_ext_api.c
-+	wgl_ext_api.c \
-+	wgl_ext_api.h
- 
- if XWIN_MULTIWINDOW
- DEFS_MULTIWINDOW = -DXWIN_MULTIWINDOW
-diff --git a/include/input.h b/include/input.h
-index 5747f3c..f8459b8 100644
---- a/include/input.h
-+++ b/include/input.h
-@@ -579,6 +579,7 @@ extern int TouchListenerAcceptReject(DeviceIntPtr dev, TouchPointInfoPtr ti,
-                                      int listener, int mode);
- extern int TouchAcceptReject(ClientPtr client, DeviceIntPtr dev, int mode,
-                              uint32_t touchid, Window grab_window, XID *error);
-+extern void TouchEndPhysicallyActiveTouches(DeviceIntPtr dev);
- 
- /* misc event helpers */
- extern Mask GetEventMask(DeviceIntPtr dev, xEvent *ev, InputClientsPtr clients);
-diff --git a/man/Xserver.man b/man/Xserver.man
-index 8d243d6..b103551 100644
---- a/man/Xserver.man
-+++ b/man/Xserver.man
-@@ -130,7 +130,7 @@ causes the server to generate a core dump on fatal errors.
- .B \-displayfd \fIfd\fP
- specifies a file descriptor in the launching process.  Rather than specify
- a display number, the X server will attempt to listen on successively higher
--display numbers, and upon finding a free one, will write the port number back
-+display numbers, and upon finding a free one, will write the display number back
- on this file descriptor as a newline-terminated string.  The \-pn option is
- ignored when using \-displayfd.
- .TP 8
-diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
-index 082c0db..c1af32e 100644
---- a/xkb/xkbAccessX.c
-+++ b/xkb/xkbAccessX.c
-@@ -709,7 +709,7 @@ ProcessPointerEvent(InternalEvent *ev, DeviceIntPtr mouse)
-     xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(mouse);
-     DeviceEvent *event = &ev->device_event;
- 
--    dev = IsFloating(mouse) ? mouse : GetMaster(mouse, MASTER_KEYBOARD);
-+    dev = (IsMaster(mouse) || IsFloating(mouse)) ? mouse : GetMaster(mouse, MASTER_KEYBOARD);
- 
-     if (dev && dev->key) {
-         xkbi = dev->key->xkbInfo;
+From 5047810a4c20fab444b8c6eb146c55dcdb0d4219 Mon Sep 17 00:00:00 2001
+From: Aaron Plattner <aplattner@nvidia.com>
+Date: Wed, 06 Mar 2013 17:40:28 +0000
+Subject: fb: Rename wfbDestroyGlyphCache
+
+Renaming this function was missed in commit
+9cbcb5bd6a5360a128d15b77a02d8d3351f74366, so both libfb.so and libwfb.so define
+functions named fbDestroyGlyphCache.
+
+Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+Reviewed-by: Søren Sandmann <ssp@redhat.com>
+Signed-off-by: Keith Packard <keithp@keithp.com>
+---
+diff --git a/fb/wfbrename.h b/fb/wfbrename.h
+index 588440c..54d00d0 100644
+--- a/fb/wfbrename.h
++++ b/fb/wfbrename.h
+@@ -52,6 +52,7 @@
+ #define fbCreatePixmap wfbCreatePixmap
+ #define fbCreatePixmapBpp wfbCreatePixmapBpp
+ #define fbCreateWindow wfbCreateWindow
++#define fbDestroyGlyphCache wfbDestroyGlyphCache
+ #define fbDestroyPixmap wfbDestroyPixmap
+ #define fbDestroyWindow wfbDestroyWindow
+ #define fbDoCopy wfbDoCopy
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/extra/xorg-server/use-pixman-glyph-cache.patch b/extra/xorg-server/use-pixman-glyph-cache.patch
deleted file mode 100644
index c1cd90d3a..000000000
--- a/extra/xorg-server/use-pixman-glyph-cache.patch
+++ /dev/null
@@ -1,270 +0,0 @@
-From 9cbcb5bd6a5360a128d15b77a02d8d3351f74366 Mon Sep 17 00:00:00 2001
-From: Søren Sandmann Pedersen <ssp@redhat.com>
-Date: Wed, 30 May 2012 09:19:08 +0000
-Subject: Use new pixman_glyph_cache_t API that will be in pixman 0.28.0
-
-This new API allows glyphs to be cached in a data structure in pixman,
-and entire glyph strings to be composited in one go.
-
-Also bump pixman dependency to 0.27.2.
-
-Results from the cairo peformance test suite running against Xvfb with
-a screen size of 1680x1050@32bpp:
-
-Speedups
-========
- xlib          firefox-talos-gfx  12416.63 -> 3603.93   3.45x speedup
-██▌
- xlib          xfce4-terminal-a1   1727.57 -> 1048.85:  1.65x speedup
-▋
- xlib                  evolution   1370.49 -> 869.34:   1.58x speedup
-▋
- xlib         gnome-terminal-vim   1832.83 -> 1251.94:  1.46x speedup
-▌
- xlib                    poppler   1519.70 -> 1204.05:  1.26x speedup
-▎
- xlib       firefox-planet-gnome   6982.55 -> 5598.16:  1.25x speedup
-▎
- xlib                  ocitysmap   1142.77 -> 1071.53:  1.07x speedup
-▏
-
-No slowdowns were reported.
-
-Results of x11perf -aa10text:
-
-Before:
-
-      8000000 reps @   0.0007 msec (1450000.0/sec)
-      8000000 reps @   0.0007 msec (1460000.0/sec)
-      8000000 reps @   0.0007 msec (1460000.0/sec)
-      8000000 reps @   0.0007 msec (1470000.0/sec)
-      8000000 reps @   0.0007 msec (1480000.0/sec)
-     40000000 trep @   0.0007 msec (1460000.0/sec)
-
-After:
-
-     32000000 reps @   0.0002 msec (4910000.0/sec)
-     32000000 reps @   0.0002 msec (4830000.0/sec)
-     32000000 reps @   0.0002 msec (4890000.0/sec)
-     32000000 reps @   0.0002 msec (4830000.0/sec)
-     32000000 reps @   0.0002 msec (4900000.0/sec)
-    160000000 trep @   0.0002 msec (4870000.0/sec)
-
-Version 2: Destroy the glyph cache at server regen time
-
-Acked-by: Aaron Plattner <aplattner@nvidia.com>
-Reviewed-by: Keith Packard <keithp@keithp.com>
-Signed-off-by: Soren Sandmann <ssp@redhat.com>
----
-diff --git a/configure.ac b/configure.ac
-index e686614..b6ed92c 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -811,7 +811,7 @@ LIBPCIACCESS="pciaccess >= 0.12.901"
- LIBUDEV="libudev >= 143"
- LIBSELINUX="libselinux >= 2.0.86"
- LIBDBUS="dbus-1 >= 1.0"
--LIBPIXMAN="pixman-1 >= 0.21.8"
-+LIBPIXMAN="pixman-1 >= 0.27.2"
- 
- dnl Pixman is always required, but we separate it out so we can link
- dnl specific modules against it
-diff --git a/fb/fb.h b/fb/fb.h
-index 75596c5..b869d12 100644
---- a/fb/fb.h
-+++ b/fb/fb.h
-@@ -1344,6 +1344,9 @@ extern _X_EXPORT void
- extern _X_EXPORT Bool
-  fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats);
- 
-+extern _X_EXPORT void
-+fbDestroyGlyphCache(void);
-+
- /*
-  * fbpixmap.c
-  */
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index 097a1a6..2804ff4 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -70,6 +70,156 @@ fbComposite(CARD8 op,
-     free_pixman_pict(pDst, dest);
- }
- 
-+static pixman_glyph_cache_t *glyphCache;
-+
-+void
-+fbDestroyGlyphCache(void)
-+{
-+    if (glyphCache)
-+    {
-+	pixman_glyph_cache_destroy (glyphCache);
-+	glyphCache = NULL;
-+    }
-+}
-+
-+static void
-+fbUnrealizeGlyph(ScreenPtr pScreen,
-+		 GlyphPtr pGlyph)
-+{
-+    if (glyphCache)
-+	pixman_glyph_cache_remove (glyphCache, pGlyph, NULL);
-+}
-+
-+static void
-+fbGlyphs(CARD8 op,
-+	 PicturePtr pSrc,
-+	 PicturePtr pDst,
-+	 PictFormatPtr maskFormat,
-+	 INT16 xSrc,
-+	 INT16 ySrc, int nlist,
-+	 GlyphListPtr list,
-+	 GlyphPtr *glyphs)
-+{
-+#define N_STACK_GLYPHS 512
-+    ScreenPtr pScreen = pDst->pDrawable->pScreen;
-+    pixman_glyph_t stack_glyphs[N_STACK_GLYPHS];
-+    pixman_glyph_t *pglyphs = stack_glyphs;
-+    pixman_image_t *srcImage, *dstImage;
-+    int srcXoff, srcYoff, dstXoff, dstYoff;
-+    GlyphPtr glyph;
-+    int n_glyphs;
-+    int x, y;
-+    int i, n;
-+    int xDst = list->xOff, yDst = list->yOff;
-+
-+    miCompositeSourceValidate(pSrc);
-+    
-+    n_glyphs = 0;
-+    for (i = 0; i < nlist; ++i)
-+	n_glyphs += list[i].len;
-+
-+    if (!glyphCache)
-+	glyphCache = pixman_glyph_cache_create();
-+
-+    pixman_glyph_cache_freeze (glyphCache);
-+    
-+    if (n_glyphs > N_STACK_GLYPHS) {
-+	if (!(pglyphs = malloc (n_glyphs * sizeof (pixman_glyph_t))))
-+	    goto out;
-+    }
-+    
-+    i = 0;
-+    x = y = 0;
-+    while (nlist--) {
-+        x += list->xOff;
-+        y += list->yOff;
-+        n = list->len;
-+        while (n--) {
-+	    const void *g;
-+
-+            glyph = *glyphs++;
-+
-+	    if (!(g = pixman_glyph_cache_lookup (glyphCache, glyph, NULL))) {
-+		pixman_image_t *glyphImage;
-+		PicturePtr pPicture;
-+		int xoff, yoff;
-+
-+		pPicture = GetGlyphPicture(glyph, pScreen);
-+		if (!pPicture) {
-+		    n_glyphs--;
-+		    goto next;
-+		}
-+
-+		if (!(glyphImage = image_from_pict(pPicture, FALSE, &xoff, &yoff)))
-+		    goto out;
-+
-+		g = pixman_glyph_cache_insert(glyphCache, glyph, NULL,
-+					      glyph->info.x,
-+					      glyph->info.y,
-+					      glyphImage);
-+
-+		free_pixman_pict(pPicture, glyphImage);
-+
-+		if (!g)
-+		    goto out;
-+	    }
-+
-+	    pglyphs[i].x = x;
-+	    pglyphs[i].y = y;
-+	    pglyphs[i].glyph = g;
-+	    i++;
-+
-+	next:
-+            x += glyph->info.xOff;
-+            y += glyph->info.yOff;
-+	}
-+	list++;
-+    }
-+
-+    if (!(srcImage = image_from_pict(pSrc, FALSE, &srcXoff, &srcYoff)))
-+	goto out;
-+
-+    if (!(dstImage = image_from_pict(pDst, TRUE, &dstXoff, &dstYoff)))
-+	goto out_free_src;
-+
-+    if (maskFormat) {
-+	pixman_format_code_t format;
-+	pixman_box32_t extents;
-+	int x, y;
-+
-+	format = maskFormat->format | (maskFormat->depth << 24);
-+
-+	pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents);
-+
-+	x = extents.x1;
-+	y = extents.y1;
-+
-+	pixman_composite_glyphs(op, srcImage, dstImage, format,
-+				xSrc + srcXoff + xDst, ySrc + srcYoff + yDst,
-+				x, y,
-+				x + dstXoff, y + dstYoff,
-+				extents.x2 - extents.x1,
-+				extents.y2 - extents.y1,
-+				glyphCache, n_glyphs, pglyphs);
-+    }
-+    else {
-+	pixman_composite_glyphs_no_mask(op, srcImage, dstImage,
-+					xSrc + srcXoff - xDst, ySrc + srcYoff - yDst,
-+					dstXoff, dstYoff,
-+					glyphCache, n_glyphs, pglyphs);
-+    }
-+
-+    free_pixman_pict(pDst, dstImage);
-+
-+out_free_src:
-+    free_pixman_pict(pSrc, srcImage);
-+
-+out:
-+    pixman_glyph_cache_thaw(glyphCache);
-+    if (pglyphs != stack_glyphs)
-+	free(pglyphs);
-+}
-+
- static pixman_image_t *
- create_solid_fill_image(PicturePtr pict)
- {
-@@ -357,7 +507,8 @@ fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats)
-         return FALSE;
-     ps = GetPictureScreen(pScreen);
-     ps->Composite = fbComposite;
--    ps->Glyphs = miGlyphs;
-+    ps->Glyphs = fbGlyphs;
-+    ps->UnrealizeGlyph = fbUnrealizeGlyph;
-     ps->CompositeRects = miCompositeRects;
-     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
-     ps->Trapezoids = fbTrapezoids;
-diff --git a/fb/fbscreen.c b/fb/fbscreen.c
-index 7c7d656..f9080a4 100644
---- a/fb/fbscreen.c
-+++ b/fb/fbscreen.c
-@@ -32,6 +32,7 @@ fbCloseScreen(ScreenPtr pScreen)
-     int d;
-     DepthPtr depths = pScreen->allowedDepths;
- 
-+    fbDestroyGlyphCache();
-     for (d = 0; d < pScreen->numDepths; d++)
-         free(depths[d].vids);
-     free(depths);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD
index 91da62eb7..5e937cbf8 100644
--- a/kernels/linux-libre-pae/PKGBUILD
+++ b/kernels/linux-libre-pae/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180054 2013-03-15 08:10:52Z tpowa $
+# $Id: PKGBUILD 180114 2013-03-17 13:00:07Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@ pkgbase=linux-libre-pae     # Build stock -LIBRE-PAE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
 pkgver=${_basekernel}.3
-pkgrel=1
+pkgrel=2
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -20,13 +20,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'boot-logo.patch'
-        'change-default-console-loglevel.patch')
+        'change-default-console-loglevel.patch'
+        'drm-i915-enable-irqs-earlier-when-resuming.patch'
+        'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch')
 md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
          'a762b6f22a64473a0b4d8dc5366b25d3'
          '5cc106ba38bab845ea62138fc0d1bbf1'
          'f302c931bd85309da9d9792b4cc96467'
          '04b21c79df0a952c22d681dd4f4562df'
-         'f3def2cefdcbb954c21d8505d23cc83c')
+         'f3def2cefdcbb954c21d8505d23cc83c'
+         '40e7b328977ad787a0b5584f193d63fe'
+         '8b9159931fab0c191a86dbd5a46fa328')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-PAE
@@ -46,6 +50,11 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # revert 2 patches which breaks displays
+  # FS 34327
+  patch -Rp1 -i "${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch"
+  patch -Rp1 -i "${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch"
+
   cat "${srcdir}/config" > ./.config # simpler
 
   if [ "${_kernelname}" != "" ]; then
diff --git a/kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch b/kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch
new file mode 100644
index 000000000..cb621d520
--- /dev/null
+++ b/kernels/linux-libre-pae/drm-i915-enable-irqs-earlier-when-resuming.patch
@@ -0,0 +1,82 @@
+From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Tue, 5 Mar 2013 09:50:58 +0100
+Subject: drm/i915: enable irqs earlier when resuming
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream.
+
+We need it to restore the ilk rc6 context, since the gpu wait no
+requires interrupts. But in general having interrupts around should
+help in code sanity, since more and more stuff is interrupt driven.
+
+This regression has been introduced in
+
+commit 3e9605018ab3e333d51cc90fccfde2031886763b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Tue Nov 27 16:22:54 2012 +0000
+
+    drm/i915: Rearrange code to only have a single method for waiting upon the ring
+
+Like in the driver load code we need to make sure that hotplug
+interrupts don't cause havoc with our modeset state, hence block them
+with the existing infrastructure. Again we ignore races where we might
+loose hotplug interrupts ...
+
+Note that the driver load part of the regression has already been
+fixed in
+
+commit 52d7ecedac3f96fb562cb482c139015372728638
+Author: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date:   Sat Dec 1 21:03:22 2012 +0100
+
+    drm/i915: reorder setup sequence to have irqs for output setup
+
+v2: Add a note to the commit message about which patch fixed the
+driver load part of the regression. Stable kernels need to backport
+both patches.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Mika Kuoppala <mika.kuoppala@intel.com>
+Reported-and-Tested-by: Ilya Tumaykin <itumaykin@gmail.com>
+Reviewed-by: Chris wilson <chris@chris-wilson.co.uk> (v1)
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/i915_drv.c |   13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -486,6 +486,7 @@ static int i915_drm_freeze(struct drm_de
+ 		intel_modeset_disable(dev);
+ 
+ 		drm_irq_uninstall(dev);
++		dev_priv->enable_hotplug_processing = false;
+ 	}
+ 
+ 	i915_save_state(dev);
+@@ -562,9 +563,19 @@ static int __i915_drm_thaw(struct drm_de
+ 		error = i915_gem_init_hw(dev);
+ 		mutex_unlock(&dev->struct_mutex);
+ 
++		/* We need working interrupts for modeset enabling ... */
++		drm_irq_install(dev);
++
+ 		intel_modeset_init_hw(dev);
+ 		intel_modeset_setup_hw_state(dev, false);
+-		drm_irq_install(dev);
++
++		/*
++		 * ... but also need to make sure that hotplug processing
++		 * doesn't cause havoc. Like in the driver load code we don't
++		 * bother with the tiny race here where we might loose hotplug
++		 * notifications.
++		 * */
++		dev_priv->enable_hotplug_processing = true;
+ 	}
+ 
+ 	intel_opregion_init(dev);
diff --git a/kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch b/kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch
new file mode 100644
index 000000000..8dc354488
--- /dev/null
+++ b/kernels/linux-libre-pae/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch
@@ -0,0 +1,124 @@
+From 52d7ecedac3f96fb562cb482c139015372728638 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Sat, 1 Dec 2012 21:03:22 +0100
+Subject: drm/i915: reorder setup sequence to have irqs for output setup
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit 52d7ecedac3f96fb562cb482c139015372728638 upstream.
+
+Otherwise the new&shiny irq-driven gmbus and dp aux code won't work that
+well. Noticed since the dp aux code doesn't have an automatic fallback
+with a timeout (since the hw provides for that already).
+
+v2: Simple move drm_irq_install before intel_modeset_gem_init, as
+suggested by Ben Widawsky.
+
+v3: Now that interrupts are enabled before all connectors are fully
+set up, we might fall over serving a HPD interrupt while things are
+still being set up. Instead of jumping through massive hoops and
+complicating the code with a separate hpd irq enable step, simply
+block out the hotplug work item from doing anything until things are
+in place.
+
+v4: Actually, we can enable hotplug processing only after the fbdev is
+fully set up, since we call down into the fbdev from the hotplug work
+functions. So stick the hpd enabling right next to the poll helper
+initialization.
+
+v5: We need to enable irqs before intel_modeset_init, since that
+function sets up the outputs.
+
+v6: Fixup cleanup sequence, too.
+
+Reviewed-by: Imre Deak <imre.deak@intel.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/i915_dma.c |   23 ++++++++++++++---------
+ drivers/gpu/drm/i915/i915_drv.h |    1 +
+ drivers/gpu/drm/i915/i915_irq.c |    4 ++++
+ 3 files changed, 19 insertions(+), 9 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -1297,19 +1297,21 @@ static int i915_load_modeset_init(struct
+ 	if (ret)
+ 		goto cleanup_vga_switcheroo;
+ 
++	ret = drm_irq_install(dev);
++	if (ret)
++		goto cleanup_gem_stolen;
++
++	/* Important: The output setup functions called by modeset_init need
++	 * working irqs for e.g. gmbus and dp aux transfers. */
+ 	intel_modeset_init(dev);
+ 
+ 	ret = i915_gem_init(dev);
+ 	if (ret)
+-		goto cleanup_gem_stolen;
+-
+-	intel_modeset_gem_init(dev);
++		goto cleanup_irq;
+ 
+ 	INIT_WORK(&dev_priv->console_resume_work, intel_console_resume);
+ 
+-	ret = drm_irq_install(dev);
+-	if (ret)
+-		goto cleanup_gem;
++	intel_modeset_gem_init(dev);
+ 
+ 	/* Always safe in the mode setting case. */
+ 	/* FIXME: do pre/post-mode set stuff in core KMS code */
+@@ -1317,7 +1319,10 @@ static int i915_load_modeset_init(struct
+ 
+ 	ret = intel_fbdev_init(dev);
+ 	if (ret)
+-		goto cleanup_irq;
++		goto cleanup_gem;
++
++	/* Only enable hotplug handling once the fbdev is fully set up. */
++	dev_priv->enable_hotplug_processing = true;
+ 
+ 	drm_kms_helper_poll_init(dev);
+ 
+@@ -1326,13 +1331,13 @@ static int i915_load_modeset_init(struct
+ 
+ 	return 0;
+ 
+-cleanup_irq:
+-	drm_irq_uninstall(dev);
+ cleanup_gem:
+ 	mutex_lock(&dev->struct_mutex);
+ 	i915_gem_cleanup_ringbuffer(dev);
+ 	mutex_unlock(&dev->struct_mutex);
+ 	i915_gem_cleanup_aliasing_ppgtt(dev);
++cleanup_irq:
++	drm_irq_uninstall(dev);
+ cleanup_gem_stolen:
+ 	i915_gem_cleanup_stolen(dev);
+ cleanup_vga_switcheroo:
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -672,6 +672,7 @@ typedef struct drm_i915_private {
+ 
+ 	u32 hotplug_supported_mask;
+ 	struct work_struct hotplug_work;
++	bool enable_hotplug_processing;
+ 
+ 	int num_pipe;
+ 	int num_pch_pll;
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -287,6 +287,10 @@ static void i915_hotplug_work_func(struc
+ 	struct drm_mode_config *mode_config = &dev->mode_config;
+ 	struct intel_encoder *encoder;
+ 
++	/* HPD irq before everything is fully set up. */
++	if (!dev_priv->enable_hotplug_processing)
++		return;
++
+ 	mutex_lock(&mode_config->mutex);
+ 	DRM_DEBUG_KMS("running encoder hotplug functions\n");
+ 
diff --git a/kernels/linux-libre-pae/linux-libre-pae.install b/kernels/linux-libre-pae/linux-libre-pae.install
index 553af3431..7951e0156 100644
--- a/kernels/linux-libre-pae/linux-libre-pae.install
+++ b/kernels/linux-libre-pae/linux-libre-pae.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-pae
-KERNEL_VERSION=3.8.3-1-LIBRE-PAE
+KERNEL_VERSION=3.8.3-2-LIBRE-PAE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 3fb5fdb37..91dc1484c 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 180054 2013-03-15 08:10:52Z tpowa $
+# $Id: PKGBUILD 180114 2013-03-17 13:00:07Z tpowa $
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -7,7 +7,7 @@ pkgbase=linux-libre-xen     # Build stock -LIBRE-XEN kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.8
 pkgver=${_basekernel}.3
-pkgrel=1
+pkgrel=2
 arch=('i686')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -20,13 +20,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         # standard config files for mkinitcpio ramdisk
         "${pkgbase}.preset"
         'boot-logo.patch'
-        'change-default-console-loglevel.patch')
+        'change-default-console-loglevel.patch'
+        'drm-i915-enable-irqs-earlier-when-resuming.patch'
+        'drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch')
 md5sums=('84c2a77910932ffc7d958744ac9cf2f5'
          'a762b6f22a64473a0b4d8dc5366b25d3'
          'c13961a22d8c742fb31b59a1e27a0e7b'
          'b7c2805bb287a644c0a303bf7721e534'
          '04b21c79df0a952c22d681dd4f4562df'
-         'f3def2cefdcbb954c21d8505d23cc83c')
+         'f3def2cefdcbb954c21d8505d23cc83c'
+         '40e7b328977ad787a0b5584f193d63fe'
+         '8b9159931fab0c191a86dbd5a46fa328')
 
 _kernelname=${pkgbase#linux-libre}
 _localversionname=-LIBRE-XEN
@@ -46,6 +50,11 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # revert 2 patches which breaks displays
+  # FS 34327
+  patch -Rp1 -i "${srcdir}/drm-i915-enable-irqs-earlier-when-resuming.patch"
+  patch -Rp1 -i "${srcdir}/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch"
+
   cat "${srcdir}/config" > ./.config # simpler
 
   if [ "${_kernelname}" != "" ]; then
diff --git a/kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch b/kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch
new file mode 100644
index 000000000..cb621d520
--- /dev/null
+++ b/kernels/linux-libre-xen/drm-i915-enable-irqs-earlier-when-resuming.patch
@@ -0,0 +1,82 @@
+From 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Tue, 5 Mar 2013 09:50:58 +0100
+Subject: drm/i915: enable irqs earlier when resuming
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit 15239099d7a7a9ecdc1ccb5b187ae4cda5488ff9 upstream.
+
+We need it to restore the ilk rc6 context, since the gpu wait no
+requires interrupts. But in general having interrupts around should
+help in code sanity, since more and more stuff is interrupt driven.
+
+This regression has been introduced in
+
+commit 3e9605018ab3e333d51cc90fccfde2031886763b
+Author: Chris Wilson <chris@chris-wilson.co.uk>
+Date:   Tue Nov 27 16:22:54 2012 +0000
+
+    drm/i915: Rearrange code to only have a single method for waiting upon the ring
+
+Like in the driver load code we need to make sure that hotplug
+interrupts don't cause havoc with our modeset state, hence block them
+with the existing infrastructure. Again we ignore races where we might
+loose hotplug interrupts ...
+
+Note that the driver load part of the regression has already been
+fixed in
+
+commit 52d7ecedac3f96fb562cb482c139015372728638
+Author: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date:   Sat Dec 1 21:03:22 2012 +0100
+
+    drm/i915: reorder setup sequence to have irqs for output setup
+
+v2: Add a note to the commit message about which patch fixed the
+driver load part of the regression. Stable kernels need to backport
+both patches.
+
+Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=54691
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Mika Kuoppala <mika.kuoppala@intel.com>
+Reported-and-Tested-by: Ilya Tumaykin <itumaykin@gmail.com>
+Reviewed-by: Chris wilson <chris@chris-wilson.co.uk> (v1)
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/i915_drv.c |   13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- a/drivers/gpu/drm/i915/i915_drv.c
++++ b/drivers/gpu/drm/i915/i915_drv.c
+@@ -486,6 +486,7 @@ static int i915_drm_freeze(struct drm_de
+ 		intel_modeset_disable(dev);
+ 
+ 		drm_irq_uninstall(dev);
++		dev_priv->enable_hotplug_processing = false;
+ 	}
+ 
+ 	i915_save_state(dev);
+@@ -562,9 +563,19 @@ static int __i915_drm_thaw(struct drm_de
+ 		error = i915_gem_init_hw(dev);
+ 		mutex_unlock(&dev->struct_mutex);
+ 
++		/* We need working interrupts for modeset enabling ... */
++		drm_irq_install(dev);
++
+ 		intel_modeset_init_hw(dev);
+ 		intel_modeset_setup_hw_state(dev, false);
+-		drm_irq_install(dev);
++
++		/*
++		 * ... but also need to make sure that hotplug processing
++		 * doesn't cause havoc. Like in the driver load code we don't
++		 * bother with the tiny race here where we might loose hotplug
++		 * notifications.
++		 * */
++		dev_priv->enable_hotplug_processing = true;
+ 	}
+ 
+ 	intel_opregion_init(dev);
diff --git a/kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch b/kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch
new file mode 100644
index 000000000..8dc354488
--- /dev/null
+++ b/kernels/linux-libre-xen/drm-i915-reorder-setup-sequence-to-have-irqs-for-output-setup.patch
@@ -0,0 +1,124 @@
+From 52d7ecedac3f96fb562cb482c139015372728638 Mon Sep 17 00:00:00 2001
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+Date: Sat, 1 Dec 2012 21:03:22 +0100
+Subject: drm/i915: reorder setup sequence to have irqs for output setup
+
+From: Daniel Vetter <daniel.vetter@ffwll.ch>
+
+commit 52d7ecedac3f96fb562cb482c139015372728638 upstream.
+
+Otherwise the new&shiny irq-driven gmbus and dp aux code won't work that
+well. Noticed since the dp aux code doesn't have an automatic fallback
+with a timeout (since the hw provides for that already).
+
+v2: Simple move drm_irq_install before intel_modeset_gem_init, as
+suggested by Ben Widawsky.
+
+v3: Now that interrupts are enabled before all connectors are fully
+set up, we might fall over serving a HPD interrupt while things are
+still being set up. Instead of jumping through massive hoops and
+complicating the code with a separate hpd irq enable step, simply
+block out the hotplug work item from doing anything until things are
+in place.
+
+v4: Actually, we can enable hotplug processing only after the fbdev is
+fully set up, since we call down into the fbdev from the hotplug work
+functions. So stick the hpd enabling right next to the poll helper
+initialization.
+
+v5: We need to enable irqs before intel_modeset_init, since that
+function sets up the outputs.
+
+v6: Fixup cleanup sequence, too.
+
+Reviewed-by: Imre Deak <imre.deak@intel.com>
+Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/gpu/drm/i915/i915_dma.c |   23 ++++++++++++++---------
+ drivers/gpu/drm/i915/i915_drv.h |    1 +
+ drivers/gpu/drm/i915/i915_irq.c |    4 ++++
+ 3 files changed, 19 insertions(+), 9 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_dma.c
++++ b/drivers/gpu/drm/i915/i915_dma.c
+@@ -1297,19 +1297,21 @@ static int i915_load_modeset_init(struct
+ 	if (ret)
+ 		goto cleanup_vga_switcheroo;
+ 
++	ret = drm_irq_install(dev);
++	if (ret)
++		goto cleanup_gem_stolen;
++
++	/* Important: The output setup functions called by modeset_init need
++	 * working irqs for e.g. gmbus and dp aux transfers. */
+ 	intel_modeset_init(dev);
+ 
+ 	ret = i915_gem_init(dev);
+ 	if (ret)
+-		goto cleanup_gem_stolen;
+-
+-	intel_modeset_gem_init(dev);
++		goto cleanup_irq;
+ 
+ 	INIT_WORK(&dev_priv->console_resume_work, intel_console_resume);
+ 
+-	ret = drm_irq_install(dev);
+-	if (ret)
+-		goto cleanup_gem;
++	intel_modeset_gem_init(dev);
+ 
+ 	/* Always safe in the mode setting case. */
+ 	/* FIXME: do pre/post-mode set stuff in core KMS code */
+@@ -1317,7 +1319,10 @@ static int i915_load_modeset_init(struct
+ 
+ 	ret = intel_fbdev_init(dev);
+ 	if (ret)
+-		goto cleanup_irq;
++		goto cleanup_gem;
++
++	/* Only enable hotplug handling once the fbdev is fully set up. */
++	dev_priv->enable_hotplug_processing = true;
+ 
+ 	drm_kms_helper_poll_init(dev);
+ 
+@@ -1326,13 +1331,13 @@ static int i915_load_modeset_init(struct
+ 
+ 	return 0;
+ 
+-cleanup_irq:
+-	drm_irq_uninstall(dev);
+ cleanup_gem:
+ 	mutex_lock(&dev->struct_mutex);
+ 	i915_gem_cleanup_ringbuffer(dev);
+ 	mutex_unlock(&dev->struct_mutex);
+ 	i915_gem_cleanup_aliasing_ppgtt(dev);
++cleanup_irq:
++	drm_irq_uninstall(dev);
+ cleanup_gem_stolen:
+ 	i915_gem_cleanup_stolen(dev);
+ cleanup_vga_switcheroo:
+--- a/drivers/gpu/drm/i915/i915_drv.h
++++ b/drivers/gpu/drm/i915/i915_drv.h
+@@ -672,6 +672,7 @@ typedef struct drm_i915_private {
+ 
+ 	u32 hotplug_supported_mask;
+ 	struct work_struct hotplug_work;
++	bool enable_hotplug_processing;
+ 
+ 	int num_pipe;
+ 	int num_pch_pll;
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -287,6 +287,10 @@ static void i915_hotplug_work_func(struc
+ 	struct drm_mode_config *mode_config = &dev->mode_config;
+ 	struct intel_encoder *encoder;
+ 
++	/* HPD irq before everything is fully set up. */
++	if (!dev_priv->enable_hotplug_processing)
++		return;
++
+ 	mutex_lock(&mode_config->mutex);
+ 	DRM_DEBUG_KMS("running encoder hotplug functions\n");
+ 
diff --git a/kernels/linux-libre-xen/linux-libre-xen.install b/kernels/linux-libre-xen/linux-libre-xen.install
index 136ca7163..d707e2ef8 100644
--- a/kernels/linux-libre-xen/linux-libre-xen.install
+++ b/kernels/linux-libre-xen/linux-libre-xen.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-xen
-KERNEL_VERSION=3.8.3-1-LIBRE-XEN
+KERNEL_VERSION=3.8.3-2-LIBRE-XEN
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 12e461519..290eff882 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-pkgrel=36
+pkgrel=38
 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
 arch=(i686 x86_64 mips64el)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
@@ -19,27 +19,30 @@ install=cdfs.install
 source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$_pkgname-$pkgver.tar.bz2"
 	"cdfs-3.0.patch"
 	"cdfs-3.2.patch"
-	"cdfs-3.4.patch")
+	"cdfs-3.4.patch"
+	"cdfs-3.8.patch")
 md5sums=('ac64c014a90e3c488394832ea29605b3'
          'aba7da94a9dcbb8a93ea423cb6958fef'
          'e934407b3460257a301822ffc4ab3933'
-         '9215e7bdac728bd2f889fb525e543454')
+         '9215e7bdac728bd2f889fb525e543454'
+         'b036fd72b033294605bec2b60a73e3bd')
 
 _kernver=`pacman -Q linux-libre | cut -d . -f 2 | cut -f 1 -d -`
 _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-LIBRE/version`
 
 build() {
-  depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`")
-
   cd $srcdir/$_pkgname-$pkgver
   patch -p1 <$srcdir/cdfs-3.0.patch
   patch -p1 <$srcdir/cdfs-3.2.patch
   patch -p1 <$srcdir/cdfs-3.4.patch
+  patch -p1 <$srcdir/cdfs-3.8.patch
   make KDIR=/usr/lib/modules/${_kernverfull}/build
   sed -i "s|extramodules-.*-LIBRE|extramodules-3.${_kernver}-LIBRE|" $startdir/cdfs.install
 }
 
 package() {
+  depends=("linux-libre>=3.${_kernver}" "linux-libre<3.`expr ${_kernver} + 1`")
+
   cd $srcdir/$_pkgname-$pkgver
   install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-LIBRE/cdfs.ko
 }
diff --git a/libre/cdfs-libre/cdfs-3.8.patch b/libre/cdfs-libre/cdfs-3.8.patch
new file mode 100644
index 000000000..10d9c8b47
--- /dev/null
+++ b/libre/cdfs-libre/cdfs-3.8.patch
@@ -0,0 +1,42 @@
+diff -upr cdfs-2.6.27.orig/daemon.c cdfs-2.6.27/daemon.c
+--- cdfs-2.6.27.orig/daemon.c	2009-12-21 16:02:50.000000000 +0200
++++ cdfs-2.6.27/daemon.c	2013-02-21 06:14:45.000000000 +0200
+@@ -158,7 +158,6 @@ int kcdfsd_thread(void *unused){
+   exit_files(current);  /* daemonize doesn't do exit_files */
+   daemonize();
+ #else
+-  daemonize("k"FSNAME"d");
+ 
+   /* Allow SIGTERM to quit properly when removing module */
+   /* By default with daemonize all signals are dropped */
+diff -upr cdfs-2.6.27.orig/root.c cdfs-2.6.27/root.c
+--- cdfs-2.6.27.orig/root.c	2009-12-21 15:38:31.000000000 +0200
++++ cdfs-2.6.27/root.c	2013-02-21 06:15:20.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include "cdfs.h"
+ 
+ #include <linux/module.h>
++#include <linux/kthread.h>
+ 
+ 
+ /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*
+@@ -643,14 +644,15 @@ static int __init cdfs_init(void) {
+   cdfs_proc_cd=NULL;
+ 
+   // start kernel thread
+-  if ((kcdfsd_pid = kernel_thread(kcdfsd_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND)) >0 ) {
+-    return 0;
+-  } else {
+-    printk(FSNAME" kernel_thread failed.\n");
++  kcdfsd_pid = kthread_run(kcdfsd_thread, NULL, "kcdfsd_thread");
++  if (IS_ERR(kcdfsd_pid)) {
++    printk(FSNAME" kthread_run failed.\n");
+     if (cdfs_proc_entry) remove_proc_entry(FSNAME, NULL);
+     unregister_filesystem(&cdfs_fs_type);
+     return -1;
+   }
++
++  return 0;
+ }
+ 
+ /******************************************************************/
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
index 3847b8b14..1e587cf72 100644
--- a/libre/cdfs-libre/cdfs.install
+++ b/libre/cdfs-libre/cdfs.install
@@ -1,14 +1,14 @@
 post_install() {
-  EXTRAMODULES='extramodules-3.7-LIBRE'
+  EXTRAMODULES='extramodules-3.8-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-  EXTRAMODULES='extramodules-3.7-LIBRE'
+  EXTRAMODULES='extramodules-3.8-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-3.7-LIBRE'
+  EXTRAMODULES='extramodules-3.8-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index 55e7e1df8..e9ca63637 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -7,10 +7,10 @@
 
 pkgname=cgminer-libre
 _pkgflag=libre
-pkgver=2.11.2
+pkgver=2.11.3
 _build=
 pkgrel=1
-pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, without nonfree OpenCL recommendations."
+pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer, with free OpenCL support."
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
@@ -52,6 +52,6 @@ package() {
   install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
 }
 
-md5sums=('f3deb2205ff53318dd65f9dfd26b99aa'
+md5sums=('fd2c69f943353fbc9723a5526d82c1b6'
          'fe4a243fabe24608f5c05e40f0f118f6'
          'bd76fc92fedce18c59ccea2aa79cc664')
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index f418684b5..2158c2892 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 166893 2012-09-20 23:56:51Z eric $
+# $Id: PKGBUILD 178747 2013-02-26 16:32:57Z tpowa $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: orelien <aurelien.foret@wanadoo.fr>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -6,8 +6,8 @@
 _pkgname=rp-pppoe
 pkgname=rp-pppoe-libre
 pkgver=3.11
-pkgrel=1
-pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed."
+pkgrel=2
+pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client (without nonfree ServPoET recommendation)"
 arch=('i686' 'x86_64')
 url="http://www.roaringpenguin.com/pppoe/"
 license=('GPL')
@@ -20,11 +20,12 @@ replaces=('rp-pppoe')
 conflicts=('rp-pppoe')
 install=rp-pppoe.install
 source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig}
-        adsl adsl.service $pkgname.patch)
+        adsl adsl.service kmode.patch $pkgname.patch)
 md5sums=('13b5900c56bd602df6cc526e5e520722'
          '8fc724aa146dba52ef7b3fbe5b8784c6'
          'adace1ad441aa88dcb3db52fb7f9c97f'
          'af234125f956f3a356ab0d0fcaa9e8a2'
+         'd38a903a247d689ff0323d7b6caa1c6b'
          '3c53d550ac408608abb0b6cd6b76b6c2')
 
 build() {
@@ -35,6 +36,9 @@ build() {
 
   cd ./src
 
+  ## Adding support kernel mode
+  patch -Np2 -i ../../kmode.patch
+
   ./configure --prefix=/usr --enable-plugin
   make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
diff --git a/libre/rp-pppoe-libre/kmode.patch b/libre/rp-pppoe-libre/kmode.patch
new file mode 100644
index 000000000..37eef58f7
--- /dev/null
+++ b/libre/rp-pppoe-libre/kmode.patch
@@ -0,0 +1,19 @@
+diff -up rp-pppoe-3.11/src/configure.orig rp-pppoe-3.11/src/configure
+--- rp-pppoe-3.11/src/configure.orig	2012-08-17 12:31:25.000000000 -0600
++++ rp-pppoe-3.11/src/configure	2013-02-11 14:23:05.000000000 -0700
+@@ -3679,6 +3679,7 @@ do :
+ #include<net/ethernet.h>
+ #include<linux/if.h>
+ #include<linux/in.h>
++#include<linux/in6.h>
+ 
+ "
+ if test "x$ac_cv_header_linux_if_pppox_h" = x""yes; then :
+@@ -4525,6 +4526,7 @@ else
+ #include <net/ethernet.h>
+ #include <linux/if.h>
+ #include <linux/in.h>
++#include <linux/in6.h>
+ #include <linux/if_pppox.h>
+ int main()
+ {
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index 66154fb0c..5b21529b4 100644
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 174912 2013-01-08 16:59:52Z heftig $
+# $Id: PKGBUILD 180163 2013-03-18 13:29:32Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Alexander Baldeck <alexander@archlinux.org>
 
@@ -6,7 +6,7 @@
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=19.0
+_debver=19.0.2
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -18,7 +18,7 @@ pkgrel=1
 pkgdesc="Mozilla Runtime Environment (built from Debian Iceweasel source code)"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libvpx' 'python2')
+depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
 makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
@@ -31,8 +31,8 @@ options=('!emptydirs')
 conflicts=('xulrunner')
 provides=("xulrunner=${_debver}")
 replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('b4c109e987f869f94220188a901d4425'
-         'e1d6920cb49c9de88b8e00eb14b1b0e7'
+md5sums=('ceda63e01012f9940542d862fd755a65'
+         '7fa6e0fb544d01516d3232f26023c570'
          '7f3317c25308a631ca31d8d280991bb4'
          '27271ce647a83906ef7a24605e840d61'
          '52e52f840a49eb1d14be1c0065b03a93'