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

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64

9 files changed, 58 insertions, 135 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/Manifest b/x11-drivers/xf86-video-vesa/Manifest
index 892291855cd7..fcf9d1ecd530 100644
--- a/x11-drivers/xf86-video-vesa/Manifest
+++ b/x11-drivers/xf86-video-vesa/Manifest
@@ -1,11 +1,6 @@
-AUX xf86-video-vesa-2.3.0-pci-domains.patch 2083 SHA256 eae65b6b852cb498557c5fab1231522ae7b1f1a955d5374f338e1e4763088c6a SHA512 525061c818e93f7074aab93221bc4f94970fac2fc61b51f775fbd50e6556485c20b81e22fcc68342244784cf27bdc7061c0770ae832ea366968b41fbd0895cb6 WHIRLPOOL 048a6c831832f0281e3523ae7234a7d71e3018b13497cb883394a04516d08230929b2925bd0c3af8fda43b9644b456f95856f81e5bf9f27b997b3a677572840c
-AUX xf86-video-vesa-2.3.0-xorg-server-1.12.patch 899 SHA256 cfc8b35a0fa674ab99e3d77f19e53884c882a842c6fe1dbf40a19761ddb9686a SHA512 7bcdfd7f0b02d58fd3bda612c5dbc477ae11c6f13edf49abe3e171daa28e5855f79354421ed7ec0856320a7839724648ffcf28710c457ac485ada184ba856501 WHIRLPOOL 95d91dea44ff24c831f7fbf6d37e71ee9dc4a91c34b0619a0dd6e47ddf47e5602de710974a0476aaebc3b2ea74cc6f28f2f8bef0c15489df39d7ac8daf04e884
-DIST xf86-video-vesa-2.3.0.tar.bz2 264539 SHA256 8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a SHA512 c0a16ceed577b7240c8efb10388562a8ceee1d6eb200852dc045682c4aa950eb96a9746631b42bdba44a60b12866d4a70d34132d1e36a917d057bc3131eccb5a WHIRLPOOL a9428be96b8a7fe4deadca4dd8a629dbb5d07cd48b10b8a6332c8ab4ae55f21dfb96b5176c80d4593a3ae59f7824bc4d477c4640fe1d4696231a02d12ad7d1ca
-DIST xf86-video-vesa-2.3.1.tar.bz2 287818 SHA256 e4a1038d5bc8884de461737f68f963651ef91137976388e1db4efc3991d01573 SHA512 2cff0b94b99a8f5521654946eb102beffe1d0ba2b5f088d284554f31f9361f5552001f88b86c5c66e4389b5537e5fc601f749346072668c56f45c26ec8d1eb43 WHIRLPOOL f29effdcb8f54cdb8c4ae09a8ad962396a404aad5afc2fc0b28c8ea9b56cd188cf3ce986271585ca8b27b14b6f6ddcf1e9f03357a83babf94a084f3a2570f590
+AUX xf86-video-vesa-2.3.2-remove-mibstore_h.patch 839 SHA256 5e759aa6e396c30d8e010564fee874c4ea24913e6bbc65b06d4cd2d2e76b6ddd SHA512 73fb0490fa25777558c15715eb3bc67c8fe3fddeb8ea4ed35ff83a9be8543b84f6f17f0ab584fc7831e4f18ce8d6105c9586a8b7e236453f0b43e962dcff3679 WHIRLPOOL 41a63ccf6a2a7a60f3424fef57eacd8ac39c70fc8a69d9daf5a64ca837199c69870fc73d0c325c420d875ebda92949210e8c94bee9f7d92b218ab73459ed3d16
 DIST xf86-video-vesa-2.3.2.tar.bz2 298186 SHA256 144a17ffae3c86603ddc4ae33521a52813498ee1f8213faa662dc4a8d6490ee3 SHA512 5da0da391fe5d3a5a88e36dcf0b75435b6c1b7389425da253633a293f3eeb0dc91760d0e66b3e98e227dabfa888dbf085fcc5fd973381da4df01ed81c8db288e WHIRLPOOL e922674447cc937604794380e0dc7997025781e3d815d6cf8f72d101ba452bee6a1671a709afd0652f239f407494a4f13f784bfb48b02fa0eac97e06ad409a96
-EBUILD xf86-video-vesa-2.3.0-r1.ebuild 533 SHA256 21d6e465e590f09cc4099e878d62f0597005f0f3330775b44e18ea6aa04aa8cd SHA512 ad7a259c39cef94d85d368fabbbddfeae87d4744f62461e8a1645195d6792936f4bad33e0432845e4caea7e72e0ee0cd80593aa6ebf23ed53f0d5dc2caff4e61 WHIRLPOOL c3639834c9432ecaf1f83f457f53e0d19b78f5fd3ab4a46285a5633c0e187d520daaa9149253520ac36fa97c7a1fac45720fb57efef8df39bd965fb25681bbb8
-EBUILD xf86-video-vesa-2.3.0.ebuild 510 SHA256 2a74744da9b0adaa126123c52057457e6980e6b7b77f3c2ec93b136959c7172c SHA512 9bcea8ef1af99b48b416a82da8d74d0ba6ef1d1d7dd5278ba6ee767199bee0d2df7fdf968ea7a75fa2823871f07317a6a9bfba37fa8f27198d0e1e9a4004d78e WHIRLPOOL 63aa7cf77875251a6db25374b2c3c6b0b0da57cb8fbb0213f7b68843cda6e1618a662c1a49ab87d3678c792606eb8940fff94b5548e1d962b6d6cb5928581a24
-EBUILD xf86-video-vesa-2.3.1.ebuild 464 SHA256 17e73f244519127cb0b32d9748e2635270ba3c67cbd40e83e0fbde984e72ddd4 SHA512 061d7896ca79b00e135442fd75f4e52f181754c3fdb54138af812edd6b6a275e64c64f3bab608cfcf0b9b00f9c0a066f6cc00d7f23b68597dd13ed8e1c68a561 WHIRLPOOL ee6ed3fade5c9f23f998481b846705ad9258cc9bfa4272e0255cc3b0cc5e542c1a74eacbad7a5fc242b7ec11c9fd54a7b84131265dd0da01c1bf1d83c9fe79da
-EBUILD xf86-video-vesa-2.3.2.ebuild 459 SHA256 36646731af10d8beed2963b73254546211f9944c5d092de5221a2e26ec013a85 SHA512 5ed05149455ec964cd41de3b5318c0b5b315c7ca5beb00ccd8074a5046dad66dbf2c8ca2db912bd876043f34ed3e9c24eb16906df2539932b63555d86f3f2f7c WHIRLPOOL 934b694c699847d128ce389fc72ceb8dca8ef07e21541b4fdf57d029714bd36e62deaf01842e9a3fa625e54bf69ec35c5501385c220bc8fb84744b9db49d09a0
-MISC ChangeLog 9064 SHA256 29fafcbcf9fe2bc8a2f79a8d660b6e3203611dc8af193dddf1cb353a6836b630 SHA512 a636a58c18b63a69ea936436b4337dbe37a4c9bb69709dd3023a158fecddb87ece80575f4c4b8a41a3b503621e65ce406457e1e39efa5bbd566ad701af402814 WHIRLPOOL a64edb21766695805c01a5084e8b06098feb5c0e6dd2ffd91e6effec35cba50d9f349decfde81d64bd69e3bc5da82b99daa05712dbfd3ccd5a3e88b2b5252b2a
+EBUILD xf86-video-vesa-2.3.2-r1.ebuild 528 SHA256 ab49d34343dec5a2b9645cde9cef62ef9b5e539aa7cb49c688a47fdbb753be99 SHA512 78aa67642408ad33e9af46f5f91bf04f301f34529187bd78e7d94ba0b4b4bb74a1d95ff760addea9039259d7fa8b7ff7f443cb5dc0c200edaae6700e2ccca4a3 WHIRLPOOL 088744a7d978433d7849b9584b520d6a2be2889d2f972e16f3bfc6482939a06ed08c2c3808c713181abd0b60b0416887a99211e36ea14bf60dda4206d0c45bbf
+EBUILD xf86-video-vesa-2.3.2.ebuild 464 SHA256 6fb74b34aac0645d345b28ae1e1b5521779c43807616bbd8afd60531435fe899 SHA512 88412decae08cc2e20e5d683a8f5598f8db354a354750a72b89989cce804047840e587730c321489310c0f84801d077ab858cc8418b9c74731c2094503a94d86 WHIRLPOOL b862dc8d2f4715900e78f428678715a4ca4c2cae14f6c4da62beca990637ad4e6a6878d11e30a0f0ab1b3e1f493f0b31575b5d75a8186605acdb370ef3790065
+MISC ChangeLog 9561 SHA256 f37b6a3dd73e764e515bd043871b2139534eb6f1a8e1e58299fcc8d103f26b55 SHA512 3ad756d457a8aac893a6661330e7781e883a754e9c25d6bfb74c2d77aeeafb593f68dee8b3eda1686ecfaef775829b72cb97547e807dc6555420b0d36eb6076e WHIRLPOOL de621d964863a48456ce387b1990048480d11f170a31394377d696169b947fd345f144e44f53ffa1151cb6e1906d295cc8cb3b3c1060afdd4f1ae881702d02e4
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
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