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

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

5 files changed, 115 insertions, 6 deletions

diff --git a/x11-drivers/xf86-video-nv/ChangeLog b/x11-drivers/xf86-video-nv/ChangeLog
index 91fc2ae9d99d..0c5eac22a3c8 100644
--- a/x11-drivers/xf86-video-nv/ChangeLog
+++ b/x11-drivers/xf86-video-nv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-nv
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nv/ChangeLog,v 1.119 2012/12/30 14:49:05 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nv/ChangeLog,v 1.120 2013/03/12 16:44:51 chithanh Exp $
+
+*xf86-video-nv-2.1.20-r1 (12 Mar 2013)
+
+  12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-nv-2.1.20-remove-mibstore_h.patch,
+  +xf86-video-nv-2.1.20-r1.ebuild, xf86-video-nv-2.1.20.ebuild:
+  Fix building against xorg-server-1.14, bug #461414.
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-nv-2.1.20.ebuild:
   Stable for alpha, wrt bug #440872
diff --git a/x11-drivers/xf86-video-nv/Manifest b/x11-drivers/xf86-video-nv/Manifest
index 4d366e2536e4..1615e7703752 100644
--- a/x11-drivers/xf86-video-nv/Manifest
+++ b/x11-drivers/xf86-video-nv/Manifest
@@ -1,6 +1,8 @@
+AUX xf86-video-nv-2.1.20-remove-mibstore_h.patch 2136 SHA256 0ec4234fd9202956d25ca93e9131930e4a3fbba5de2ca870d0cf2302ccb76b46 SHA512 f63c1803b3c7f0b6326ca85ba36b3953c0c856d698574265334ab038d9d8d783ec9ee4f8a88095b3f5163a78a4fbe3443d349cc71ef2cf84e7a04f5f25f7fbd8 WHIRLPOOL 47590523f3c04c52ff50e71c129f56af616e1950a50cdcc896422294497f6cc135daa10fdf784566df0ed7474f76af906f2d1beccb38485267457a9751e8b109
 DIST xf86-video-nv-2.1.18.tar.bz2 354719 SHA256 6cf726cc8377cd823ea6038938ea8a88e883fea01b13a749b5491e26535cf415 SHA512 99b4e5f786d2509b0ba2f1cd891257a83e6186e2f95ecfff7d8ecde89da57f4c6345bfb11e9a604f526f3877d84df692d138034d9fed3a3327ae9800fd94bde8 WHIRLPOOL 66ce7ddd3fee70f44d13e3e0b1c32dd8ec76eef36a90476f7548a5ffc562e57c0e5e72bcc616103181d720948d02517cbd7d08de9be9aa2cbf128ffa2a2282d7
 DIST xf86-video-nv-2.1.20.tar.bz2 396982 SHA256 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf SHA512 f7c3f00aa949bdffdcb180fa727204b1cdbbad560919e111c589f8614fd897186cdefe014714505aa4646419b4d8bb879eaca96fea032b56cc8c71ba7faa6373 WHIRLPOOL 77d18c82faaf1d969aa9cef6d81fcc0fda8fbb141094a1b05c1ad6edddb5cf2044280f1f0017a079abd9918be555eeffc9ed49750762601dcbcd14e66bfbc9ee
 EBUILD xf86-video-nv-2.1.18.ebuild 557 SHA256 a09183b10ef44000a5a25d0d8917a05a73fa38072f2abc63dfee1e93a8622b71 SHA512 b34dd28bc7893e3a46aa5e5e6f403685fc36d5acca0f7caabde8046d8bfc524f65fc442385e8f34e0c607686b6229849ff174efc7a7d08fd04a95137b495de88 WHIRLPOOL c452008db6485b7a689d618f93efbe6f6a23e0d2d0c69146e5c5f91b883ed71299772af462b714fea9321647f53a5540b0728d4dc39904614b3e92cb92d7c8cc
-EBUILD xf86-video-nv-2.1.20.ebuild 455 SHA256 b0c27d85750a2fcffde677e8b91c6c62e71a80d3bed7bf58eb3b9eade25bc2c5 SHA512 bf804c8037b09a599c44c1e9e35f14ad8ba89554674bf808d7bfc4a5fea6ee32745cd867dae1357ee65c6693c9eb0a4292423f044e54d6766c25db58ee45ca75 WHIRLPOOL 910247bcb35c17dbb0cba6f3c917338c14cfa377d047fd6d3ca9213024ea8f3f31cae11a31b5eec4772577bba6967ff448e44d088af7c4c44fd4f03ed761d6fe
-MISC ChangeLog 16574 SHA256 e43cb29fc5c784b5763665b38b99b134fd1207513fff2074adad6f462709629a SHA512 41dbd88a067bb3d8b3d1a08130b6ea5a2d516823e5e1b8dba34cf2539a83309ae39fcc9cd5e34df63d988e5f4fdeb3634eac6c99528d20270e535563bf6c367a WHIRLPOOL 9462161de61066c84a4160d8679787447833b3fcb4125b649fb180c5b77c98d32338dbe941c698b8e0b03f1f6fd35a0e166148b29ae19fd8bc91efa73498dacd
+EBUILD xf86-video-nv-2.1.20-r1.ebuild 526 SHA256 d870eb45b4d07e34239abfbc49dd404c35baf3bbc90be2a91881e4916190e898 SHA512 8452721ad90d39353014db7953b2892686b93fd8b892a5e0afc34b69ba8883f26154df4f23525b807b88a865aa613a09f602520013cca57dd70780229fc01030 WHIRLPOOL 0187a56ece1bee7c6b02d22782014f1d67052dfaed25b4dbf1ea4e7bc1503860fb271cd13858102593f7dce0d857005f648b22903321a0fcbe4912a5a18300b0
+EBUILD xf86-video-nv-2.1.20.ebuild 460 SHA256 33be88f5c6259ae0487dc4070d662a8feffe7a16fd20d759292dee4eb1624646 SHA512 99041c029a4899f97baa1045b97b76b01c22c87e390617137bfa53e745ec1357ca75f873444829ea4cfddaef70338019209fec0cb4b2a69ed42c8e85d488f0d1 WHIRLPOOL 50d1d018da184e38af82a6460e4e2dbda2caf2e829fa59a4cc3405380f9e062d9a39eeaa186381c094fc9eddd71e69567f5ab3d71241d029b4aff21f467f2685
+MISC ChangeLog 16862 SHA256 3592563df99316612716335fda0d48ad096dad199a7930a37787e5cac68b0615 SHA512 0865665a85066a46d1cb6da94ad47b6f48ce3b5e3733681e8dbdbbce2dc51b5a5074551e6b952a17f34bc90c4f470919550da62109ca24465b68d7b8e4018e07 WHIRLPOOL 6d62c833684e23c9c919d62b11b769d41a8b5e5ba9752fd261a2d47179f30fee899d1673ec965590bf6cc836d15cc4e9859c1ebeab2c6c004ae3c55da40c7609
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-drivers/xf86-video-nv/files/xf86-video-nv-2.1.20-remove-mibstore_h.patch b/x11-drivers/xf86-video-nv/files/xf86-video-nv-2.1.20-remove-mibstore_h.patch
new file mode 100644
index 000000000000..ef5a4f2d9d6b
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/files/xf86-video-nv-2.1.20-remove-mibstore_h.patch
@@ -0,0 +1,81 @@
+From fc78fe98222b0204b8a2872a529763d6fe5048da Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:49 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/g80_driver.c b/src/g80_driver.c
+index cc4e197..719b96c 100644
+--- a/src/g80_driver.c
++++ b/src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include <xf86Resources.h>
+ #endif
+ #include <mipointer.h>
+-#include <mibstore.h>
+ #include <micmap.h>
+ #include <xf86cmap.h>
+ #include <fb.h>
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_driver.c b/src/nv_driver.c
+index 6dad6e5..8f35334 100644
+--- a/src/nv_driver.c
++++ b/src/nv_driver.c
+@@ -2550,7 +2550,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pNv->NoAccel)
+ 	NVAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/nv_include.h b/src/nv_include.h
+index fb190bf..f174eef 100644
+--- a/src/nv_include.h
++++ b/src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+diff --git a/src/riva_driver.c b/src/riva_driver.c
+index e0667ef..759501e 100644
+--- a/src/riva_driver.c
++++ b/src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pRiva->NoAccel)
+ 	RivaAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+diff --git a/src/riva_include.h b/src/riva_include.h
+index f2c5302..c7aeef7 100644
+--- a/src/riva_include.h
++++ b/src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20-r1.ebuild b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20-r1.ebuild
new file mode 100644
index 000000000000..ae74f5238954
--- /dev/null
+++ b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20-r1.ebuild
@@ -0,0 +1,19 @@
+# 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-nv/xf86-video-nv-2.1.20-r1.ebuild,v 1.1 2013/03/12 16:44:51 chithanh Exp $
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Nvidia 2D only video driver"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-base/xorg-server
+	>=x11-libs/libpciaccess-0.10.7"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
diff --git a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.ebuild b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.ebuild
index 76fa6482fc29..153130b8c19f 100644
--- a/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.ebuild
+++ b/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.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-nv/xf86-video-nv-2.1.20.ebuild,v 1.8 2012/12/30 14:49:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-nv/xf86-video-nv-2.1.20.ebuild,v 1.9 2013/03/12 16:44:51 chithanh Exp $
 
 EAPI=4
 inherit xorg-2