Fix building against xorg-server-1.14, bug #460754.

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

3 files changed, 45 insertions, 5 deletions

diff --git a/x11-drivers/xf86-video-fbdev/ChangeLog b/x11-drivers/xf86-video-fbdev/ChangeLog
index dc66062c19a1..5da653f88b65 100644
--- a/x11-drivers/xf86-video-fbdev/ChangeLog
+++ b/x11-drivers/xf86-video-fbdev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-fbdev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/ChangeLog,v 1.85 2013/01/04 17:55:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/ChangeLog,v 1.86 2013/03/08 20:56:46 chithanh Exp $
+
+*xf86-video-fbdev-0.4.3-r1 (08 Mar 2013)
+
+  08 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-fbdev-0.4.3-remove-mibstore_h.patch,
+  +xf86-video-fbdev-0.4.3-r1.ebuild, -xf86-video-fbdev-0.4.2.ebuild:
+  Fix building against xorg-server-1.14, bug #460754.
 
   04 Jan 2013; Jeroen Roovers <jer@gentoo.org> xf86-video-fbdev-0.4.3.ebuild:
   Stable for HPPA (bug #440872).
diff --git a/x11-drivers/xf86-video-fbdev/files/xf86-video-fbdev-0.4.3-remove-mibstore_h.patch b/x11-drivers/xf86-video-fbdev/files/xf86-video-fbdev-0.4.3-remove-mibstore_h.patch
new file mode 100644
index 000000000000..138d5bc2a168
--- /dev/null
+++ b/x11-drivers/xf86-video-fbdev/files/xf86-video-fbdev-0.4.3-remove-mibstore_h.patch
@@ -0,0 +1,29 @@
+From ac293412a01d87f87eb61f4adb9db7486a75d3fc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:37 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/fbdev.c b/src/fbdev.c
+index cd7ebc5..f5a7378 100644
+--- a/src/fbdev.c
++++ b/src/fbdev.c
+@@ -14,7 +14,6 @@
+ #include "xf86_OSproc.h"
+ 
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "colormapst.h"
+ #include "xf86cmap.h"
+@@ -845,7 +844,6 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
+ 	}
+ 
+ 	xf86SetBlackWhitePixels(pScreen);
+-	miInitializeBackingStore(pScreen);
+ 	xf86SetBackingStore(pScreen);
+ 
+ 	/* software cursor */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.2.ebuild b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3-r1.ebuild
index 0ee95c8c4c2b..ca03c4f15b90 100644
--- a/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.2.ebuild
+++ b/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-fbdev/xf86-video-fbdev-0.4.2.ebuild,v 1.10 2012/05/16 00:47:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-fbdev/xf86-video-fbdev-0.4.3-r1.ebuild,v 1.1 2013/03/08 20:56:46 chithanh Exp $
 
-EAPI=3
+EAPI=5
 inherit xorg-2
 
 DESCRIPTION="video driver for framebuffer device"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND="x11-base/xorg-server"
@@ -17,3 +17,7 @@ DEPEND="${RDEPEND}
 	x11-proto/renderproto
 	x11-proto/videoproto
 	x11-proto/xproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)