From 6cd62c862d11feeb72d0ae7dd1cf1f48ffd54f21 Mon Sep 17 00:00:00 2001
From: Matt Housh <jaeger@crux.nu>
Date: Thu, 12 Feb 2015 17:57:15 -0600
Subject: [PATCH] xorg-xf86-video-mga: build fix for ValidateTree hook removal

---
 xorg-xf86-video-mga/.md5sum                   |  1 +
 xorg-xf86-video-mga/Pkgfile                   |  7 ++++--
 xorg-xf86-video-mga/remove-validatetree.patch | 24 +++++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)
 create mode 100644 xorg-xf86-video-mga/remove-validatetree.patch

diff --git a/xorg-xf86-video-mga/.md5sum b/xorg-xf86-video-mga/.md5sum
index 256059d5..3819c0a2 100644
--- a/xorg-xf86-video-mga/.md5sum
+++ b/xorg-xf86-video-mga/.md5sum
@@ -1 +1,2 @@
+f30276648ff697e8e7275443d9226d5b  remove-validatetree.patch
 a53b5ce166e31c181aaa4c3816d8babb  xf86-video-mga-1.6.3.tar.bz2
diff --git a/xorg-xf86-video-mga/Pkgfile b/xorg-xf86-video-mga/Pkgfile
index e734280b..bbcd01e5 100644
--- a/xorg-xf86-video-mga/Pkgfile
+++ b/xorg-xf86-video-mga/Pkgfile
@@ -5,12 +5,15 @@
 
 name=xorg-xf86-video-mga
 version=1.6.3
-release=1
-source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-$version.tar.bz2)
+release=2
+source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-video-mga-$version.tar.bz2 \
+	remove-validatetree.patch)
 
 build() {
 	cd xf86-video-mga-$version
 
+	patch -p1 -i $SRC/remove-validatetree.patch
+
 	./configure --prefix=/usr --mandir=/usr/man
 
 	make
diff --git a/xorg-xf86-video-mga/remove-validatetree.patch b/xorg-xf86-video-mga/remove-validatetree.patch
new file mode 100644
index 00000000..13a48fb5
--- /dev/null
+++ b/xorg-xf86-video-mga/remove-validatetree.patch
@@ -0,0 +1,24 @@
+From cf46b1017a2663c59f07abd417573b9580f0145f Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 29 Jul 2014 09:14:15 -0400
+Subject: dri: Stop (uselessly) initializing the ValidateTree hooks
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/mga_dri.c b/src/mga_dri.c
+index a1c39f3..b957028 100644
+--- a/src/mga_dri.c
++++ b/src/mga_dri.c
+@@ -1165,9 +1165,6 @@ Bool MGADRIScreenInit( ScreenPtr pScreen )
+    pDRIInfo->frameBufferStride = pScrn->displayWidth*(pScrn->bitsPerPixel/8);
+    pDRIInfo->ddxDrawableTableEntry = MGA_MAX_DRAWABLES;
+ 
+-   pDRIInfo->wrap.ValidateTree = NULL;
+-   pDRIInfo->wrap.PostValidateTree = NULL;
+-
+    pDRIInfo->createDummyCtx = TRUE;
+    pDRIInfo->createDummyCtxPriv = FALSE;
+ 
+-- 
+cgit v0.10.2
+