[arch-commits] Commit in xf86-video-savage/trunk (PKGBUILD git_fixes.diff)
Andreas Radke
andyrtr at nymeria.archlinux.org
Sun Mar 31 08:08:57 UTC 2013
Date: Sunday, March 31, 2013 @ 10:08:57
Author: andyrtr
Revision: 181069
upgpkg: xf86-video-savage 2.3.6-4
add latest git commits; should fix FS#34527
Added:
xf86-video-savage/trunk/git_fixes.diff
Modified:
xf86-video-savage/trunk/PKGBUILD
----------------+
PKGBUILD | 9 +++++--
git_fixes.diff | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 70 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-03-31 08:04:39 UTC (rev 181068)
+++ PKGBUILD 2013-03-31 08:08:57 UTC (rev 181069)
@@ -3,7 +3,7 @@
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 @@
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
}
Added: git_fixes.diff
===================================================================
--- git_fixes.diff (rev 0)
+++ git_fixes.diff 2013-03-31 08:08:57 UTC (rev 181069)
@@ -0,0 +1,64 @@
+From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at 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 at 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 at 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 at 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
More information about the arch-commits
mailing list