CVS commit: xsrc/external/mit/xf86-video-sis

2020-02-23 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sun Feb 23 11:31:07 UTC 2020

Modified Files:
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c sis_utility.c
xsrc/external/mit/xf86-video-sis/include: config.h

Log Message:
merge xf86-video-sis 0.12.0


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xf86-video-sis/include/config.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.9 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.10
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.9	Mon Dec 31 22:17:21 2018
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c	Sun Feb 23 11:31:06 2020
@@ -1305,7 +1305,7 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, Disp
  * (Code base taken from mga driver)
  */
 static DisplayModePtr
-SiSGetModeFromName(char* str, DisplayModePtr i)
+SiSGetModeFromName(const char* str, DisplayModePtr i)
 {
 DisplayModePtr c = i;
 if(!i) return NULL;
@@ -2148,7 +2148,9 @@ int
 SiSProcXineramaQueryVersion(ClientPtr client)
 {
 xPanoramiXQueryVersionReply	  rep;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
 register int		  n;
+#endif
 
 REQUEST_SIZE_MATCH(xPanoramiXQueryVersionReq);
 rep.type = X_Reply;
@@ -2172,7 +2174,9 @@ SiSProcXineramaGetState(ClientPtr client
 REQUEST(xPanoramiXGetStateReq);
 WindowPtr			pWin;
 xPanoramiXGetStateReply	rep;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
 register int		n;
+#endif
 intrc;
 
 REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
@@ -2198,7 +2202,9 @@ SiSProcXineramaGetScreenCount(ClientPtr 
 REQUEST(xPanoramiXGetScreenCountReq);
 WindowPtrpWin;
 xPanoramiXGetScreenCountReply	rep;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
 register int			n;
+#endif
 int	rc;
 
 REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
@@ -2224,7 +2230,9 @@ SiSProcXineramaGetScreenSize(ClientPtr c
 REQUEST(xPanoramiXGetScreenSizeReq);
 WindowPtrpWin;
 xPanoramiXGetScreenSizeReply	rep;
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
 register int			n;
+#endif
 int	rc;
 
 REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
@@ -2259,7 +2267,9 @@ SiSProcXineramaIsActive(ClientPtr client
 rep.sequenceNumber = client->sequence;
 rep.state = !SiSnoPanoramiXExtension;
 if(client->swapped) {
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
 	register int n;
+#endif
 	_swaps(, n);
 	_swapl(, n);
 	_swapl(, n);
@@ -2280,7 +2290,9 @@ SiSProcXineramaQueryScreens(ClientPtr cl
 rep.number = (SiSnoPanoramiXExtension) ? 0 : SiSXineramaNumScreens;
 rep.length = rep.number * sz_XineramaScreenInfo >> 2;
 if(client->swapped) {
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
register int n;
+#endif
_swaps(, n);
_swapl(, n);
_swapl(, n);
@@ -2297,7 +2309,9 @@ SiSProcXineramaQueryScreens(ClientPtr cl
 	  scratch.width  = SiSXineramadataPtr[i].width;
 	  scratch.height = SiSXineramadataPtr[i].height;
 	  if(client->swapped) {
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
 	 register int n;
+#endif
 	 _swaps(_org, n);
 	 _swaps(_org, n);
 	 _swaps(, n);
@@ -2337,7 +2351,9 @@ static int
 SiSSProcXineramaQueryVersion (ClientPtr client)
 {
 REQUEST(xPanoramiXQueryVersionReq);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
 register int n;
+#endif
 _swaps(>length,n);
 REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
 return SiSProcXineramaQueryVersion(client);
@@ -2347,7 +2363,9 @@ static int
 SiSSProcXineramaGetState(ClientPtr client)
 {
 REQUEST(xPanoramiXGetStateReq);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
 register int n;
+#endif
 _swaps (>length, n);
 REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
 return SiSProcXineramaGetState(client);
@@ -2357,7 +2375,9 @@ static int
 SiSSProcXineramaGetScreenCount(ClientPtr client)
 {
 REQUEST(xPanoramiXGetScreenCountReq);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
 register int n;
+#endif
 _swaps (>length, n);
 REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
 return SiSProcXineramaGetScreenCount(client);
@@ -2367,7 +2387,9 @@ static int
 SiSSProcXineramaGetScreenSize(ClientPtr client)
 {
 REQUEST(xPanoramiXGetScreenSizeReq);
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
 register int n;
+#endif
 _swaps (>length, n);
 REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
 return SiSProcXineramaGetScreenSize(client);
@@ -2377,7 +2399,9 @@ static int
 SiSSProcXineramaIsActive(ClientPtr client)
 {
 REQUEST(xXineramaIsActiveReq);
+#if

CVS commit: xsrc/external/mit/xf86-video-sis/dist/src

2016-10-01 Thread Maya Rashish 
Module Name:xsrc
Committed By:   maya
Date:   Sat Oct  1 22:02:17 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-sis/dist/src: sis_utility.c

Log Message:
add const. we aren't modifying the values here.
fixes new xorg-server build error


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c:1.1.1.3 xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c:1.2
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c:1.1.1.3	Mon Jun  3 08:43:21 2013
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c	Sat Oct  1 22:02:17 2016
@@ -850,7 +850,7 @@ SISGetMergedModeDetails(ScrnInfoPtr pScr
  ***/
 
 static void
-sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, char *mystring)
+sisutil_prepare_string(xSiSCtrlCommandReply *sdcbuf, const char *mystring)
 {
int slen = 0;
sdcbuf->sdc_buffer[0] = 0;

CVS commit: xsrc/external/mit/xf86-video-sis/include

2016-08-15 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 17:44:03 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-sis/include: config.h

Log Message:
update for xf86-video-sis 0.10.8


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-sis/include/config.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/include/config.h
diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.7 xsrc/external/mit/xf86-video-sis/include/config.h:1.8
--- xsrc/external/mit/xf86-video-sis/include/config.h:1.7	Mon Jun  3 09:23:42 2013
+++ xsrc/external/mit/xf86-video-sis/include/config.h	Mon Aug 15 17:44:03 2016
@@ -33,8 +33,10 @@
 /* Define to 1 if you have the  header file. */
 #define HAVE_UNISTD_H 1
 
+#if 0
  /* Define to 1 if you have the  header file. */
 #define HAVE_XAA_H 1
+#endif
 
 /* xextproto 7.1 available */
 #define HAVE_XEXTPROTO_71 1
@@ -53,7 +55,7 @@
 #define PACKAGE_NAME "xf86-video-sis"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xf86-video-sis 0.10.7"
+#define PACKAGE_STRING "xf86-video-sis 0.10.8"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "xf86-video-sis"
@@ -63,7 +65,7 @@
 
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.7"
+#define PACKAGE_VERSION "0.10.8"
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 0
@@ -72,7 +74,7 @@
 #define PACKAGE_VERSION_MINOR 10
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 7
+#define PACKAGE_VERSION_PATCHLEVEL 8
 
 /* Enable DRI driver support */
 #undef SISDRI
@@ -84,7 +86,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.10.7"
+#define VERSION "0.10.8"
 
 /* Build support for Exa */
 #define XF86EXA 1

CVS commit: xsrc/external/mit/xf86-video-sis/dist/src

2016-08-15 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Mon Aug 15 17:42:06 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c

Log Message:
merge xf86-video-sis 0.10.8


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.5 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.6
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.5	Sun Feb 28 15:22:34 2016
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c	Mon Aug 15 17:42:06 2016
@@ -57,7 +57,6 @@
 #include "fb.h"
 #include "micmap.h"
 #include "mipointer.h"
-#include "mibstore.h"
 #include "edid.h"
 
 #define SIS_NEED_inSISREG
@@ -94,6 +93,10 @@
 #include "dri.h"
 #endif
 
+#ifndef DEFAULT_DPI
+#define DEFAULT_DPI 96
+#endif
+
 /*
  * LookupWindow was removed with video abi 11.
  */
@@ -426,14 +429,14 @@ SISErrorLog(ScrnInfoPtr pScrn, const cha
 static const char str[] = "**\n";
 
 va_start(ap, format);
-xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
+xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 	"  ERROR:\n");
 xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap);
 va_end(ap);
 xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
 	"  END OF MESSAGE\n");
-xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
+xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str);
 }
 
 static void
@@ -1911,14 +1914,14 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr 
if(infochanged && !usenonrect) {
 	  xf86DrvMsg(pScrn1->scrnIndex, X_INFO,
 			"Virtual screen size does not match maximum display modes...\n");
-	  xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine);
+	  xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "%s", rectxine);
 
}
 } else if(infochanged && usenonrect) {
usenonrect = FALSE;
xf86DrvMsg(pScrn1->scrnIndex, X_INFO,
 		"Only clone modes available for this virtual screen size...\n");
-   xf86DrvMsg(pScrn1->scrnIndex, X_INFO, rectxine);
+   xf86DrvMsg(pScrn1->scrnIndex, X_INFO, "%s", rectxine);
 }
 
 if(pSiS->maxCRT1_X1) {		/* Means we have at least one non-clone mode */
@@ -3276,9 +3279,11 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
 pSiS->PciDevice = PCI_CFG_DEV(pSiS->PciInfo); /*SIS_PCI_DEVICE(pSiS->PciInfo);*/
 pSiS->PciFunc = PCI_CFG_FUNC(pSiS->PciInfo);  /*SIS_PCI_FUNC(pSiS->PciInfo);*/
 
+#ifndef XSERVER_LIBPCIACCESS
 pSiS->PciTag = pciTag(PCI_DEV_BUS(pSiS->PciInfo),
 			  PCI_DEV_DEV(pSiS->PciInfo),
 			  PCI_DEV_FUNC(pSiS->PciInfo));
+#endif
 
 #ifdef SIS_NEED_MAP_IOP
 //
@@ -3902,7 +3907,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
if(pSiSEnt) pSiSEnt->SiS_Pr = pSiS->SiS_Pr;
 #endif
memset(pSiS->SiS_Pr, 0, sizeof(struct SiS_Private));
+#ifndef XSERVER_LIBPCIACCESS
pSiS->SiS_Pr->PciTag = pSiS->PciTag;
+#endif
pSiS->SiS_Pr->ChipType = pSiS->ChipType;
pSiS->SiS_Pr->ChipRevision = pSiS->ChipRev;
pSiS->SiS_Pr->SiS_Backup70xx = 0xff;
@@ -7131,7 +7138,9 @@ static Bool
 SISMapMem(ScrnInfoPtr pScrn)
 {
 SISPtr pSiS = SISPTR(pScrn);
+#ifndef XSERVER_LIBPCIACCESS
 int mmioFlags = VIDMEM_MMIO;
+#endif
 #ifdef SISDUALHEAD
 SISEntPtr pSiSEnt = pSiS->entityPrivate;
 #endif
@@ -7141,9 +7150,11 @@ SISMapMem(ScrnInfoPtr pScrn)
  * (For Alpha, we need to map SPARSE memory, since we need
  * byte/short access.)
  */
+#ifndef XSERVER_LIBPCIACCESS
 #if defined(__alpha__)
 mmioFlags |= VIDMEM_SPARSE;
 #endif
+#endif
 
 #ifdef SISDUALHEAD
 if(pSiS->DualHeadMode) {
@@ -7344,7 +7355,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
 if(pSiSEnt->MapCountIOBase) {
 	pSiSEnt->MapCountIOBase--;
 	if((pSiSEnt->MapCountIOBase == 0) || (pSiSEnt->forceUnmapIOBase)) {
+#ifndef XSERVER_LIBPCIACCESS
 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
+#else
+	pci_device_unmap_range(pSiS->PciInfo, pSiSEnt->IOBase, (pSiS->mmioSize * 1024));
+#endif
 		pSiSEnt->IOBase = NULL;
 		pSiSEnt->MapCountIOBase = 0;
 		pSiSEnt->forceUnmapIOBase = FALSE;
@@ -7355,7 +7370,11 @@ SISUnmapMem(ScrnInfoPtr pScrn)
 	if(pSiSEnt->MapCountIOBaseDense) {
 	pSiSEnt->MapCountIOBaseDense--;
 	if((pSiSEnt->MapCountIOBaseDense == 0) || (pSiSEnt->forceUnmapIOBaseDense)) {
+#ifndef XSERVER_LIBPCIACCESS
 		xf86UnMapVidMem(pScrn->scrnIndex, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
+#else
+		pci_device_unmap_range(pSiS->PciInfo, (pointer)pSiSEnt->IOBaseDense, (pSiS->mmioSize * 1024));
+#endif
 		pSiSEnt->IOBaseDense = NULL;
 		pSiSEnt->MapCountIOBaseDense

CVS commit: xsrc/external/mit/xf86-video-sis/dist/src

2016-02-28 Thread Joerg Sonnenberger 
Module Name:xsrc
Committed By:   joerg
Date:   Sun Feb 28 22:15:26 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-sis/dist/src: sis300_accel.h

Log Message:
MMIO32 arguments are CARD32, so cast to the unsigned type before doing
left shifts.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h:1.1.1.2 xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h:1.2
--- xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h:1.1.1.2	Wed Jun 10 00:48:31 2009
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h	Sun Feb 28 22:15:26 2016
@@ -130,7 +130,7 @@
 
 #define SiSSetupSRCXY(x,y) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, BR(2), (x)<<16 | (y) );\
+SIS_MMIO_OUT32(pSiS->IOBase, BR(2), (CARD32)(x)<<16 | (CARD32)(y) );\
 CmdQueLen--;
 
 #define SiSSetupDSTBase(base) \
@@ -140,12 +140,12 @@
 
 #define SiSSetupDSTXY(x,y) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, BR(3), (x)<<16 | (y) );\
+SIS_MMIO_OUT32(pSiS->IOBase, BR(3), (CARD32)(x)<<16 | (CARD32)(y) );\
 CmdQueLen--;
 
 #define SiSSetupDSTRect(x,y) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, BR(5), (y)<<16 | (x) );\
+SIS_MMIO_OUT32(pSiS->IOBase, BR(5), (CARD32)(y)<<16 | (CARD32)(x) );\
 CmdQueLen--;
 
 #define SiSSetupDSTColorDepth(bpp) \
@@ -157,7 +157,7 @@
 
 #define SiSSetupRect(w,h) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, BR(6), (h)<<16 | (w) );\
+SIS_MMIO_OUT32(pSiS->IOBase, BR(6), (CARD32)(h)<<16 | (CARD32)(w) );\
 CmdQueLen--;
 
 #define SiSSetupPATFG(color) \
@@ -204,12 +204,12 @@
 
 #define SiSSetupClipLT(left,top) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, BR(13), ((left) & 0x) | (top)<<16 );\
+SIS_MMIO_OUT32(pSiS->IOBase, BR(13), ((left) & 0x) | (CARD32)(top)<<16 );\
 CmdQueLen--;
 
 #define SiSSetupClipRB(right,bottom) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, BR(14), ((right) & 0x) | (bottom)<<16 );\
+SIS_MMIO_OUT32(pSiS->IOBase, BR(14), ((right) & 0x) | (CARD32)(bottom)<<16 );\
 CmdQueLen--;
 
 /* General */
@@ -235,12 +235,12 @@
 /* Line */
 #define SiSSetupX0Y0(x,y) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, BR(2), (y)<<16 | (x) );\
+SIS_MMIO_OUT32(pSiS->IOBase, BR(2), (CARD32)(y)<<16 | (CARD32)(x) );\
 CmdQueLen--;
 
 #define SiSSetupX1Y1(x,y) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, BR(3), (y)<<16 | (x) );\
+SIS_MMIO_OUT32(pSiS->IOBase, BR(3), (CARD32)(y)<<16 | (CARD32)(x) );\
 CmdQueLen--;
 
 #define SiSSetupLineCount(c) \
@@ -266,22 +266,22 @@
 /* Trapezoid */
 #define SiSSetupYH(y,h) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, 0x8208, (y)<<16 | (h) );\
+SIS_MMIO_OUT32(pSiS->IOBase, 0x8208, (CARD32)(y)<<16 | (CARD32)(h) );\
 CmdQueLen--;
 
 #define SiSSetupLR(left,right) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, 0x820C, (right)<<16 | (left) );\
+SIS_MMIO_OUT32(pSiS->IOBase, 0x820C, (CARD32)(right)<<16 | (CARD32)(left) );\
 CmdQueLen--;
 
 #define SiSSetupdL(dxL,dyL) \
 if (CmdQueLen <= 0)  SiSIdle;\
-SIS_MMIO_OUT32(pSiS->IOBase, 0x8244, (dyL)<<16 | (dxL) );\
+SIS_MMIO_OUT32(pSiS->IOBase, 0x8244, (CARD32)(dyL)<<16 | (CARD32)(dxL) );\
 CmdQueLen--;
 
 #define SiSSetupdR(dxR,dyR) \
 if (CmdQueLen <= 0)  SiSIdle;\
-		SIS_MMIO_OUT32(pSiS->IOBase, 0x8248, (dyR)<<16 | (dxR) );\
+		SIS_MMIO_OUT32(pSiS->IOBase, 0x8248, (CARD32)(dyR)<<16 | (CARD32)(dxR) );\
 CmdQueLen--;
 
 #define SiSSetupEL(eL) \

CVS commit: xsrc/external/mit/xf86-video-sis/dist/src

2016-02-28 Thread Joerg Sonnenberger 
Module Name:xsrc
Committed By:   joerg
Date:   Sun Feb 28 15:22:35 UTC 2016

Modified Files:
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c

Log Message:
Avoid non-literal format string warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.4 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.5
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.4	Thu Mar 20 01:04:22 2014
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c	Sun Feb 28 15:22:34 2016
@@ -423,7 +423,7 @@ static void
 SISErrorLog(ScrnInfoPtr pScrn, const char *format, ...)
 {
 va_list ap;
-static const char *str = "**\n";
+static const char str[] = "**\n";
 
 va_start(ap, format);
 xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str);
@@ -1782,7 +1782,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr 
 DisplayModePtr currentMode, firstMode;
 Bool infochanged = FALSE;
 Bool usenonrect = pSiS->NonRect;
-const char *rectxine = "\t... setting up rectangular Xinerama layout\n";
+static const char rectxine[] = "\t... setting up rectangular Xinerama layout\n";
 
 pSiS->MBXNR1XMAX = pSiS->MBXNR1YMAX = pSiS->MBXNR2XMAX = pSiS->MBXNR2YMAX = 65536;
 pSiS->HaveNonRect = pSiS->HaveOffsRegions = FALSE;

CVS commit: xsrc/external/mit/xf86-video-sis/include

2013-06-03 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Mon Jun  3 09:23:42 UTC 2013

Modified Files:
xsrc/external/mit/xf86-video-sis/include: config.h

Log Message:
update for xf86-video-sis 0.10.7


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-video-sis/include/config.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/include/config.h
diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.6 xsrc/external/mit/xf86-video-sis/include/config.h:1.7
--- xsrc/external/mit/xf86-video-sis/include/config.h:1.6	Sat Jul 17 07:07:00 2010
+++ xsrc/external/mit/xf86-video-sis/include/config.h	Mon Jun  3 09:23:42 2013
@@ -33,6 +33,9 @@
 /* Define to 1 if you have the unistd.h header file. */
 #define HAVE_UNISTD_H 1
 
+ /* Define to 1 if you have the xaa.h header file. */
+#define HAVE_XAA_H 1
+
 /* xextproto 7.1 available */
 #define HAVE_XEXTPROTO_71 1
 
@@ -50,13 +53,17 @@
 #define PACKAGE_NAME xf86-video-sis
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING xf86-video-sis 0.10.3
+#define PACKAGE_STRING xf86-video-sis 0.10.7
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME xf86-video-sis
+  
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION 0.10.3
+#define PACKAGE_VERSION 0.10.7
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 0
@@ -65,19 +72,19 @@
 #define PACKAGE_VERSION_MINOR 10
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 3
+#define PACKAGE_VERSION_PATCHLEVEL 7
+
+/* Enable DRI driver support */
+#undef SISDRI
+
+/* Enable developmental DRI driver support */
+#undef SISDRI_DEVEL
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION 0.10.3
-
-/* Enable DRI driver support */
-#define XF86DRI 1
-
-/* Enable developmental DRI driver support */
-#define XF86DRI_DEVEL 1
+#define VERSION 0.10.7
 
 /* Build support for Exa */
 #define XF86EXA 1

CVS commit: xsrc/external/mit/xf86-video-sis/dist/src

2012-03-14 Thread Martin Husemann 
Module Name:xsrc
Committed By:   martin
Date:   Wed Mar 14 13:47:40 UTC 2012

Modified Files:
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c

Log Message:
henning petersen in PR xsrc/46172: do not used removed function
miPointerAbsoluteCursor(), replace with miPointerSetPosition().


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.4 -r1.2 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
diff -u xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.1.1.4 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.2
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.1.1.4	Sat Jul 17 06:32:06 2010
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c	Wed Mar 14 13:47:40 2012
@@ -86,6 +86,7 @@
 #include X11/extensions/dpms.h
 #endif
 
+#include inputstr.h
 
 #ifdef XF86DRI
 #include dri.h
@@ -9322,9 +9323,8 @@ SISMergedPointerMoved(int scrnIndex, int
 	}
  }
  if(doit) {
-	UpdateCurrentTime();
 	sigstate = xf86BlockSIGIO();
-	miPointerAbsoluteCursor(x, y, currentTime.milliseconds);
+	miPointerSetPosition(inputInfo.pointer, x, y);
 	xf86UnblockSIGIO(sigstate);
 	return;
  }

CVS commit: xsrc/external/mit/xf86-video-sis/dist

2010-07-17 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 17 06:32:09 UTC 2010

Update of /cvsroot/xsrc/external/mit/xf86-video-sis/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv23402

Log Message:
initial import of xf86-video-sis-0.10.3

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-sis-0-10-3

U xsrc/external/mit/xf86-video-sis/dist/COPYING
U xsrc/external/mit/xf86-video-sis/dist/install-sh
U xsrc/external/mit/xf86-video-sis/dist/config.h.in
U xsrc/external/mit/xf86-video-sis/dist/README
N xsrc/external/mit/xf86-video-sis/dist/INSTALL
U xsrc/external/mit/xf86-video-sis/dist/config.sub
U xsrc/external/mit/xf86-video-sis/dist/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/ChangeLog
U xsrc/external/mit/xf86-video-sis/dist/ltmain.sh
U xsrc/external/mit/xf86-video-sis/dist/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/missing
U xsrc/external/mit/xf86-video-sis/dist/aclocal.m4
U xsrc/external/mit/xf86-video-sis/dist/configure.ac
U xsrc/external/mit/xf86-video-sis/dist/depcomp
U xsrc/external/mit/xf86-video-sis/dist/configure
U xsrc/external/mit/xf86-video-sis/dist/config.guess
U xsrc/external/mit/xf86-video-sis/dist/src/sispcirename.h
U xsrc/external/mit/xf86-video-sis/dist/src/osdef.h
U xsrc/external/mit/xf86-video-sis/dist/src/310vtbl.h
U xsrc/external/mit/xf86-video-sis/dist/src/oem300.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.h
U xsrc/external/mit/xf86-video-sis/dist/src/initextx.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.h
U xsrc/external/mit/xf86-video-sis/dist/src/300vtbl.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_videostr.h
U xsrc/external/mit/xf86-video-sis/dist/src/vstruct.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/init301.h
U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/src/sis_vb.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.h
U xsrc/external/mit/xf86-video-sis/dist/src/init301.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis6326_video.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_regs.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_opt.c
U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/src/sis_common.h
U xsrc/external/mit/xf86-video-sis/dist/src/initextx.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/vgatypes.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dga.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_setup.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.h
U xsrc/external/mit/xf86-video-sis/dist/src/init.c
U xsrc/external/mit/xf86-video-sis/dist/src/oem310.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_memcpy.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
U xsrc/external/mit/xf86-video-sis/dist/src/init.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_shadow.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.h
U xsrc/external/mit/xf86-video-sis/dist/src/initdef.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_vga.c
U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/man/sis.man

No conflicts created by this import

CVS commit: xsrc/external/mit/xf86-video-sis/dist

2010-07-17 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 17 06:35:13 UTC 2010

Removed Files:
xsrc/external/mit/xf86-video-sis/dist: README.sgml

Log Message:
merge xf86-video-sis 0.10.3


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xf86-video-sis/dist/README.sgml

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

CVS commit: xsrc/external/mit/xf86-video-sis/include

2010-07-17 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Sat Jul 17 06:41:22 UTC 2010

Modified Files:
xsrc/external/mit/xf86-video-sis/include: config.h

Log Message:
update for xf86-video-sis 0.10.3


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-sis/include/config.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/include/config.h
diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.4 xsrc/external/mit/xf86-video-sis/include/config.h:1.5
--- xsrc/external/mit/xf86-video-sis/include/config.h:1.4	Sun Jan 10 09:59:27 2010
+++ xsrc/external/mit/xf86-video-sis/include/config.h	Sat Jul 17 06:41:22 2010
@@ -36,6 +36,10 @@
 /* xextproto 7.1 available */
 /* #undef HAVE_XEXTPROTO_71 */
 
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
 /* Name of package */
 #define PACKAGE xf86-video-sis
 
@@ -46,13 +50,13 @@
 #define PACKAGE_NAME xf86-video-sis
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING xf86-video-sis 0.10.2
+#define PACKAGE_STRING xf86-video-sis 0.10.3
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME xf86-video-sis
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION 0.10.2
+#define PACKAGE_VERSION 0.10.3
 
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 0
@@ -61,13 +65,13 @@
 #define PACKAGE_VERSION_MINOR 10
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 2
+#define PACKAGE_VERSION_PATCHLEVEL 3
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION 0.10.2
+#define VERSION 0.10.3
 
 /* Enable DRI driver support */
 #define XF86DRI 1

CVS commit: xsrc/external/mit/xf86-video-sis/include

2010-01-10 Thread Bernd Ernesti 
Module Name:xsrc
Committed By:   veego
Date:   Sun Jan 10 09:59:27 UTC 2010

Modified Files:
xsrc/external/mit/xf86-video-sis/include: config.h

Log Message:
Regenerate to match current source
* Commented entry added (HAVE_XEXTPROTO_71)


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-sis/include/config.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/include/config.h
diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.3 xsrc/external/mit/xf86-video-sis/include/config.h:1.4
--- xsrc/external/mit/xf86-video-sis/include/config.h:1.3	Sat Aug 22 01:02:05 2009
+++ xsrc/external/mit/xf86-video-sis/include/config.h	Sun Jan 10 09:59:27 2010
@@ -33,6 +33,9 @@
 /* Define to 1 if you have the unistd.h header file. */
 #define HAVE_UNISTD_H 1
 
+/* xextproto 7.1 available */
+/* #undef HAVE_XEXTPROTO_71 */
+
 /* Name of package */
 #define PACKAGE xf86-video-sis

CVS commit: xsrc/external/mit/xf86-video-sis/include

2009-06-10 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 06:41:24 UTC 2009

Modified Files:
xsrc/external/mit/xf86-video-sis/include: config.h

Log Message:
update this for xf86-video-sis 0.10.1


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 xsrc/external/mit/xf86-video-sis/include/config.h

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

Modified files:

Index: xsrc/external/mit/xf86-video-sis/include/config.h
diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.1 xsrc/external/mit/xf86-video-sis/include/config.h:1.2
--- xsrc/external/mit/xf86-video-sis/include/config.h:1.1	Mon Sep  1 05:35:20 2008
+++ xsrc/external/mit/xf86-video-sis/include/config.h	Wed Jun 10 06:41:24 2009
@@ -43,15 +43,14 @@
 #define PACKAGE_NAME xf86-video-sis
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING xf86-video-sis 0.10.0
+#define PACKAGE_STRING xf86-video-sis 0.10.1
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME xf86-video-sis
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION 0.10.0
+#define PACKAGE_VERSION 0.10.1
 
-#if 0
 /* Major version of this package */
 #define PACKAGE_VERSION_MAJOR 0
 
@@ -59,14 +58,13 @@
 #define PACKAGE_VERSION_MINOR 10
 
 /* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 0
-#endif
+#define PACKAGE_VERSION_PATCHLEVEL 1
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION 0.10.0
+#define VERSION 0.10.1
 
 /* Enable DRI driver support */
 #define XF86DRI 1

CVS commit: xsrc/external/mit/xf86-video-sis/dist

2009-06-09 Thread matthew green 
Module Name:xsrc
Committed By:   mrg
Date:   Wed Jun 10 00:48:37 UTC 2009

Update of /cvsroot/xsrc/external/mit/xf86-video-sis/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv16325

Log Message:
initial import of xf86-video-sis-0.10.1

Status:

Vendor Tag: xorg
Release Tags:   xf86-video-sis-0-10-1

U xsrc/external/mit/xf86-video-sis/dist/COPYING
U xsrc/external/mit/xf86-video-sis/dist/install-sh
U xsrc/external/mit/xf86-video-sis/dist/config.h.in
U xsrc/external/mit/xf86-video-sis/dist/README
U xsrc/external/mit/xf86-video-sis/dist/config.sub
U xsrc/external/mit/xf86-video-sis/dist/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/ChangeLog
U xsrc/external/mit/xf86-video-sis/dist/ltmain.sh
U xsrc/external/mit/xf86-video-sis/dist/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/missing
U xsrc/external/mit/xf86-video-sis/dist/aclocal.m4
U xsrc/external/mit/xf86-video-sis/dist/configure.ac
U xsrc/external/mit/xf86-video-sis/dist/depcomp
U xsrc/external/mit/xf86-video-sis/dist/configure
U xsrc/external/mit/xf86-video-sis/dist/README.sgml
U xsrc/external/mit/xf86-video-sis/dist/config.guess
N xsrc/external/mit/xf86-video-sis/dist/src/sispcirename.h
U xsrc/external/mit/xf86-video-sis/dist/src/osdef.h
U xsrc/external/mit/xf86-video-sis/dist/src/310vtbl.h
U xsrc/external/mit/xf86-video-sis/dist/src/oem300.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_utility.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.h
U xsrc/external/mit/xf86-video-sis/dist/src/initextx.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_video.h
U xsrc/external/mit/xf86-video-sis/dist/src/300vtbl.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_videostr.h
U xsrc/external/mit/xf86-video-sis/dist/src/vstruct.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/init301.h
U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/src/sis_vb.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dri.h
U xsrc/external/mit/xf86-video-sis/dist/src/init301.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis6326_video.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_regs.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_opt.c
U xsrc/external/mit/xf86-video-sis/dist/src/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/src/sis_common.h
U xsrc/external/mit/xf86-video-sis/dist/src/initextx.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis300_accel.c
U xsrc/external/mit/xf86-video-sis/dist/src/vgatypes.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis310_accel.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dga.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_setup.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.h
U xsrc/external/mit/xf86-video-sis/dist/src/init.c
U xsrc/external/mit/xf86-video-sis/dist/src/oem310.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_memcpy.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
U xsrc/external/mit/xf86-video-sis/dist/src/init.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_dac.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_shadow.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.h
U xsrc/external/mit/xf86-video-sis/dist/src/initdef.h
U xsrc/external/mit/xf86-video-sis/dist/src/sis_cursor.c
U xsrc/external/mit/xf86-video-sis/dist/src/sis_vga.c
U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.am
U xsrc/external/mit/xf86-video-sis/dist/man/Makefile.in
U xsrc/external/mit/xf86-video-sis/dist/man/sis.man

No conflicts created by this import