[packages/xorg-driver-video-geode] - fix building with xserver 1.14 - rel 2

baggins baggins at pld-linux.org
Sun Apr 7 22:14:02 CEST 2013


commit 9c5483a6456433ce4f52fae63a3dd1e51d2a7e81
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Apr 7 22:13:47 2013 +0200

    - fix building with xserver 1.14
    - rel 2

 mibstore.patch               | 52 ++++++++++++++++++++++++++++++++++++++++++++
 xorg-driver-video-geode.spec |  4 +++-
 2 files changed, 55 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-geode.spec b/xorg-driver-video-geode.spec
index a657146..8ba4b52 100644
--- a/xorg-driver-video-geode.spec
+++ b/xorg-driver-video-geode.spec
@@ -2,11 +2,12 @@ Summary:	X.org video driver for AMD Geode integrated graphics chipsets
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla zintegrowanych układów graficznych AMD Geode
 Name:		xorg-driver-video-geode
 Version:	2.11.14
-Release:	1
+Release:	2
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-geode-%{version}.tar.bz2
 # Source0-md5:	c9a4e1c5438240e5bdce332f92df9163
+Patch0:		mibstore.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -52,6 +53,7 @@ produkowanych przez firmy Cyrix i NSC. Układy:
 
 %prep
 %setup -q -n xf86-video-geode-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/mibstore.patch b/mibstore.patch
new file mode 100644
index 0000000..f6c4f25
--- /dev/null
+++ b/mibstore.patch
@@ -0,0 +1,52 @@
+From ed0b153f320a95a11bd561726d2405823573500e Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax at redhat.com>
+Date: Wed, 9 Jan 2013 22:16:26 -0500
+Subject: [PATCH] Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax at redhat.com>
+---
+ src/geode_driver.c | 2 --
+ src/gx_driver.c    | 1 -
+ src/lx_driver.c    | 1 -
+ 3 files changed, 4 deletions(-)
+
+diff --git a/src/geode_driver.c b/src/geode_driver.c
+index b27bfd5..9cd0af9 100644
+--- a/src/geode_driver.c
++++ b/src/geode_driver.c
+@@ -59,8 +59,6 @@
+ /* Machine independent stuff */
+ #include "mipointer.h"
+ #include "micmap.h"
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+ #include "vgaHW.h"
+ #include "vbe.h"
+ 
+diff --git a/src/gx_driver.c b/src/gx_driver.c
+index 5268f29..7f44e19 100644
+--- a/src/gx_driver.c
++++ b/src/gx_driver.c
+@@ -1350,7 +1350,6 @@ GXScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pGeode->NoAccel)
+         GXAccelInit(pScrn);
+ 
+-    miInitializeBackingStore(pScrn);
+     xf86SetBackingStore(pScrn);
+ 
+     /* Set up the soft cursor */
+diff --git a/src/lx_driver.c b/src/lx_driver.c
+index 6d7f37f..146578e 100644
+--- a/src/lx_driver.c
++++ b/src/lx_driver.c
+@@ -932,7 +932,6 @@ LXScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pGeode->NoAccel)
+         pGeode->NoAccel = LXExaInit(pScrn) ? FALSE : TRUE;
+ 
+-    miInitializeBackingStore(pScrn);
+     xf86SetBackingStore(pScrn);
+ 
+     /* Set up the soft cursor */
+-- 
+1.8.0.2
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-geode.git/commitdiff/9c5483a6456433ce4f52fae63a3dd1e51d2a7e81



More information about the pld-cvs-commit mailing list