[Midnightbsd-cvs] mports [19975] trunk/x11-drivers/xf86-video-sis: fix sis driver

[laffer1 at midnightbsd.org]

Revision: 19975
          http://svnweb.midnightbsd.org/mports/?rev=19975
Author:   laffer1
Date:     2015-08-22 18:48:31 -0400 (Sat, 22 Aug 2015)
Log Message:
-----------
fix sis driver

Modified Paths:
--------------
    trunk/x11-drivers/xf86-video-sis/Makefile

Added Paths:
-----------
    trunk/x11-drivers/xf86-video-sis/files/
    trunk/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c

Modified: trunk/x11-drivers/xf86-video-sis/Makefile
===================================================================
--- trunk/x11-drivers/xf86-video-sis/Makefile	2015-08-22 22:44:44 UTC (rev 19974)
+++ trunk/x11-drivers/xf86-video-sis/Makefile	2015-08-22 22:48:31 UTC (rev 19975)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xf86-video-sis
 PORTVERSION=	0.10.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	ports at MidnightBSD.org

Added: trunk/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c	2015-08-22 22:48:31 UTC (rev 19975)
@@ -0,0 +1,40 @@
+--- src/sis_driver.c.orig	2012-07-17 05:20:28 UTC
++++ src/sis_driver.c
+@@ -57,7 +57,6 @@
+ #include "fb.h"
+ #include "micmap.h"
+ #include "mipointer.h"
+-#include "mibstore.h"
+ #include "edid.h"
+ 
+ #define SIS_NEED_inSISREG
+@@ -8859,7 +8858,6 @@ SISScreenInit(SCREEN_INIT_ARGS_DECL)
+     }
+     pSiS->SiSFastVidCopyDone = TRUE;
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 
+@@ -9351,11 +9349,12 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg,
+ 	}
+      }
+      if(doit) {
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 20 /* screw it */
+ 	sigstate = xf86BlockSIGIO();
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15
+         {
+             double dx = x, dy = y;
+-            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy);
++            miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, NULL, NULL);
+             x = (int)dx;
+             y = (int)dy;
+         }
+@@ -9368,6 +9367,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg,
+ 	miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
+ #endif
+ 	xf86UnblockSIGIO(sigstate);
++#endif
+ 	return;
+      }
+   }


Property changes on: trunk/x11-drivers/xf86-video-sis/files/patch-src_sis__driver.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property