CVS commit: pkgsrc/x11/xf86-video-tseng

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May 20 07:27:31 UTC 2018

Modified Files:
        pkgsrc/x11/xf86-video-tseng: distinfo
        pkgsrc/x11/xf86-video-tseng/patches: patch-src_tseng__driver.c

Log Message:
xf86-video-tseng: Fix build with modular-xorg-server-1.20.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/xf86-video-tseng/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xf86-video-tseng/distinfo
diff -u pkgsrc/x11/xf86-video-tseng/distinfo:1.7 pkgsrc/x11/xf86-video-tseng/distinfo:1.8
--- pkgsrc/x11/xf86-video-tseng/distinfo:1.7    Wed Nov  4 03:29:04 2015
+++ pkgsrc/x11/xf86-video-tseng/distinfo        Sun May 20 07:27:31 2018
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2015/11/04 03:29:04 agc Exp $
+$NetBSD: distinfo,v 1.8 2018/05/20 07:27:31 wiz Exp $
 
 SHA1 (xf86-video-tseng-1.2.5.tar.bz2) = 95c35b28a19ab486f0bb7482df944d5b0076bdd5
 RMD160 (xf86-video-tseng-1.2.5.tar.bz2) = cefe7f92087debc308ab1a2a9530de036aaae782
 SHA512 (xf86-video-tseng-1.2.5.tar.bz2) = 6e0010b24d5b97ade00ef80fda5ea91bce3a9ce07881551e84ac552ba49336905b62f062c656c72ea3097a0bec1517ec5038aa5766f8424e5f81d67dc777480c
 Size (xf86-video-tseng-1.2.5.tar.bz2) = 330575 bytes
-SHA1 (patch-src_tseng__driver.c) = b4f6eabf1413efc09ac3d48098680aa50e99fb71
+SHA1 (patch-src_tseng__driver.c) = 1f1cf76a0208ddadc4e0f7da92d3cf79f409f31c

Index: pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c
diff -u pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c:1.1 pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c:1.2
--- pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c:1.1   Thu Apr  2 22:16:48 2015
+++ pkgsrc/x11/xf86-video-tseng/patches/patch-src_tseng__driver.c       Sun May 20 07:27:31 2018
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tseng__driver.c,v 1.1 2015/04/02 22:16:48 tnn Exp $
+$NetBSD: patch-src_tseng__driver.c,v 1.2 2018/05/20 07:27:31 wiz Exp $
 
 From d2d5c8437e401181f56804cc68594c4831a0983d Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax%redhat.com@localhost>
@@ -7,9 +7,11 @@ Subject: Remove mibstore.h
 
 Signed-off-by: Adam Jackson <ajax%redhat.com@localhost>
 
+Other chunks: avoid using removed max.Value fields
+
 diff --git a/src/tseng_driver.c b/src/tseng_driver.c
 index ffafb19..0db62e5 100644
---- src/tseng_driver.c
+--- src/tseng_driver.c.orig    2012-07-17 05:21:17.000000000 +0000
 +++ src/tseng_driver.c
 @@ -39,9 +39,6 @@
  /* All drivers initialising the SW cursor need this */
@@ -21,7 +23,38 @@ index ffafb19..0db62e5 100644
  #include "fb.h"
  
  #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
-@@ -1453,7 +1450,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL)
+@@ -1040,10 +1037,6 @@ TsengPreInit(ScrnInfoPtr pScrn, int flag
+     else
+       pTseng->Bytesperpixel = 1;  /* this is fake for < 8bpp, but simplifies other code */
+ 
+-    /* hardware limits */
+-    pScrn->maxHValue = Tseng_HMAX;
+-    pScrn->maxVValue = Tseng_VMAX;
+-
+     /*
+      * This must happen after pScrn->display has been set because
+      * xf86SetWeight references it.
+@@ -1128,16 +1121,15 @@ TsengPreInit(ScrnInfoPtr pScrn, int flag
+     
+     /*
+      * xf86ValidateModes will check that the mode HTotal and VTotal values
+-     * don't exceed the chipset's limit if pScrn->maxHValue and
+-     * pScrn->maxVValue are set.  Since our TsengValidMode() already takes
++     * don't exceed the chipset's limit.  Since our TsengValidMode() already takes
+      * care of this, we don't worry about setting them here.
+      */
+ 
+     /* Select valid modes from those available */
+     i = xf86ValidateModes(pScrn, pScrn->monitor->Modes,
+       pScrn->display->modes, &pTseng->clockRange,
+-      NULL, 32, pScrn->maxHValue, 8*pTseng->Bytesperpixel, /* H limits */
+-      0, pScrn->maxVValue,           /* V limits */
++      NULL, 32, Tseng_HMAX, 8*pTseng->Bytesperpixel, /* H limits */
++      0, Tseng_VMAX,         /* V limits */
+       pScrn->display->virtualX,
+       pScrn->display->virtualY,
+       pTseng->FbMapSize,
+@@ -1453,7 +1445,6 @@ TsengScreenInit(SCREEN_INIT_ARGS_DECL)
        }
      }