Fix building against xorg-server-1.14

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

5 files changed, 50 insertions, 37 deletions

diff --git a/x11-drivers/xf86-video-glint/ChangeLog b/x11-drivers/xf86-video-glint/ChangeLog
index 3c3610f637da..101bebec1a76 100644
--- a/x11-drivers/xf86-video-glint/ChangeLog
+++ b/x11-drivers/xf86-video-glint/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-glint
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/ChangeLog,v 1.69 2012/12/30 14:47:39 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/ChangeLog,v 1.70 2013/03/12 16:35:47 chithanh Exp $
+
+*xf86-video-glint-1.2.8-r1 (12 Mar 2013)
+
+  12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-glint-1.2.8-remove-mibstore_h.patch,
+  +xf86-video-glint-1.2.8-r1.ebuild, -xf86-video-glint-1.2.5.ebuild,
+  -xf86-video-glint-1.2.6.ebuild, xf86-video-glint-1.2.8.ebuild:
+  Fix building against xorg-server-1.14
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-glint-1.2.8.ebuild:
   Stable for alpha, wrt bug #440872
diff --git a/x11-drivers/xf86-video-glint/files/xf86-video-glint-1.2.8-remove-mibstore_h.patch b/x11-drivers/xf86-video-glint/files/xf86-video-glint-1.2.8-remove-mibstore_h.patch
new file mode 100644
index 000000000000..6bc5738c8023
--- /dev/null
+++ b/x11-drivers/xf86-video-glint/files/xf86-video-glint-1.2.8-remove-mibstore_h.patch
@@ -0,0 +1,30 @@
+From 073d5b0b392781bf4a6aa7f9e2dbe2ae51caed2c Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:38 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/glint_driver.c b/src/glint_driver.c
+index b6d20a9..aa78516 100644
+--- a/src/glint_driver.c
++++ b/src/glint_driver.c
+@@ -52,8 +52,6 @@
+ #include "compiler.h"
+ #include "mipointer.h"
+ 
+-#include "mibstore.h"
+-
+ #include "pm3_regs.h"
+ #include "glint_regs.h"
+ #include "IBM.h"
+@@ -2904,7 +2902,6 @@ GLINTScreenInit(SCREEN_INIT_ARGS_DECL)
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild
deleted file mode 100644
index 7cee2f418f93..000000000000
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.5.ebuild,v 1.5 2011/02/14 23:56:23 xarthisius Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="GLINT/Permedia video driver"
-
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE="dri"
-
-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/xf86dgaproto
-	x11-proto/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2
-			x11-proto/glproto )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.6.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8-r1.ebuild
index 4f9002375527..40c24def376d 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.6.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8-r1.ebuild
@@ -1,14 +1,14 @@
-# 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-glint/xf86-video-glint-1.2.6.ebuild,v 1.5 2012/02/19 15:00:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8-r1.ebuild,v 1.1 2013/03/12 16:35:47 chithanh Exp $
 
-EAPI=4
+EAPI=5
 
 inherit xorg-2
 
 DESCRIPTION="GLINT/Permedia video driver"
 
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
@@ -17,3 +17,7 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xf86dgaproto
 	x11-proto/xproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
diff --git a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild
index 7b562bffcfad..a9062572c0e3 100644
--- a/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild
+++ b/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild
@@ -1,6 +1,6 @@
-# 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-glint/xf86-video-glint-1.2.8.ebuild,v 1.7 2012/12/30 14:47:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-glint/xf86-video-glint-1.2.8.ebuild,v 1.8 2013/03/12 16:35:47 chithanh Exp $
 
 EAPI=4