Fix building against xorg-server-1.14

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

6 files changed, 60 insertions, 39 deletions

diff --git a/x11-drivers/xf86-video-trident/ChangeLog b/x11-drivers/xf86-video-trident/ChangeLog
index c5e35fb79793..5b6a6989bf0c 100644
--- a/x11-drivers/xf86-video-trident/ChangeLog
+++ b/x11-drivers/xf86-video-trident/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-trident
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/ChangeLog,v 1.67 2012/12/31 23:27:34 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-trident/ChangeLog,v 1.68 2013/03/12 16:37:59 chithanh Exp $
+
+*xf86-video-trident-1.3.6-r2 (12 Mar 2013)
+
+  12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-trident-1.3.6-remove-mibstore_h.patch,
+  +xf86-video-trident-1.3.6-r2.ebuild, -xf86-video-trident-1.3.4.ebuild,
+  -xf86-video-trident-1.3.6.ebuild:
+  Fix building against xorg-server-1.14
 
   31 Dec 2012; Agostino Sarubbo <ago@gentoo.org>
   xf86-video-trident-1.3.6-r1.ebuild:
diff --git a/x11-drivers/xf86-video-trident/Manifest b/x11-drivers/xf86-video-trident/Manifest
index ea53b58bd3b0..b378893ef6d7 100644
--- a/x11-drivers/xf86-video-trident/Manifest
+++ b/x11-drivers/xf86-video-trident/Manifest
@@ -1,10 +1,9 @@
 AUX xf86-video-trident-1.3.6-no-xaa.patch 1133 SHA256 e7fd27605e34e7e0d1d85153dbc62427e683e04925bf3650c0b4ac364f35f9b4 SHA512 1541c70423af452450987a19e6a2061af0b9086e7160c9116f1be5a7040e44d4fb9ea4986f31c8774ab7fc5d08ab3166f4816af4b72ebd17a7601177c26b6621 WHIRLPOOL 608f9226f8902499e28c90a806305ebe4683d505230920ce663255ba15b3bdab95dcf914bbc6e6af7e8defa80c6b503db0c1ebefdce90f996c9591e8e1f04fe2
-DIST xf86-video-trident-1.3.4.tar.bz2 310898 SHA256 58e61631e0ef2c58c3c81afb7d7b8d2b46504bdc3dd84fd1ab2798c6f1f29ca8 SHA512 2181a3fd7cde326ee4193dc22c071e4722d878eddc68c62b1a7a76837d8c6e942ee63be4b22bd00eb3dc9ef800f915d4c3e1ddddf0e8888084c5e7ae558dd7f8 WHIRLPOOL 5917dfa5ff741ac744c9219a0e0a7f0d44d4fcea07cc037122787c6a9a314870c2df78d3777ed12172c3d9d353eaad38a4430d447aa9e637c93b23688380b4c6
+AUX xf86-video-trident-1.3.6-remove-mibstore_h.patch 750 SHA256 a2889127284ea278a53bdc3e7f43f19befd8e5f2d8e761651441c386dfe94b2e SHA512 7ea848bd4fe29435c3eb296385932faabaa7a5e9f3a58a5b0ed65b1b5ac324383a5ca38e0e19c2e09715be1d1d43d6dfc307c9e5f0b14d785778ba24def8706f WHIRLPOOL 3bae0d42bab776ee3e8348702642905b7f4016d0b025d4ff81336a75ca7c715873df269265225f74a33db5d8909407c4f3c0a06ed3c63705f559b92b9ca11120
 DIST xf86-video-trident-1.3.5.tar.bz2 334649 SHA256 4bb3d091ab7788e1883d6d9e7e0c7ecbf9f57e5ef03d94a5082c2870dbbfc50b SHA512 ccdccc6b16d84925aa750eeb18218cd562cfd3b10d8f07c46ffcec49947865b8ca516ceeaa4788f8bac1b8a4eebbe2113c6000ed97e1103aa7756c97e78081aa WHIRLPOOL 12a970369433d26580d0df05515fcc8201d7fcf7dd7ae70b22be8eed4bee1f7adf60a5eba467810e586f0be0c846696e534e7b9793393c83665f461c6cbc505d
 DIST xf86-video-trident-1.3.6.tar.bz2 356092 SHA256 6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104 SHA512 16aa61c3b84d8f6f581864cd8a94b6bed4271c17c255760328d5444689344bc6d3a8f8b20eee91d289a9732e59b6e5f34c41ba05e66da5c0e8554c40af8907b2 WHIRLPOOL 9f31868d1500eda5c456ce59be717da44952c2b10fc46868f6347ef68b4fd43177f3acf7223cbf23da98a4fc46e4d6825b10965d3ebbf2bab917fbfff24a0c7a
-EBUILD xf86-video-trident-1.3.4.ebuild 565 SHA256 53581cceb9094c8c5fce441d5d0b701fa0b43be1ad53a3edbbbcf33799195478 SHA512 b4ebecfc4c75487894f8387e2826341e3cdf0dc414a57b75f2c9c1f1bd3e0e6b4470cbf6b70e53a14100ca1d6b947daa4e64ac98af802129520d33682b37b2ea WHIRLPOOL 053512c1e3a762aaa8672038a89e1e08d8ab1373afa5f56918c26b3d716ec6920296cc2a11bc451020551e847d005cf08ec07e1ea107dd6db32c315aa9dfef91
 EBUILD xf86-video-trident-1.3.5.ebuild 425 SHA256 14963f198ef74b49f3b90c8fa5ea635a610898fb7111221021695e9ff44bfbf4 SHA512 1c95c33173ffb9eac208fa7346fafe24090775ce97c836b7d17f11a9f99fc7a5ead8edf1a1d75659aacf22d503bf5b0c8c6efe534caf3a452c2f40d1f73295da WHIRLPOOL 428965cf714bae1d62a8826494c7cba0eb21b315aa6f6a01a84d013828d0a683b53b02c18e4f1e6805d0285d9212aeeba7ffe6ccd6319e1981c068f60ec49882
 EBUILD xf86-video-trident-1.3.6-r1.ebuild 470 SHA256 9ee07fbe66e411c85ac344183260c99fda7f7e736eb9ebc9b4ee6e19048708d6 SHA512 a99d389797331de34f0e138a094b4439348295091706ffe5214f04e70d99e96911459e638b086e9b7e518f396cb49c17fdebf08fa9db8f7cc80e60e005506c74 WHIRLPOOL e251ea8155c279a70a81f31b18ee4acfa3a14d6641eb58d708b1a56418b8df00565e9e4629239e5f8ed7615b29d6c9b8cb8ca4ca621f483f1255db6ba8f2e02c
-EBUILD xf86-video-trident-1.3.6.ebuild 425 SHA256 c931ca1049bd0dd778b14b6b2fab3609de095c3b76f5d3ab0408ba2a0e60d85b SHA512 963906213ba3757d4acd09feab1f29063640a13cc2fcf290ed2f551db8994b30f7f3d3dce55615dde28160dd6f06a8ab8c29eb5ee4de84b2b9a0d363f936803b WHIRLPOOL e07e7746997694bbd067cbb626ce8480775eb782ef4d07d01e662f5f79705d4b8f75fa49c9cf722d3a29ab023cd5101318722bec1a79e2edf4d5a25262e57e26
-MISC ChangeLog 9394 SHA256 1301d04f482f913a75a8bf2a248b93d5572b5595b27c0261d4eb84c8333d7273 SHA512 f216b5dcdac6bd27e0a61149f0bb5e2fa34cecdff5412355ec6ccea7f0461f1bdc6aa71f3833abfd0708b9c178667c89aed32ba903066bbd2f9d7b60fd86d14b WHIRLPOOL 748096e7d1d211621b9d025a2bbc99ba2b18e53f6ce2e3c9b5ef5fd37ba07c48ab3ce46a7f297cba83f6bc6028cd32272b1eabde419daada4c0a6f4d4d3edb54
+EBUILD xf86-video-trident-1.3.6-r2.ebuild 523 SHA256 55cda66b52c5c861c461dafb6cfd5af0391c97ed2fe2cf6f53fc5aa8956a83bb SHA512 3096cfd2d1c74036fa665120d4eb28dd73813e00e89fda30471691e368dc53a15d7d1a02711c8bb519ccf213d063e2f9d8f65c20d82af09b1a0dc056fe138a10 WHIRLPOOL 98cacb76a3ca4058cd51dfbffa9e92565cc3e0532113fae6f6cb9254727a80b1af76cd2c3520a767e6c81c8b463b8083c41c13b737e9b85be37a4a3575dfb5f6
+MISC ChangeLog 9721 SHA256 4afa9ed804d44e77dfb5f7dd5968610f5c641b4b6eb0af04e69cb99dd4bfdb11 SHA512 f7f4979e5182c534c942fd1ed3cbcf706b24ae4207b5726e267743f727913321550111eeb243381bc686f76652fe643ad95ebe30c22de039d59f99af943a91fe WHIRLPOOL 25a90b90338c1bae1c161c80f5e949c4bab53961bd90df81826fa4ddc4697f8387bdb8955fbd6929c6839f511d323b32452517a7a806beca1cd1a79fb462b24c
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
diff --git a/x11-drivers/xf86-video-trident/files/xf86-video-trident-1.3.6-remove-mibstore_h.patch b/x11-drivers/xf86-video-trident/files/xf86-video-trident-1.3.6-remove-mibstore_h.patch
new file mode 100644
index 000000000000..c1b7a904ad49
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/files/xf86-video-trident-1.3.6-remove-mibstore_h.patch
@@ -0,0 +1,29 @@
+From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:55:01 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/trident_driver.c b/src/trident_driver.c
+index dc12b76..408c870 100644
+--- a/src/trident_driver.c
++++ b/src/trident_driver.c
+@@ -56,7 +56,6 @@
+ 
+ #include "mipointer.h"
+ 
+-#include "mibstore.h"
+ #include "shadow.h"
+ #include "trident.h"
+ #include "trident_regs.h"
+@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL)
+     	TridentAccelInit(pScreen);
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ 
+     /* Initialise cursor functions */
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.4.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.4.ebuild
deleted file mode 100644
index c653e54f7171..000000000000
--- a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.4.ebuild
+++ /dev/null
@@ -1,20 +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-trident/xf86-video-trident-1.3.4.ebuild,v 1.5 2011/02/12 19:36:37 armin76 Exp $
-
-EAPI=3
-inherit xorg-2
-
-DESCRIPTION="Trident video driver"
-KEYWORDS="amd64 ia64 ppc x86 ~x86-fbsd"
-IUSE=""
-
-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"
diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r2.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r2.ebuild
new file mode 100644
index 000000000000..2b580cfd47e0
--- /dev/null
+++ b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6-r2.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-trident/xf86-video-trident-1.3.6-r2.ebuild,v 1.1 2013/03/12 16:37:59 chithanh Exp $
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Trident video driver"
+KEYWORDS="~amd64 ~ia64 ~ppc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-xaa.patch
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
diff --git a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6.ebuild b/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6.ebuild
deleted file mode 100644
index 0d1b677fba5c..000000000000
--- a/x11-drivers/xf86-video-trident/xf86-video-trident-1.3.6.ebuild
+++ /dev/null
@@ -1,13 +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-trident/xf86-video-trident-1.3.6.ebuild,v 1.4 2012/11/28 21:43:02 ranger Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Trident video driver"
-KEYWORDS="amd64 ~ia64 ppc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"