[xorg-x11-drv-savage] fix build for no dri

Dave Airlie airlied at fedoraproject.org
Wed Jul 18 08:59:17 UTC 2012


commit e7c86a00a55ceb826bf60d620479cc2d47ec6178
Author: Dave Airlie <airlied at redhat.com>
Date:   Wed Jul 18 05:05:39 2012 -0400

    fix build for no dri

 ...ge-move-compat-api.h-down-to-proper-place.patch |   37 ++++++++++++++++++++
 xorg-x11-drv-savage.spec                           |    8 +++-
 2 files changed, 43 insertions(+), 2 deletions(-)
---
diff --git a/0001-savage-move-compat-api.h-down-to-proper-place.patch b/0001-savage-move-compat-api.h-down-to-proper-place.patch
new file mode 100644
index 0000000..2e2d508
--- /dev/null
+++ b/0001-savage-move-compat-api.h-down-to-proper-place.patch
@@ -0,0 +1,37 @@
+From 3d181030a6ba2205a57ef4665e53aed0251ccaa6 Mon Sep 17 00:00:00 2001
+From: Dave Airlie <airlied at gmail.com>
+Date: Wed, 18 Jul 2012 18:52:38 +1000
+Subject: [PATCH] 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>
+---
+ src/savage_driver.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+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,
+-- 
+1.7.10.4
+
diff --git a/xorg-x11-drv-savage.spec b/xorg-x11-drv-savage.spec
index b1e4350..c709e46 100644
--- a/xorg-x11-drv-savage.spec
+++ b/xorg-x11-drv-savage.spec
@@ -5,13 +5,13 @@
 Summary:   Xorg X11 savage video driver
 Name:      xorg-x11-drv-savage
 Version:   2.3.6
-Release:   1%{?dist}
+Release:   2%{?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
 ExcludeArch: s390 s390x %{?rhel:ppc ppc64}
 
 BuildRequires: xorg-x11-server-devel >= 1.10.99.902
@@ -26,6 +26,7 @@ X.Org X11 savage video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b -z .fixcompat
 
 %build
 %configure --disable-static --disable-dri
@@ -49,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/savage.4*
 
 %changelog
+* Wed Jul 18 2012 Dave Airlie <airlied at redhat.com> 2.3.6-2
+- fix build for no dri
+
 * Wed Jul 18 2012 Dave Airlie <airlied at redhat.com> 2.3.6-1
 - savage 2.3.6
 


More information about the scm-commits mailing list