[packages/xorg-driver-video-neomagic] - rel 4; fix build with xserver 1.14
arekm
arekm at pld-linux.org
Tue Mar 12 09:42:17 CET 2013
commit dff88c45681eec8275c4789474ae7f9779afa3bb
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Mar 12 09:42:15 2013 +0100
- rel 4; fix build with xserver 1.14
build.patch | 30 ++++++++++++++++++++++++++++++
xorg-driver-video-neomagic.spec | 4 +++-
2 files changed, 33 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-neomagic.spec b/xorg-driver-video-neomagic.spec
index 7fc9d57..3b76360 100644
--- a/xorg-driver-video-neomagic.spec
+++ b/xorg-driver-video-neomagic.spec
@@ -2,11 +2,12 @@ Summary: X.org video driver for Neomagic graphics chipsets
Summary(pl.UTF-8): Sterownik obrazu X.org dla układów graficznych Neomagic
Name: xorg-driver-video-neomagic
Version: 1.2.7
-Release: 3
+Release: 4
License: MIT
Group: X11/Applications
Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-%{version}.tar.bz2
# Source0-md5: ba25b6347b375eb3e9bd62066dc6c61f
+Patch0: build.patch
URL: http://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -58,6 +59,7 @@ znaleźć w wielu laptopach. Obsługuje następujące układy:
%prep
%setup -q -n xf86-video-neomagic-%{version}
+%patch0 -p1
%build
%{__libtoolize}
diff --git a/build.patch b/build.patch
new file mode 100644
index 0000000..3c7d19a
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,30 @@
+commit 005d61313e989bf054b1cc2190f1c743362d86ff
+Author: Adam Jackson <ajax at redhat.com>
+Date: Tue Sep 25 08:54:44 2012 -0400
+
+ Remove mibstore.h
+
+ Signed-off-by: Adam Jackson <ajax at redhat.com>
+
+diff --git a/src/neo_driver.c b/src/neo_driver.c
+index ce89ce0..a17b925 100644
+--- a/src/neo_driver.c
++++ b/src/neo_driver.c
+@@ -69,9 +69,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ /* 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 colormap manipulation need this */
+ #include "micmap.h"
+
+@@ -1618,7 +1615,6 @@ NEOScreenInit(SCREEN_INIT_ARGS_DECL)
+ "Acceleration %s Initialized\n",ret ? "" : "not");
+ }
+
+- miInitializeBackingStore(pScreen);
+ xf86SetBackingStore(pScreen);
+ xf86SetSilkenMouse(pScreen);
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-neomagic.git/commitdiff/dff88c45681eec8275c4789474ae7f9779afa3bb
More information about the pld-cvs-commit
mailing list