[xorg-x11-drv-mach64] mach64-6.9.3-shadowfb.patch: Allow Render even when doing ShadowFB.

[Adam Jackson]

commit 068b5b8db8722a0831eae116090b06bc248e553b
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Oct 2 10:26:01 2012 -0400

    mach64-6.9.3-shadowfb.patch: Allow Render even when doing ShadowFB.
    
    - Disable EXA as well, it's completely broken.
    - mach64-6.9.3-fix-no-exa-build.patch: Fix building with neither XAA nor EXA.

 mach64-6.9.3-fix-no-exa-build.patch |   11 +++++++++++
 xorg-x11-drv-mach64.spec            |    5 ++++-
 2 files changed, 15 insertions(+), 1 deletions(-)
---
diff --git a/mach64-6.9.3-fix-no-exa-build.patch b/mach64-6.9.3-fix-no-exa-build.patch
new file mode 100644
index 0000000..eb438de
--- /dev/null
+++ b/mach64-6.9.3-fix-no-exa-build.patch
@@ -0,0 +1,11 @@
+diff -up xf86-video-mach64-6.9.3/src/atistruct.h.jx xf86-video-mach64-6.9.3/src/atistruct.h
+--- xf86-video-mach64-6.9.3/src/atistruct.h.jx	2012-06-06 05:36:01.000000000 -0400
++++ xf86-video-mach64-6.9.3/src/atistruct.h	2012-10-02 10:16:50.004367815 -0400
+@@ -51,6 +51,7 @@
+ 
+ #endif /* TV_OUT */
+ 
++#include "picturestr.h"
+ #ifdef USE_EXA
+ #include "exa.h"
+ #endif
diff --git a/xorg-x11-drv-mach64.spec b/xorg-x11-drv-mach64.spec
index 6d037f8..78f836a 100644
--- a/xorg-x11-drv-mach64.spec
+++ b/xorg-x11-drv-mach64.spec
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 mach64 video driver
 Name:	    xorg-x11-drv-mach64
 Version:    6.9.3
-Release:    5%{?dist}
+Release:    6%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -15,6 +15,7 @@ Source0:    http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Patch0:	    mach64-6.8.1-defaultdepth.patch
 Patch1:     0001-mach64-fix-build-on-32-bit.patch
 Patch2:	    mach64-6.9.3-shadowfb.patch
+Patch3:	    mach64-6.9.3-fix-no-exa-build.patch
 
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
@@ -35,6 +36,7 @@ X.Org X11 mach64 video driver.
 %patch0 -p1 -b .defaultdepth
 %patch1 -p1 -b .fix32
 %patch2 -p1 -b .shadowfb
+%patch3 -p1 -b .ftbfs
 
 %build
 # aclocal ; automake -a ; autoconf
@@ -61,6 +63,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Oct 01 2012 Adam Jackson <ajax at redhat.com> 6.9.3-5
 - mach64-6.9.3-shadowfb.patch: Allow Render even when doing ShadowFB.
 - Disable EXA as well, it's completely broken.
+- mach64-6.9.3-fix-no-exa-build.patch: Fix building with neither XAA nor EXA.
 
 * Wed Sep 26 2012 Adam Jackson <ajax at redhat.com> 6.9.3-4
 - Disable DRI support, we've never built the 3D driver and it's been nuked