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

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

8 files changed, 54 insertions, 126 deletions

diff --git a/x11-drivers/xf86-video-vesa/ChangeLog b/x11-drivers/xf86-video-vesa/ChangeLog
index 99899fc89215..ec70bd26f160 100644
--- a/x11-drivers/xf86-video-vesa/ChangeLog
+++ b/x11-drivers/xf86-video-vesa/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-drivers/xf86-video-vesa
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/ChangeLog,v 1.64 2012/12/30 14:51:46 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/ChangeLog,v 1.65 2013/03/08 20:57:01 chithanh Exp $
+
+*xf86-video-vesa-2.3.2-r1 (08 Mar 2013)
+
+  08 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-vesa-2.3.2-remove-mibstore_h.patch,
+  +xf86-video-vesa-2.3.2-r1.ebuild,
+  -files/xf86-video-vesa-2.3.0-pci-domains.patch,
+  -files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch,
+  -xf86-video-vesa-2.3.0-r1.ebuild, -xf86-video-vesa-2.3.0.ebuild,
+  -xf86-video-vesa-2.3.1.ebuild, xf86-video-vesa-2.3.2.ebuild:
+  Fix building against xorg-server-1.14, bug #460754.
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-vesa-2.3.2.ebuild:
   Stable for alpha, wrt bug #440872
diff --git a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-pci-domains.patch b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-pci-domains.patch
deleted file mode 100644
index 645fbc160d6f..000000000000
--- a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-pci-domains.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 1f84310ddf49778f776a39810aa98211c812e8ab Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed, 19 Oct 2011 08:33:07 +0000
-Subject: Build fix for ABI Version 12
-
-ABI Version 12 removes support for multiple PCI domains.  If you need to
-use this driver on a system with more than one PCI domain, you should
-either port this driver to using libpciaccess directly or stick with an
-older server.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 1136ac3..5a0120c 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -1268,14 +1268,16 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
- 				    & pVesa->base);
-     }
-     else
--	pVesa->base = xf86MapDomainMemory(pScrn->scrnIndex, 0, pVesa->pciInfo,
--					  pScrn->memPhysBase, pVesa->mapSize);
-+	(void) pci_device_map_legacy(pVesa->pciInfo, pScrn->memPhysBase,
-+	                             pVesa->mapSize,
-+	                             PCI_DEV_MAP_FLAG_WRITABLE,
-+	                             & pVesa->base);
- 
-     if (pVesa->base) {
- 	if (pVesa->mapPhys != 0xa0000)
--	    pVesa->VGAbase = xf86MapDomainMemory(pScrn->scrnIndex, 0,
--						 pVesa->pciInfo,
--						 0xa0000, 0x10000);
-+	    (void) pci_device_map_legacy(pVesa->pciInfo, 0xa0000, 0x10000,
-+	                                 PCI_DEV_MAP_FLAG_WRITABLE,
-+	                                 & pVesa->VGAbase);
- 	else
- 	    pVesa->VGAbase = pVesa->base;
- 
-@@ -1325,10 +1327,12 @@ VESAUnmapVidMem(ScrnInfoPtr pScrn)
-     if (pVesa->mapPhys != 0xa0000) {
- 	(void) pci_device_unmap_range(pVesa->pciInfo, pVesa->base,
- 				      pVesa->mapSize);
--	xf86UnMapVidMem(pScrn->scrnIndex, pVesa->VGAbase, 0x10000);
-+	(void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->VGAbase,
-+	                               0x10000);
-     }
-     else {
--	xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
-+	(void) pci_device_unmap_legacy(pVesa->pciInfo, pVesa->base,
-+	                               pVesa->mapSize);
-     }
- #else
-     xf86UnMapVidMem(pScrn->scrnIndex, pVesa->base, pVesa->mapSize);
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch
deleted file mode 100644
index 697dc278ec9e..000000000000
--- a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.0-xorg-server-1.12.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 463886df688d3521afc47ec88f9aaf67e924ec7f Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Wed, 19 Oct 2011 08:15:03 +0000
-Subject: Build fix for ABI Version 12
-
-ABI Version 12 removes support for multiple PCI domains.  If you need to
-use this driver on a system with more than one PCI domain, you should
-either port this driver to using libpciaccess directly or stick with an
-older server.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/src/vesa.c b/src/vesa.c
-index 61d3550..1136ac3 100644
---- a/src/vesa.c
-+++ b/src/vesa.c
-@@ -1299,7 +1299,11 @@ VESAMapVidMem(ScrnInfoPtr pScrn)
-     }
- #endif
- 
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
-     pVesa->ioBase = pScrn->domainIOBase;
-+#else
-+    pVesa->ioBase = 0;
-+#endif
- 
-     xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, DEBUG_VERB,
- 		   "virtual address = %p,\n"
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.2-remove-mibstore_h.patch b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.2-remove-mibstore_h.patch
new file mode 100644
index 000000000000..3ae6a98e800d
--- /dev/null
+++ b/x11-drivers/xf86-video-vesa/files/xf86-video-vesa-2.3.2-remove-mibstore_h.patch
@@ -0,0 +1,31 @@
+From 60d2dc115c4b6210d3b1e05f5b0c39d1f7917cbc Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:55:03 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/vesa.c b/src/vesa.c
+index 11cd26c..b73d104 100644
+--- a/src/vesa.c
++++ b/src/vesa.c
+@@ -49,9 +49,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* Colormap handling */
+ #include "micmap.h"
+ #include "xf86cmap.h"
+@@ -1081,7 +1078,6 @@ VESAScreenInit(SCREEN_INIT_ARGS_DECL)
+     VESADGAInit(pScrn, pScreen);
+ 
+     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* software cursor */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild
deleted file mode 100644
index 91a6081bfd84..000000000000
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0-r1.ebuild,v 1.1 2012/03/18 16:08:30 chithanh Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* ~alpha ~amd64 ~ia64 ~x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.0-xorg-server-1.12.patch
-	"${FILESDIR}"/${PN}-2.3.0-pci-domains.patch
-)
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild
deleted file mode 100644
index 7c940a6b629a..000000000000
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.0.ebuild
+++ /dev/null
@@ -1,15 +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-vesa/xf86-video-vesa-2.3.0.ebuild,v 1.5 2011/02/12 19:38:13 armin76 Exp $
-
-inherit x-modular
-
-DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* alpha 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/xextproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2-r1.ebuild
index d1e7c7b6a158..fd632e1d585c 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.1.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2-r1.ebuild
@@ -1,14 +1,18 @@
-# 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-vesa/xf86-video-vesa-2.3.1.ebuild,v 1.6 2012/10/10 14:45:53 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2-r1.ebuild,v 1.1 2013/03/08 20:57:01 chithanh Exp $
 
-EAPI=4
+EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Generic VESA video driver"
-KEYWORDS="-* alpha amd64 ia64 x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="-* ~alpha ~amd64 ~ia64 ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99
 	>=x11-libs/libpciaccess-0.12.901"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
diff --git a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild
index 6b66430176a0..af97f1a52b5a 100644
--- a/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild
+++ b/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.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-vesa/xf86-video-vesa-2.3.2.ebuild,v 1.6 2012/12/30 14:51:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-vesa/xf86-video-vesa-2.3.2.ebuild,v 1.7 2013/03/08 20:57:01 chithanh Exp $
 
 EAPI=4
 inherit xorg-2