Fix building against xorg-server-1.14

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

5 files changed, 57 insertions, 35 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/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}"