Update to 1.7.8:

Adam Jackson (5):
      Remove miInitializeBackingStore()
      Use own thunk function instead of vgaHW*Weak
      Fix build against xserver 1.17
      Fix a typo
      Remove dependency on xf86PciInfo.h

Julien Cristau (5):
      Fix shadow compiler warning
      Fix BlockHandler declaration
      Fix SwitchMode and AdjustFrame hooks
      Fix a couple const-ness warnings
      Bump to 1.7.8

6 files changed, 6 insertions, 144 deletions

diff --git a/x11/xf86-video-siliconmotion/Makefile b/x11/xf86-video-siliconmotion/Makefile
index 0667bfaa0f4..2ee44b1afe0 100644
--- a/x11/xf86-video-siliconmotion/Makefile
+++ b/x11/xf86-video-siliconmotion/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2015/04/25 14:25:23 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.17 2015/05/09 15:05:38 wiz Exp $
 
-DISTNAME=	xf86-video-siliconmotion-1.7.7
-PKGREVISION=	3
+DISTNAME=	xf86-video-siliconmotion-1.7.8
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-siliconmotion/distinfo b/x11/xf86-video-siliconmotion/distinfo
index c4d9e3ae3dc..6166a0d8cdc 100644
--- a/x11/xf86-video-siliconmotion/distinfo
+++ b/x11/xf86-video-siliconmotion/distinfo
@@ -1,9 +1,5 @@
-$NetBSD: distinfo,v 1.6 2015/04/02 22:16:48 tnn Exp $
+$NetBSD: distinfo,v 1.7 2015/05/09 15:05:38 wiz Exp $
 
-SHA1 (xf86-video-siliconmotion-1.7.7.tar.bz2) = 60dc57c6ff6e0cd3f73076fce3c11d7e788ce7c1
-RMD160 (xf86-video-siliconmotion-1.7.7.tar.bz2) = c13359237e287a6318ab29aa906c9be034b13c39
-Size (xf86-video-siliconmotion-1.7.7.tar.bz2) = 385957 bytes
-SHA1 (patch-src_smi.h) = 37cb65b27e2ef800f53245ffd583e2c748387303
-SHA1 (patch-src_smi__driver.c) = 1a0f21bbd97b92c991721ca01e14ecadd3e6e5aa
-SHA1 (patch-src_smi__i2c.c) = 5b34193c40e5124f2f79d7559454efbcba10f7a2
-SHA1 (patch-src_smilynx__hw.c) = ff4df02bd80753d2b4f25f3264e920feb07073ac
+SHA1 (xf86-video-siliconmotion-1.7.8.tar.bz2) = d620309a9068437df2a9c83dc1384571ed7754f2
+RMD160 (xf86-video-siliconmotion-1.7.8.tar.bz2) = 749437c70b1d1e0d48ab13ee42147265fafe723d
+Size (xf86-video-siliconmotion-1.7.8.tar.bz2) = 398928 bytes
diff --git a/x11/xf86-video-siliconmotion/patches/patch-src_smi.h b/x11/xf86-video-siliconmotion/patches/patch-src_smi.h
deleted file mode 100644
index 9fb4207660a..00000000000
--- a/x11/xf86-video-siliconmotion/patches/patch-src_smi.h
+++ /dev/null
@@ -1,51 +0,0 @@
-$NetBSD: patch-src_smi.h,v 1.1 2015/04/02 22:16:48 tnn Exp $
-
-From c31d7f853d7469085f96f1e37923c260884c611c Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Sep 2014 10:34:07 -0400
-Subject: Remove dependency on xf86PciInfo.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-From b0b287209cfba5c64c7584b1a82ed2a2f1eab7e6 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Sep 2014 10:28:48 -0400
-Subject: Fix build against xserver 1.17
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
---- src/smi.h.orig	2015-04-02 19:47:42.000000000 +0000
-+++ src/smi.h
-@@ -37,7 +37,6 @@ authorization from the XFree86 Project a
- 
- #include "xf86.h"
- #include "xf86_OSproc.h"
--#include "xf86PciInfo.h"
- #include "xf86Pci.h"
- #include "xf86Cursor.h"
- #include "vgaHW.h"
-@@ -68,6 +67,15 @@ authorization from the XFree86 Project a
- /*			D E F I N I T I O N S				      */
- /******************************************************************************/
- 
-+#define PCI_VENDOR_SMI		0x126F
-+#define PCI_CHIP_SMI910		0x0910
-+#define PCI_CHIP_SMI810		0x0810
-+#define PCI_CHIP_SMI820		0x0820
-+#define PCI_CHIP_SMI710		0x0710
-+#define PCI_CHIP_SMI712		0x0712
-+#define PCI_CHIP_SMI720		0x0720
-+#define PCI_CHIP_SMI731		0x0730
-+
- #ifndef SMI_DEBUG
- #define SMI_DEBUG		0
- #endif
-@@ -221,7 +229,7 @@ typedef struct
-     CARD8 *		DataPortBase;	/* Base of data port */
-     int			DataPortSize;	/* Size of data port */
-     CARD8 *		IOBase;		/* Base of MMIO VGA ports */
--    IOADDRESS		PIOBase;	/* Base of I/O ports */
-+    unsigned int	PIOBase;	/* Base of I/O ports */
-     unsigned char *	FBBase;		/* Base of FB */
-     CARD32		fbMapOffset;    /* offset for fb mapping */
-     CARD32		FBOffset;	/* Current visual FB starting
diff --git a/x11/xf86-video-siliconmotion/patches/patch-src_smi__driver.c b/x11/xf86-video-siliconmotion/patches/patch-src_smi__driver.c
deleted file mode 100644
index 211d9beb5be..00000000000
--- a/x11/xf86-video-siliconmotion/patches/patch-src_smi__driver.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_smi__driver.c,v 1.1 2015/04/02 22:16:48 tnn Exp $
-
-From f19d7e463c30f1364e82e8c9f87b8a8407d53680 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 9 Jan 2013 22:59:39 -0500
-Subject: Remove miInitializeBackingStore()
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
---- src/smi_driver.c.orig	2015-04-02 19:47:46.000000000 +0000
-+++ 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
diff --git a/x11/xf86-video-siliconmotion/patches/patch-src_smi__i2c.c b/x11/xf86-video-siliconmotion/patches/patch-src_smi__i2c.c
deleted file mode 100644
index e73bd08c7fc..00000000000
--- a/x11/xf86-video-siliconmotion/patches/patch-src_smi__i2c.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_smi__i2c.c,v 1.1 2015/04/02 22:16:48 tnn Exp $
-
-From c31d7f853d7469085f96f1e37923c260884c611c Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Sep 2014 10:34:07 -0400
-Subject: Remove dependency on xf86PciInfo.h
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
---- src/smi_i2c.c.orig	2015-04-02 19:47:50.000000000 +0000
-+++ src/smi_i2c.c
-@@ -35,7 +35,6 @@ authorization from the XFree86 Project a
- #include "xf86_OSproc.h"
- #include "compiler.h"
- #include "xf86Pci.h"
--#include "xf86PciInfo.h"
- #include "vgaHW.h"
- 
- #include "smi.h"
diff --git a/x11/xf86-video-siliconmotion/patches/patch-src_smilynx__hw.c b/x11/xf86-video-siliconmotion/patches/patch-src_smilynx__hw.c
deleted file mode 100644
index c5e2350ec37..00000000000
--- a/x11/xf86-video-siliconmotion/patches/patch-src_smilynx__hw.c
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-src_smilynx__hw.c,v 1.1 2015/04/02 22:16:48 tnn Exp $
-
-From 08d459d2b548ce89264f45c7018f1cda9f08d795 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 30 Sep 2014 10:31:52 -0400
-Subject: Fix a typo
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-From 9b563415326e02f0b89f716c29b2fc22f393fb96 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 21 May 2014 14:01:02 -0400
-Subject: Use own thunk function instead of vgaHW*Weak
-
-I plan to remove the Weak functions from a future server.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
---- src/smilynx_hw.c.orig	2015-04-02 19:47:54.000000000 +0000
-+++ src/smilynx_hw.c
-@@ -572,6 +572,12 @@ SMILynx_ddc1Read(ScrnInfoPtr pScrn)
-     LEAVE(ret);
- }
- 
-+static void
-+SMILynx_ddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
-+{
-+    vgaHWddc1SetSpeed(pScrn, speed);
-+}
-+
- xf86MonPtr
- SMILynx_ddc1(ScrnInfoPtr pScrn)
- {
-@@ -585,7 +591,7 @@ SMILynx_ddc1(ScrnInfoPtr pScrn)
-     VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp | 0x20);
- 
-     pMon = xf86PrintEDID(xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),
--					 vgaHWddc1SetSpeedWeak(),
-+					 SMILynx_ddc1SetSpeed,
- 					 SMILynx_ddc1Read));
-     VGAOUT8_INDEX(pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x72, tmp);
-