Fix build with newer xorg-server. Remove old.

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

7 files changed, 44 insertions, 94 deletions

diff --git a/x11-drivers/xf86-video-siliconmotion/ChangeLog b/x11-drivers/xf86-video-siliconmotion/ChangeLog
index 891669daf7ac..63e94f225abc 100644
--- a/x11-drivers/xf86-video-siliconmotion/ChangeLog
+++ b/x11-drivers/xf86-video-siliconmotion/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for x11-drivers/xf86-video-siliconmotion
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/ChangeLog,v 1.65 2012/11/18 12:20:35 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/ChangeLog,v 1.66 2014/05/27 12:41:33 chithanh Exp $
+
+*xf86-video-siliconmotion-1.7.7-r1 (27 May 2014)
+
+  27 May 2014; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-siliconmotion-1.7.7-mibstore_h.patch,
+  +xf86-video-siliconmotion-1.7.7-r1.ebuild,
+  -files/xf86-video-siliconmotion-1.7.5-abi-check.patch,
+  -files/xf86-video-siliconmotion-1.7.5-new-vgahw.patch,
+  -files/xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch,
+  -xf86-video-siliconmotion-1.7.5.ebuild,
+  -xf86-video-siliconmotion-1.7.6.ebuild:
+  Fix build with newer xorg-server. Remove old.
 
   18 Nov 2012; Agostino Sarubbo <ago@gentoo.org>
   xf86-video-siliconmotion-1.7.7.ebuild:
diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-abi-check.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-abi-check.patch
deleted file mode 100644
index 7c311669a00f..000000000000
--- a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-abi-check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 7d9c1a49b87df15cdb78c529db554ea82c77033f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 17 Nov 2011 20:53:51 +0000
-Subject: Check ABI major not encoded ABI
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/smi_driver.c b/src/smi_driver.c
-index 86644c7..6508fae 100644
---- a/src/smi_driver.c
-+++ b/src/smi_driver.c
-@@ -442,7 +442,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
- 	    LEAVE(FALSE);
- 
- 	hwp = VGAHWPTR(pScrn);
--#if ABI_VIDEODRV_VERSION < 12
-+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	pSmi->PIOBase = hwp->PIOOffset;
- #else
- 	pSmi->PIOBase = 0;
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-new-vgahw.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-new-vgahw.patch
deleted file mode 100644
index f34b1fb70f2b..000000000000
--- a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-new-vgahw.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 0e7e9cd639196cb42b0a79b2671f6bacc558035f Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 19 Dec 2011 22:26:34 +0000
-Subject: Fix for new vgaHW ABI
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/smi_driver.c b/src/smi_driver.c
-index a344921..25eb742 100644
---- a/src/smi_driver.c
-+++ b/src/smi_driver.c
-@@ -442,6 +442,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
- 	    LEAVE(FALSE);
- 
- 	hwp = VGAHWPTR(pScrn);
-+	vgaHWSetStdFuncs(hwp);
- #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
- 	pSmi->PIOBase = hwp->PIOOffset;
- #else
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch
deleted file mode 100644
index ef353f0df9be..000000000000
--- a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-xorg-server-1.12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 037b839c84ad6dcbe9aade420cf0d3bf06f23119 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 16 Nov 2011 20:03:25 +0000
-Subject: Adapt to missing PIOOffset in videoabi 12
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/src/smi_driver.c b/src/smi_driver.c
-index 9c10e46..86644c7 100644
---- a/src/smi_driver.c
-+++ b/src/smi_driver.c
-@@ -442,7 +442,11 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags)
- 	    LEAVE(FALSE);
- 
- 	hwp = VGAHWPTR(pScrn);
-+#if ABI_VIDEODRV_VERSION < 12
- 	pSmi->PIOBase = hwp->PIOOffset;
-+#else
-+	pSmi->PIOBase = 0;
-+#endif
- 
- 	xf86ErrorFVerb(VERBLEV, "\tSMI_PreInit vgaCRIndex=%x, vgaIOBase=%x, "
- 		       "MMIOBase=%p\n", hwp->IOBase + VGA_CRTC_INDEX_OFFSET,
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.7-mibstore_h.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.7-mibstore_h.patch
new file mode 100644
index 000000000000..5f1c49abc5e4
--- /dev/null
+++ b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.7-mibstore_h.patch
@@ -0,0 +1,22 @@
+From f19d7e463c30f1364e82e8c9f87b8a8407d53680 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 10 Jan 2013 03:59:39 +0000
+Subject: Remove miInitializeBackingStore()
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/smi_driver.c b/src/smi_driver.c
+index 4794571..134db79 100644
+--- a/src/smi_driver.c
++++ b/src/smi_driver.c
+@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   "Done writing mode.  Register dump:\n");
+     SMI_PrintRegs(pScrn);
+ 
+-    miInitializeBackingStore(pScreen);
+-
+ #ifdef HAVE_XMODES
+     xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset));
+ #endif
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild
deleted file mode 100644
index 268f954d31e8..000000000000
--- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild
+++ /dev/null
@@ -1,20 +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-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild,v 1.7 2012/08/12 03:53:27 mattst88 Exp $
-
-EAPI=4
-inherit xorg-2
-
-DESCRIPTION="Silicon Motion video driver"
-
-KEYWORDS="amd64 ~mips x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.7.5-xorg-server-1.12.patch
-	"${FILESDIR}"/${PN}-1.7.5-abi-check.patch
-	"${FILESDIR}"/${PN}-1.7.5-new-vgahw.patch
-)
diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.7-r1.ebuild
index 6a5ebaf4c2d4..2dad58f7fd9f 100644
--- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild
+++ b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.7-r1.ebuild
@@ -1,14 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.6.ebuild,v 1.5 2012/08/12 03:53:27 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.7-r1.ebuild,v 1.1 2014/05/27 12:41:33 chithanh Exp $
 
-EAPI=4
+EAPI=5
 inherit xorg-2
 
 DESCRIPTION="Silicon Motion video driver"
 
-KEYWORDS="amd64 ~mips x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~amd64 ~mips ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
 DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-mibstore_h.patch
+)