Update to 2.3.8:

Adam Jackson (2):
      Use own thunk function instead of vgaHW*Weak
      dri: Stop (uselessly) initializing the ValidateTree hooks

Jeremy White (1):
      Include xf86Modes.h to use functions from hw/xfree86/modes/xf86Modes.c.

Julien Cristau (2):
      Fix compiler warnings with recent X servers
      Bump to 2.3.8

5 files changed, 6 insertions, 94 deletions

diff --git a/x11/xf86-video-savage/Makefile b/x11/xf86-video-savage/Makefile
index 36b33f81198..614762ceec1 100644
--- a/x11/xf86-video-savage/Makefile
+++ b/x11/xf86-video-savage/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2015/04/25 14:25:23 tnn Exp $
+# $NetBSD: Makefile,v 1.18 2015/05/08 11:45:20 wiz Exp $
 
-DISTNAME=	xf86-video-savage-2.3.7
-PKGREVISION=	3
+DISTNAME=	xf86-video-savage-2.3.8
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-video-savage/distinfo b/x11/xf86-video-savage/distinfo
index 8f9c95b585d..8d7ce74ccd5 100644
--- a/x11/xf86-video-savage/distinfo
+++ b/x11/xf86-video-savage/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.8 2015/04/02 22:16:48 tnn Exp $
+$NetBSD: distinfo,v 1.9 2015/05/08 11:45:20 wiz Exp $
 
-SHA1 (xf86-video-savage-2.3.7.tar.bz2) = 9ce8474c7f1035d914ac2a77cd6d54b62d19260d
-RMD160 (xf86-video-savage-2.3.7.tar.bz2) = 79ef65340cd758168ac5f949dfaf9bbb37673634
-Size (xf86-video-savage-2.3.7.tar.bz2) = 395249 bytes
-SHA1 (patch-src-savage__driver.h) = 9ae393de1d275d43f1dd61c5745be9f5f9d42269
-SHA1 (patch-src_savage__dri.c) = f36f99b7f6c1cf61eb117449909c9899f065aead
-SHA1 (patch-src_savage__driver.c) = 3e6d031399a8f569efa1841d1eb67c46217b6ef1
+SHA1 (xf86-video-savage-2.3.8.tar.bz2) = cc2150f4195ccf82c80e272f9924f41a56e5f4f6
+RMD160 (xf86-video-savage-2.3.8.tar.bz2) = 6f467dd1621c937be4ca5b4f2e05e2d83c303629
+Size (xf86-video-savage-2.3.8.tar.bz2) = 418649 bytes
diff --git a/x11/xf86-video-savage/patches/patch-src-savage__driver.h b/x11/xf86-video-savage/patches/patch-src-savage__driver.h
deleted file mode 100644
index 23c4edace35..00000000000
--- a/x11/xf86-video-savage/patches/patch-src-savage__driver.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src-savage__driver.h,v 1.1 2015/04/02 22:16:48 tnn Exp $
-
-From 2e9217bb88b76cebfcd2b65b76c8733f80da77ea Mon Sep 17 00:00:00 2001
-From: Jeremy White <jwhite@codeweavers.com>
-Date: Thu, 21 Mar 2013 10:59:13 -0500
-Subject: Include xf86Modes.h to use functions from
- hw/xfree86/modes/xf86Modes.c.
-
-Signed-off-by: Jeremy White <jwhite@codeweavers.com>
-Reviewed-by: Robert Morell <rmorell@nvidia.com>
-
-diff --git a/src/savage_driver.h b/src/savage_driver.h
-index ec4b1ea..de042af 100644
---- src/savage_driver.h
-+++ src/savage_driver.h
-@@ -54,6 +54,7 @@
- #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
- #include "xf86Resources.h"
- #endif
-+#include "xf86Modes.h"
- #include "xf86Pci.h"
- #include "xf86_OSproc.h"
- #include "xf86Cursor.h"
diff --git a/x11/xf86-video-savage/patches/patch-src_savage__dri.c b/x11/xf86-video-savage/patches/patch-src_savage__dri.c
deleted file mode 100644
index 29c0c5abd9d..00000000000
--- a/x11/xf86-video-savage/patches/patch-src_savage__dri.c
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-src_savage__dri.c,v 1.1 2015/04/02 22:16:48 tnn Exp $
-
-From d28cd83c7b0b4a943efbe5ddf257c8ee2646ea73 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Tue, 29 Jul 2014 09:15:26 -0400
-Subject: dri: Stop (uselessly) initializing the ValidateTree hooks
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
-
-diff --git a/src/savage_dri.c b/src/savage_dri.c
-index bdb78e4..0842821 100644
---- src/savage_dri.c
-+++ src/savage_dri.c
-@@ -875,9 +875,6 @@ Bool SAVAGEDRIScreenInit( ScreenPtr pScreen )
-    psav->coreWakeupHandler = pDRIInfo->wrap.WakeupHandler;
-    pDRIInfo->wrap.WakeupHandler = SAVAGEWakeupHandler;
- 
--   pDRIInfo->wrap.ValidateTree = NULL;
--   pDRIInfo->wrap.PostValidateTree = NULL;
--
-    pDRIInfo->createDummyCtx = TRUE;
-    pDRIInfo->createDummyCtxPriv = FALSE;
- 
diff --git a/x11/xf86-video-savage/patches/patch-src_savage__driver.c b/x11/xf86-video-savage/patches/patch-src_savage__driver.c
deleted file mode 100644
index 45242de5297..00000000000
--- a/x11/xf86-video-savage/patches/patch-src_savage__driver.c
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-src_savage__driver.c,v 1.1 2015/04/02 22:16:48 tnn Exp $
-
-From 16a672d1ba183601d513c4cdca32b47e926a6d1e Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Wed, 21 May 2014 14:11:46 -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>
-
-diff --git a/src/savage_driver.c b/src/savage_driver.c
-index bca2c60..e82794f 100644
---- src/savage_driver.c
-+++ src/savage_driver.c
-@@ -4576,6 +4576,12 @@ SavageDDC1Read(ScrnInfoPtr pScrn)
-     return ((unsigned int) (tmp & 0x08));
- }
- 
-+static void
-+SavageDDC1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
-+{
-+    vgaHWddc1SetSpeed(pScrn, speed);
-+}
-+
- static Bool
- SavageDDC1(ScrnInfoPtr pScrn)
- {
-@@ -4589,7 +4595,8 @@ SavageDDC1(ScrnInfoPtr pScrn)
-     InI2CREG(byte,psav->I2CPort);
-     OutI2CREG(byte | 0x12,psav->I2CPort);
- 
--    pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn),vgaHWddc1SetSpeedWeak(),SavageDDC1Read);
-+    pMon = xf86DoEDID_DDC1(XF86_SCRN_ARG(pScrn), SavageDDC1SetSpeed,
-+			   SavageDDC1Read);
-     if (!pMon)
-         return FALSE;
-