[pkgsrc/trunk]: pkgsrc/x11/xf86-video-sis xf86-video-sis: Fix build with modu...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc6fafd16940
branches:  trunk
changeset: 380694:dc6fafd16940
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun May 20 06:33:40 2018 +0000

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

diffstat:

 x11/xf86-video-sis/distinfo                        |   3 +-
 x11/xf86-video-sis/patches/patch-src_sis__driver.c |  23 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletions(-)

diffs (39 lines):

diff -r 4f27c928ee17 -r dc6fafd16940 x11/xf86-video-sis/distinfo
--- a/x11/xf86-video-sis/distinfo       Sun May 20 06:16:36 2018 +0000
+++ b/x11/xf86-video-sis/distinfo       Sun May 20 06:33:40 2018 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.12 2017/01/18 18:25:18 wiz Exp $
+$NetBSD: distinfo,v 1.13 2018/05/20 06:33:40 wiz Exp $
 
 SHA1 (xf86-video-sis-0.10.9.tar.bz2) = c0009118307b8cf110d43dbd0a174de2f90dfbcc
 RMD160 (xf86-video-sis-0.10.9.tar.bz2) = 940cae3e90c5dd6dc15e7b4df8047f6260969846
 SHA512 (xf86-video-sis-0.10.9.tar.bz2) = 7cb11d2f1f8be8d92159af7e322a9e4fe4e3436c38932d6d665b8854c2009495e99ff075c7a14d9db9c781114afc8397f0e8c1225d9a2f4bbf1b6a4b6cd6745d
 Size (xf86-video-sis-0.10.9.tar.bz2) = 736272 bytes
+SHA1 (patch-src_sis__driver.c) = 89d5db8b258305c3c02921db57dffb04ae2c7ae2
diff -r 4f27c928ee17 -r dc6fafd16940 x11/xf86-video-sis/patches/patch-src_sis__driver.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-video-sis/patches/patch-src_sis__driver.c        Sun May 20 06:33:40 2018 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_sis__driver.c,v 1.3 2018/05/20 06:33:40 wiz Exp $
+
+commit 4b1356a2b7fd06e9a05d134caa4033681c939737
+Author: Adam Jackson <ajax%redhat.com@localhost>
+Date:   Thu Feb 16 11:21:27 2017 -0500
+
+    Remove reference to ->virtualFrom
+
+    The core will print this information as well anyway.
+
+    Signed-off-by: Adam Jackson <ajax%redhat.com@localhost>
+
+--- src/sis_driver.c.orig      2017-01-17 22:45:12.000000000 +0000
++++ src/sis_driver.c
+@@ -2738,7 +2738,7 @@ SiSPrintModes(ScrnInfoPtr pScrn)
+     float hsync, refresh = 0.0;
+     char *desc, *desc2, *prefix, *uprefix, *output;
+ 
+-    xf86DrvMsg(pScrn->scrnIndex, pScrn->virtualFrom, "Virtual size is %dx%d "
++    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Virtual size is %dx%d "
+              "(pitch %d)\n", pScrn->virtualX, pScrn->virtualY,
+              pScrn->displayWidth);
+