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

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun May 20 07:32:50 UTC 2018

Modified Files:
        pkgsrc/x11/xf86-video-s3virge: distinfo
Added Files:
        pkgsrc/x11/xf86-video-s3virge/patches: patch-src_s3v__driver.c

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


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/x11/xf86-video-s3virge/distinfo
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/x11/xf86-video-s3virge/patches/patch-src_s3v__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-s3virge/distinfo
diff -u pkgsrc/x11/xf86-video-s3virge/distinfo:1.9 pkgsrc/x11/xf86-video-s3virge/distinfo:1.10
--- pkgsrc/x11/xf86-video-s3virge/distinfo:1.9  Wed Nov  4 03:29:03 2015
+++ pkgsrc/x11/xf86-video-s3virge/distinfo      Sun May 20 07:32:50 2018
@@ -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

Added files:

Index: pkgsrc/x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c
diff -u /dev/null pkgsrc/x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c:1.3
--- /dev/null   Sun May 20 07:32:50 2018
+++ pkgsrc/x11/xf86-video-s3virge/patches/patch-src_s3v__driver.c       Sun May 20 07:32:50 2018
@@ -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;