Add patch to fix building against xorg-server-1.14, bug #461536.

(Portage version: 2.1.12.2/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 82 insertions, 1 deletions

diff --git a/x11-drivers/xf86-video-geode/ChangeLog b/x11-drivers/xf86-video-geode/ChangeLog
index 4abe0b132f97..397277ecc5f6 100644
--- a/x11-drivers/xf86-video-geode/ChangeLog
+++ b/x11-drivers/xf86-video-geode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-geode
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/ChangeLog,v 1.21 2013/03/04 02:10:04 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/ChangeLog,v 1.22 2013/07/03 08:19:54 chithanh Exp $
+
+*xf86-video-geode-2.11.14-r1 (03 Jul 2013)
+
+  03 Jul 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-geode-2.11.14-remove-mibstore_h.patch,
+  +xf86-video-geode-2.11.14-r1.ebuild:
+  Add patch to fix building against xorg-server-1.14, bug #461536.
 
   04 Mar 2013; Mart Raudsepp <leio@gentoo.org>
   -xf86-video-geode-2.11.12.ebuild, -xf86-video-geode-2.11.13.ebuild,
diff --git a/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.14-remove-mibstore_h.patch b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.14-remove-mibstore_h.patch
new file mode 100644
index 000000000000..b34ba9c76a75
--- /dev/null
+++ b/x11-drivers/xf86-video-geode/files/xf86-video-geode-2.11.14-remove-mibstore_h.patch
@@ -0,0 +1,46 @@
+From ed0b153f320a95a11bd561726d2405823573500e Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 10 Jan 2013 03:16:26 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+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 */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.14-r1.ebuild b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.14-r1.ebuild
new file mode 100644
index 000000000000..b93fe6c921ec
--- /dev/null
+++ b/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.14-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-geode/xf86-video-geode-2.11.14-r1.ebuild,v 1.1 2013/07/03 08:19:54 chithanh Exp $
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="AMD Geode GX2 and LX video driver"
+
+KEYWORDS="~x86"
+IUSE="ztv"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	ztv? (
+		sys-kernel/linux-headers
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable ztv)
+	)
+	xorg-2_pkg_setup
+}