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

arekm arekm at pld-linux.org
Tue Mar 12 09:53:23 CET 2013


commit c0e240c2e8cfd71ee221f4aa32d7ad47f23633fb
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Mar 12 09:53:20 2013 +0100

    - rel 4; fix build with xserver 1.14

 build.patch                | 41 +++++++++++++++++++++++++++++++++++++++++
 xorg-driver-video-tga.spec |  4 +++-
 2 files changed, 44 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-tga.spec b/xorg-driver-video-tga.spec
index 03c22eb..80bdf12 100644
--- a/xorg-driver-video-tga.spec
+++ b/xorg-driver-video-tga.spec
@@ -2,11 +2,12 @@ Summary:	X.org video driver for TGA (DEC 21030) video chips
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla układów graficznych TGA (DEC 21030)
 Name:		xorg-driver-video-tga
 Version:	1.2.2
-Release:	3
+Release:	4
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-tga-%{version}.tar.bz2
 # Source0-md5:	f77d66e86ed0485b204b17e734aa47df
+Patch0:		build.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -38,6 +39,7 @@ Sterownik obrazu X.org dla układów graficznych TGA (DEC 21030).
 
 %prep
 %setup -q -n xf86-video-tga-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..05dc06f
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,41 @@
+commit b7022db0559cd1b6cd3eb6b5abf6896a607b478d
+Author: Adam Jackson <ajax at redhat.com>
+Date:   Tue Sep 25 08:55:00 2012 -0400
+
+    Remove mibstore.h
+    
+    Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/tga_accel.c b/src/tga_accel.c
+index 35af1a4..b414df5 100644
+--- a/src/tga_accel.c
++++ b/src/tga_accel.c
+@@ -37,7 +37,6 @@
+ #include "xf86cmap.h"
+ #include "mipointer.h"
+ 
+-#include "mibstore.h"
+ #include "miline.h"
+ 
+ #include "tga_regs.h"
+diff --git a/src/tga_driver.c b/src/tga_driver.c
+index dd4f3e6..90d2660 100644
+--- a/src/tga_driver.c
++++ b/src/tga_driver.c
+@@ -46,8 +46,6 @@
+ 
+ /* software cursor */
+ #include "mipointer.h"
+-/* backing store */
+-#include "mibstore.h"
+ 
+ /*  #include "mibank.h" */
+ /* colormap manipulation */
+@@ -1451,7 +1449,6 @@ TGAScreenInit(SCREEN_INIT_ARGS_DECL)
+     
+     fbPictureInit (pScreen, 0, 0);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list