Fix building against xorg-server-1.14

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

5 files changed, 69 insertions, 31 deletions

diff --git a/x11-drivers/xf86-video-tdfx/ChangeLog b/x11-drivers/xf86-video-tdfx/ChangeLog
index 48565fa40efa..4c1d6b23be4c 100644
--- a/x11-drivers/xf86-video-tdfx/ChangeLog
+++ b/x11-drivers/xf86-video-tdfx/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-tdfx
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/ChangeLog,v 1.69 2012/12/30 14:51:16 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/ChangeLog,v 1.70 2013/03/12 16:37:20 chithanh Exp $
+
+*xf86-video-tdfx-1.4.5-r1 (12 Mar 2013)
+
+  12 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-tdfx-1.4.5-remove-mibstore_h.patch,
+  +xf86-video-tdfx-1.4.5-r1.ebuild, -xf86-video-tdfx-1.4.3.ebuild,
+  xf86-video-tdfx-1.4.5.ebuild:
+  Fix building against xorg-server-1.14
 
   30 Dec 2012; Agostino Sarubbo <ago@gentoo.org> xf86-video-tdfx-1.4.5.ebuild:
   Stable for alpha, wrt bug #440872
diff --git a/x11-drivers/xf86-video-tdfx/files/xf86-video-tdfx-1.4.5-remove-mibstore_h.patch b/x11-drivers/xf86-video-tdfx/files/xf86-video-tdfx-1.4.5-remove-mibstore_h.patch
new file mode 100644
index 000000000000..30399cf1aa23
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/files/xf86-video-tdfx-1.4.5-remove-mibstore_h.patch
@@ -0,0 +1,32 @@
+From 10498d2730c651eb7a1890eb9e728269732e9dad Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:59 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/tdfx_driver.c b/src/tdfx_driver.c
+index ddd5431..412da07 100644
+--- a/src/tdfx_driver.c
++++ b/src/tdfx_driver.c
+@@ -62,10 +62,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+ #include "compiler.h"
+ 
+-/* Drivers using the mi implementation of backing store need: */
+-
+-#include "mibstore.h"
+-
+ /* All drivers using the vgahw module need this */
+ /* This driver needs to be modified to not use vgaHW for multihead operation */
+ #include "vgaHW.h"
+@@ -2373,7 +2369,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
+     }
+   }
+ 
+-  miInitializeBackingStore(pScreen);
+   xf86SetBackingStore(pScreen);
+   xf86SetSilkenMouse(pScreen);
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild
deleted file mode 100644
index 34c51a98c55f..000000000000
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.3.ebuild,v 1.5 2009/12/15 15:46:23 armin76 Exp $
-
-# Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
-XDPVER=4
-
-inherit x-modular
-
-DESCRIPTION="3Dfx video driver"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-fbsd"
-IUSE="dri"
-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/xproto
-	dri? ( x11-proto/xf86driproto
-			>=x11-libs/libdrm-2 )"
-
-pkg_setup() {
-	CONFIGURE_OPTIONS="$(use_enable dri)"
-}
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5-r1.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5-r1.ebuild
new file mode 100644
index 000000000000..952e1c60722a
--- /dev/null
+++ b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5-r1.ebuild
@@ -0,0 +1,25 @@
+# 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-tdfx/xf86-video-tdfx-1.4.5-r1.ebuild,v 1.1 2013/03/12 16:37:20 chithanh Exp $
+
+EAPI=5
+XORG_DRI=dri
+
+inherit xorg-2
+
+DESCRIPTION="3Dfx video driver"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="dri"
+
+RDEPEND=">=x11-base/xorg-server-1.0.99"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+	)
+}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
diff --git a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild
index a89d59480b94..cc1742f7d041 100644
--- a/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild
+++ b/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.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-tdfx/xf86-video-tdfx-1.4.5.ebuild,v 1.7 2012/12/30 14:51:16 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-tdfx/xf86-video-tdfx-1.4.5.ebuild,v 1.8 2013/03/12 16:37:20 chithanh Exp $
 
 EAPI=4
 XORG_DRI=dri