[pkgsrc/trunk]: pkgsrc/x11/xf86-video-s3virge xf86-video-s3virge: Fix build w...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b2822054113d
branches:  trunk
changeset: 380700:b2822054113d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun May 20 07:32:50 2018 +0000

description:
xf86-video-s3virge: Fix build with modular-xorg-server-1.20.

diffstat:

 x11/xf86-video-s3virge/distinfo                        |   3 +-
 x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c |  22 ++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletions(-)

diffs (38 lines):

diff -r 46c43765f38e -r b2822054113d x11/xf86-video-s3virge/distinfo
--- a/x11/xf86-video-s3virge/distinfo   Sun May 20 07:30:09 2018 +0000
+++ b/x11/xf86-video-s3virge/distinfo   Sun May 20 07:32:50 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 03:29:03 agc Exp $
+$NetBSD: distinfo,v 1.10 2018/05/20 07:32:50 wiz Exp $
 
 SHA1 (xf86-video-s3virge-1.10.7.tar.bz2) = d670f02ec4372e4a4ed299d7f29b5bd6e2fa9e83
 RMD160 (xf86-video-s3virge-1.10.7.tar.bz2) = c2adf8f566d61724a57b7b807cfa9602c2a221eb
 SHA512 (xf86-video-s3virge-1.10.7.tar.bz2) = bbeb3af1558eeb25768ec86e14687d442d54046913af6f4f4eb49c0b9641377b0d6f0e85629b16e46db07adb2358053cbfbe7b366d0cb9a817a011a1c7703e57
 Size (xf86-video-s3virge-1.10.7.tar.bz2) = 374129 bytes
+SHA1 (patch-src_s3v__driver.c) = be708042982dd9630e935cce0670266f9d482c8a
diff -r 46c43765f38e -r b2822054113d x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c    Sun May 20 07:32:50 2018 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_s3v__driver.c,v 1.3 2018/05/20 07:32:50 wiz Exp $
+
+Fix build with modular-xorg-server-1.20.
+
+--- src/s3v_driver.c.orig      2015-09-26 16:28:11.000000000 +0000
++++ src/s3v_driver.c
+@@ -1203,6 +1203,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
+    vga256InfoRec.directMode = XF86DGADirectPresent;
+ #endif
+ 
++#if 0
+     /*
+      * xf86ValidateModes will check that the mode HTotal and VTotal values
+      * don't exceed the chipset's limit if pScrn->maxHValue and
+@@ -1214,6 +1215,7 @@ S3VPreInit(ScrnInfoPtr pScrn, int flags)
+                               /* true for all ViRGE? */
+   pScrn->maxHValue = 2048;
+   pScrn->maxVValue = 2048;
++#endif
+ 
+                               /* Lower depths default to config file */
+   pScrn->virtualX = pScrn->display->virtualX;