From c623429f33c434cb1cb11974d9e71f48dd5a881f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 1 Apr 2013 00:05:25 -0700
Subject: Mon Apr  1 00:05:25 PDT 2013

---
 extra/xf86-video-savage/PKGBUILD       | 11 +++---
 extra/xf86-video-savage/git_fixes.diff | 64 ++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100644 extra/xf86-video-savage/git_fixes.diff

(limited to 'extra/xf86-video-savage')

diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD
index d31735366..d5f9a2eea 100644
--- a/extra/xf86-video-savage/PKGBUILD
+++ b/extra/xf86-video-savage/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 180213 2013-03-18 16:09:19Z andyrtr $
+# $Id: PKGBUILD 181070 2013-03-31 08:09:15Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-savage
 pkgver=2.3.6
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org savage video driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
@@ -14,11 +14,14 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
 optdepends=('savage-dri: DRI1 support from community repo')
 options=(!libtool)
 groups=('xorg-drivers' 'xorg')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
+        git_fixes.diff)
+sha256sums=('48813ed8f4a08858e8c2466fd2dc810ea31f86842025fa39ec949d44f9ad63d6'
+            'b415bab5bbad890365c649fe3daa47db23428e92b4a4d8e5aa685e9d78de668d')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/git_fixes.diff
   ./configure --prefix=/usr
   make
 }
diff --git a/extra/xf86-video-savage/git_fixes.diff b/extra/xf86-video-savage/git_fixes.diff
new file mode 100644
index 000000000..8d5ef49b0
--- /dev/null
+++ b/extra/xf86-video-savage/git_fixes.diff
@@ -0,0 +1,64 @@
+From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@gmail.com>
+Date: Wed, 18 Jul 2012 08:52:38 +0000
+Subject: savage: move compat-api.h down to proper place.
+
+This screws up when DRI isn't enabled.
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/savage_driver.h b/src/savage_driver.h
+index b604292..ec4b1ea 100644
+--- a/src/savage_driver.h
++++ b/src/savage_driver.h
+@@ -85,8 +85,6 @@
+ #include "GL/glxint.h"
+ #include "xf86drm.h"
+ 
+-#include "compat-api.h"
+-
+ /* Totals 2 Mbytes which equals 2^16 32-byte vertices divided among up
+  * to 32 clients. */
+ #define SAVAGE_NUM_BUFFERS 32
+@@ -153,6 +151,8 @@ typedef struct _server{
+ 
+ #endif
+ 
++#include "compat-api.h"
++
+ typedef enum {
+     MT_NONE,
+     MT_CRT,
+--
+cgit v0.9.0.2-2-gbebe
+From ca9718a887ecbc59b76869af673791ab591b849b Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied@gmail.com>
+Date: Sat, 22 Dec 2012 10:00:00 +0000
+Subject: savage: fix default accel arch when built with no XAA
+
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+diff --git a/src/savage_driver.c b/src/savage_driver.c
+index 026bf5c..5b49e60 100644
+--- a/src/savage_driver.c
++++ b/src/savage_driver.c
+@@ -1267,6 +1267,7 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
+         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 pScrn, int flags)
+ 	       from = X_CONFIG;
+ 	       psav->useEXA = TRUE;
+ 	    }
++#else
++	    psav->useEXA = TRUE;
++#endif
+        }
+        xf86DrvMsg(pScrn->scrnIndex, from, "Using %s acceleration architecture\n",
+ 		psav->useEXA ? "EXA" : "XAA");
+--
+cgit v0.9.0.2-2-gbebe
-- 
cgit v1.2.3-54-g00ecf