From 04f292e53321c1d559f8d2fcf7a0288192c99812 Mon Sep 17 00:00:00 2001
From: Fabian <inkane@chakra-project.org>
Date: Fri, 6 Dec 2013 23:01:53 +0000
Subject: [PATCH] xorg update: rebuild xf86-video-tseng, added patch from Arch

---
 xf86-video-tseng/PKGBUILD        | 14 ++++++++++----
 xf86-video-tseng/git-fixes.patch | 31 +++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 xf86-video-tseng/git-fixes.patch

diff --git a/xf86-video-tseng/PKGBUILD b/xf86-video-tseng/PKGBUILD
index 1e70b7701..6b391869d 100644
--- a/xf86-video-tseng/PKGBUILD
+++ b/xf86-video-tseng/PKGBUILD
@@ -5,18 +5,24 @@
 
 pkgname=xf86-video-tseng
 pkgver=1.2.5
-pkgrel=1
+pkgrel=2
 pkgdesc="X.org tseng video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('xorg-server')
+makedepends=('xorg-server' 'xf86driproto' 'resourceproto' 'scrnsaverproto')
 conflicts=('xorg-server<1.12.3')
 groups=('xorg-video-drivers')
 options=('!libtool')
-source=("${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('95c35b28a19ab486f0bb7482df944d5b0076bdd5')
+source=("${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2" "git-fixes.patch")
+sha1sums=('95c35b28a19ab486f0bb7482df944d5b0076bdd5'
+          '4f3ef57903fe3c00edce0b56acdfc794a29256c0')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 < ${srcdir}/git-fixes.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/xf86-video-tseng/git-fixes.patch b/xf86-video-tseng/git-fixes.patch
new file mode 100644
index 000000000..88f9cc570
--- /dev/null
+++ b/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