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

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


commit eb2b0bb086cd4a0ea4a7230ce62769e7746cae6b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Mar 12 09:56:08 2013 +0100

    - rel 4; fix build with xserver 1.14

 build.patch                 | 30 ++++++++++++++++++++++++++++++
 xorg-driver-video-vesa.spec |  4 +++-
 2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-vesa.spec b/xorg-driver-video-vesa.spec
index 85aaeed..3b7bf65 100644
--- a/xorg-driver-video-vesa.spec
+++ b/xorg-driver-video-vesa.spec
@@ -2,12 +2,13 @@ Summary:	X.org video driver for generic VESA video cards
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla kart graficznych zgodnych z VESA
 Name:		xorg-driver-video-vesa
 Version:	2.3.2
-Release:	3
+Release:	4
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-%{version}.tar.bz2
 # Source0-md5:	3eddd393fba79550e012d717499d58ad
 Patch0:		%{name}-xf86gtfmode.patch
+Patch1:		build.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -37,6 +38,7 @@ VESA.
 %prep
 %setup -q -n xf86-video-vesa-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..b8854e1
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,30 @@
+commit 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc
+Author: Adam Jackson <ajax at redhat.com>
+Date:   Tue Sep 25 08:55:03 2012 -0400
+
+    Remove mibstore.h
+    
+    Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/vesa.c b/src/vesa.c
+index 11cd26c..b73d104 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -49,9 +49,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* Colormap handling */
+ #include "micmap.h"
+ #include "xf86cmap.h"
+@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
+     VESADGAInit(pScrn, pScreen);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* software cursor */
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list