[xorg-x11-drv-savage/f18] fix default accel picking when we have no XAA

[Dave Airlie]

commit 675f5bfb06b17d1f1c16eb2d0d646ac6172f7eaa
Author: Dave Airlie <airlied at gmail.com>
Date:   Sat Dec 22 19:45:33 2012 +1000

    fix default accel picking when we have no XAA

 fix-no-xaa.patch         |   21 +++++++++++++++++++++
 xorg-x11-drv-savage.spec |    7 ++++++-
 2 files changed, 27 insertions(+), 1 deletions(-)
---
diff --git a/fix-no-xaa.patch b/fix-no-xaa.patch
new file mode 100644
index 0000000..3906dbc
--- /dev/null
+++ b/fix-no-xaa.patch
@@ -0,0 +1,21 @@
+diff -up xf86-video-savage-2.3.6/src/savage_driver.c.da xf86-video-savage-2.3.6/src/savage_driver.c
+--- xf86-video-savage-2.3.6/src/savage_driver.c.da	2012-12-22 19:43:44.097464896 +1000
++++ xf86-video-savage-2.3.6/src/savage_driver.c	2012-12-22 19:43:55.413745990 +1000
+@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pS
+         from = X_DEFAULT;
+ 	char *strptr;
+         if((strptr = (char *)xf86GetOptValString(psav->Options, OPTION_ACCELMETHOD))) {
++#ifdef HAVE_XAA_H
+ 	    if(!xf86NameCmp(strptr,"XAA")) {
+ 	        from = X_CONFIG;
+ 	        psav->useEXA = FALSE;
+@@ -1274,6 +1275,9 @@ static Bool SavagePreInit(ScrnInfoPtr pS
+ 	       from = X_CONFIG;
+ 	       psav->useEXA = TRUE;
+ 	    }
++#else
++	    psav->useEXA = TRUE;
++#endif
+        }
+        xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
+ 		psav->useEXA ? "EXA" : "XAA");
diff --git a/xorg-x11-drv-savage.spec b/xorg-x11-drv-savage.spec
index 4d6dcf9..0f09a7f 100644
--- a/xorg-x11-drv-savage.spec
+++ b/xorg-x11-drv-savage.spec
@@ -5,13 +5,14 @@
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
 Version:   2.3.6
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Patch0: 0001-savage-move-compat-api.h-down-to-proper-place.patch
+Patch1: fix-no-xaa.patch
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
 BuildRequires: xorg-x11-server-devel >= 1.10.99.902
@@ -27,6 +28,7 @@ X.Org X11 savage video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch0 -p1 -b .fixcompat
+%patch1 -p1 -b .fixexa
 
 %build
 %configure --disable-static --disable-dri
@@ -50,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/savage.4*
 
 %changelog
+* Sat Dec 22 2012 Dave Airlie <airlied at redhat.com> 2.3.6-4
+- fix default accel picking when we have no XAA
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild