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

arekm arekm at pld-linux.org
Tue Mar 12 09:33:41 CET 2013


commit d07eb1e3580b6c7350d88801bc10ec46a146c19e
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Tue Mar 12 09:33:39 2013 +0100

    - rel 4; fix build with xserver 1.14

 build.patch                | 22 ++++++++++++++++++++++
 xorg-driver-video-apm.spec |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-apm.spec b/xorg-driver-video-apm.spec
index 1411989..75818fd 100644
--- a/xorg-driver-video-apm.spec
+++ b/xorg-driver-video-apm.spec
@@ -2,11 +2,12 @@ Summary:	X.org video driver for Alliance ProMotion video adapters
 Summary(pl.UTF-8):	Sterownik obrazu X.org do kart graficznych Alliance ProMotion
 Name:		xorg-driver-video-apm
 Version:	1.2.5
-Release:	3
+Release:	4
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-apm-%{version}.tar.bz2
 # Source0-md5:	bce02d48c66932d082786167af22835a
+Patch0:		build.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -41,6 +42,7 @@ Obsługuje karty PCI i ISA oparte na następujących układach: ProMotion
 
 %prep
 %setup -q -n xf86-video-apm-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..eb97b82
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,22 @@
+commit 9f67408e4f078e907fbf4feb45cfdcfd0cdebcca
+Author: Adam Jackson <ajax at redhat.com>
+Date:   Wed Jan 9 22:03:29 2013 -0500
+
+    Remove #include "mibstore.h"
+    
+    Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/apm.h b/src/apm.h
+index a3c06f8..365e5e2 100644
+--- a/src/apm.h
++++ b/src/apm.h
+@@ -33,9 +33,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* I2C support */
+ #include "xf86i2c.h"
+ 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list