Fix building against xorg-server-1.14

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

4 files changed, 59 insertions, 21 deletions

diff --git a/x11-drivers/xf86-video-i740/ChangeLog b/x11-drivers/xf86-video-i740/ChangeLog
index 88b8f87204b6..a77985755bfa 100644
--- a/x11-drivers/xf86-video-i740/ChangeLog
+++ b/x11-drivers/xf86-video-i740/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-i740
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/ChangeLog,v 1.42 2012/12/28 11:15:52 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/ChangeLog,v 1.43 2013/03/12 16:36:17 chithanh Exp $
+
+*xf86-video-i740-1.3.4-r1 (12 Mar 2013)
+
+  12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-i740-1.3.4-remove-mibstore_h.patch,
+  +xf86-video-i740-1.3.4-r1.ebuild, -xf86-video-i740-1.3.2.ebuild:
+  Fix building against xorg-server-1.14
 
   28 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-i740-1.3.4.ebuild:
   Stable for ia64, wrt bug #440872
diff --git a/x11-drivers/xf86-video-i740/files/xf86-video-i740-1.3.4-remove-mibstore_h.patch b/x11-drivers/xf86-video-i740/files/xf86-video-i740-1.3.4-remove-mibstore_h.patch
new file mode 100644
index 000000000000..a33dc7e3db67
--- /dev/null
+++ b/x11-drivers/xf86-video-i740/files/xf86-video-i740-1.3.4-remove-mibstore_h.patch
@@ -0,0 +1,32 @@
+From 084aa23643bf4245c917e3d672576bc9e5717017 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 10 Jan 2013 03:21:52 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/i740_driver.c b/src/i740_driver.c
+index 1c82198..7c1051d 100644
+--- a/src/i740_driver.c
++++ b/src/i740_driver.c
+@@ -63,10 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -1558,7 +1554,6 @@ I740ScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild
deleted file mode 100644
index 1be87c75b439..000000000000
--- a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.2.ebuild,v 1.4 2009/12/15 15:35:45 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="Intel i740 video driver"
-KEYWORDS="amd64 ia64 x86 ~x86-fbsd"
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4-r1.ebuild b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4-r1.ebuild
new file mode 100644
index 000000000000..9ec774b61fe6
--- /dev/null
+++ b/x11-drivers/xf86-video-i740/xf86-video-i740-1.3.4-r1.ebuild
@@ -0,0 +1,18 @@
+# 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-i740/xf86-video-i740-1.3.4-r1.ebuild,v 1.1 2013/03/12 16:36:17 chithanh Exp $
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Intel i740 video driver"
+
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)