[packages/xorg-driver-video-chips] - rel 4; fix build with xserver 1.14

arekm arekm at pld-linux.org
Tue Mar 12 09:37:56 CET 2013


commit f24974cbafe3ab00fc45d3375ec5b78a630de404
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Mar 12 09:37:54 2013 +0100

    - rel 4; fix build with xserver 1.14

 build.patch                  | 38 ++++++++++++++++++++++++++++++++++++++
 xorg-driver-video-chips.spec |  4 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-chips.spec b/xorg-driver-video-chips.spec
index 4f622fd..7d7dfa6 100644
--- a/xorg-driver-video-chips.spec
+++ b/xorg-driver-video-chips.spec
@@ -2,12 +2,13 @@ Summary:	X.org video driver for Chips and Technologies video processors
 Summary(pl.UTF-8):	Sterownik obrazu X.org do układów graficznych Chips and Technologies
 Name:		xorg-driver-video-chips
 Version:	1.2.5
-Release:	3
+Release:	4
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-chips-%{version}.tar.bz2
 # Source0-md5:	56be62612f98a0cf469a2a78c0a14ed5
 Patch0:		chips-git.patch
+Patch1:		build.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -52,6 +53,7 @@ Obsługiwane są układy z trzech klas architektur:
 %prep
 %setup -q -n xf86-video-chips-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..9961433
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,38 @@
+commit 151a1ec855a9ada44907cb6bef06a71e9080504b
+Author: Adam Jackson <ajax at redhat.com>
+Date:   Tue Sep 25 08:54:34 2012 -0400
+
+    Remove mibstore.h
+    
+    Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/ct_driver.c b/src/ct_driver.c
+index 6f3a5d4..effbc60 100644
+--- a/src/ct_driver.c
++++ b/src/ct_driver.c
+@@ -96,9 +96,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi banking wrapper need this */
+ #ifdef HAVE_ISA
+ #include "mibank.h"
+@@ -4145,7 +4142,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	    pBankInfo = NULL;
+ 	    return FALSE;
+ 	}
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* Initialise cursor functions */
+@@ -4296,7 +4292,6 @@ CHIPSScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	    }
+ 	}
+ 	
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ #ifdef ENABLE_SILKEN_MOUSE
+ 	xf86SetSilkenMouse(pScreen);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-chips.git/commitdiff/f24974cbafe3ab00fc45d3375ec5b78a630de404



More information about the pld-cvs-commit mailing list