From 488fb494e58fb94e6c49c95b4cb743e4e43c6d48 Mon Sep 17 00:00:00 2001
From: Fredrik Rinnestam <fredrik@crux.nu>
Date: Sat, 9 Mar 2013 15:37:47 +0100
Subject: [PATCH] xorg-xf86-video-neomagic: buildfix for xorg-xserver 1.14

---
 xorg-xf86-video-neomagic/.md5sum        |  1 +
 xorg-xf86-video-neomagic/Pkgfile        |  6 +++---
 xorg-xf86-video-neomagic/mibstore.patch | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 xorg-xf86-video-neomagic/mibstore.patch

diff --git a/xorg-xf86-video-neomagic/.md5sum b/xorg-xf86-video-neomagic/.md5sum
index 1fedc215..d842a048 100644
--- a/xorg-xf86-video-neomagic/.md5sum
+++ b/xorg-xf86-video-neomagic/.md5sum
@@ -1 +1,2 @@
+6c706db5072435eb285cbfb9b627c773  mibstore.patch
 ba25b6347b375eb3e9bd62066dc6c61f  xf86-video-neomagic-1.2.7.tar.bz2
diff --git a/xorg-xf86-video-neomagic/Pkgfile b/xorg-xf86-video-neomagic/Pkgfile
index fcd6a611..8f75b8ac 100644
--- a/xorg-xf86-video-neomagic/Pkgfile
+++ b/xorg-xf86-video-neomagic/Pkgfile
@@ -5,12 +5,12 @@
 
 name=xorg-xf86-video-neomagic
 version=1.2.7
-release=1
-source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-$version.tar.bz2)
+release=2
+source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-$version.tar.bz2 mibstore.patch)
 
 build() {
 	cd xf86-video-neomagic-$version
-
+	patch -p1 -i $SRC/mibstore.patch
 	./configure --prefix=/usr --mandir=/usr/man
 
 	make
diff --git a/xorg-xf86-video-neomagic/mibstore.patch b/xorg-xf86-video-neomagic/mibstore.patch
new file mode 100644
index 00000000..7958eb48
--- /dev/null
+++ b/xorg-xf86-video-neomagic/mibstore.patch
@@ -0,0 +1,21 @@
+diff -rupN xf86-video-neomagic-1.2.7-orig/src/neo_driver.c xf86-video-neomagic-1.2.7/src/neo_driver.c
+--- xf86-video-neomagic-1.2.7-orig/src/neo_driver.c	2013-03-09 15:20:14.305048833 +0100
++++ xf86-video-neomagic-1.2.7/src/neo_driver.c	2013-03-09 15:20:51.305314188 +0100
+@@ -72,9 +72,6 @@ CONNECTION WITH THE USE OR PERFORMANCE O
+ /* 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"
+ 
+@@ -1621,7 +1618,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
+                    "Acceleration %s Initialized\n",ret ? "" : "not");
+     } 
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+