Module Name: xsrc
Committed By: mrg
Date: Sun Mar 5 01:42:55 UTC 2017
Modified Files:
xsrc/external/mit/xf86-video-siliconmotion/dist/src: smi.h smi_driver.c
xsrc/external/mit/xf86-video-sis/dist/src: sis_driver.c
xsrc/external/mit/xf86-video-sis/include: config.h
xsrc/external/mit/xf86-video-sunleo/dist/src: leo_accel.c
Log Message:
merge xf86-video-siliconmotion 1.7.9, xf86-video-sis 0.10.9, and
xf86-video-sunleo 1.2.2.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h
cvs rdiff -u -r1.8 -r1.9 \
xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-sis/include/config.h
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.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-siliconmotion/dist/src/smi.h
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.7 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.8
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h:1.7 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi.h Sun Mar 5 01:42:54 2017
@@ -34,6 +34,7 @@ authorization from the XFree86 Project a
#include <string.h>
#include <stdio.h>
+#include <X11/Xarch.h>
#include "xf86.h"
#include "xf86_OSproc.h"
Index: xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c
diff -u xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.8 xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.9
--- xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c:1.8 Sun Oct 9 19:04:06 2016
+++ xsrc/external/mit/xf86-video-siliconmotion/dist/src/smi_driver.c Sun Mar 5 01:42:54 2017
@@ -486,8 +486,7 @@ SMI_PreInit(ScrnInfoPtr pScrn, int flags
if (pScrn->depth > 8) {
/* The defaults are OK for us */
rgb zeros = {0, 0, 0};
-
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if X_BYTE_ORDER == X_BIG_ENDIAN
rgb masks = {0xff00,0xff0000,0xff000000};
#else
rgb masks = {0, 0, 0};
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.6 xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.7
--- xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c:1.6 Mon Aug 15 17:42:06 2016
+++ xsrc/external/mit/xf86-video-sis/dist/src/sis_driver.c Sun Mar 5 01:42:55 2017
@@ -9395,7 +9395,7 @@ SISMergedPointerMoved(SCRN_ARG_TYPE arg,
y = (int)dy;
}
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 13
- miPointerSetPosition(inputInfo.pointer, Absolute, x, y);
+ miPointerSetPosition(inputInfo.pointer, Absolute, &x, &y);
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
miPointerSetPosition(inputInfo.pointer, &x, &y);
#else
Index: xsrc/external/mit/xf86-video-sis/include/config.h
diff -u xsrc/external/mit/xf86-video-sis/include/config.h:1.8 xsrc/external/mit/xf86-video-sis/include/config.h:1.9
--- xsrc/external/mit/xf86-video-sis/include/config.h:1.8 Mon Aug 15 17:44:03 2016
+++ xsrc/external/mit/xf86-video-sis/include/config.h Sun Mar 5 01:42:55 2017
@@ -55,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.8"
+#define PACKAGE_STRING "xf86-video-sis 0.10.9"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xf86-video-sis"
@@ -65,7 +65,7 @@
/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.10.8"
+#define PACKAGE_VERSION "0.10.9"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 0
@@ -74,7 +74,7 @@
#define PACKAGE_VERSION_MINOR 10
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 8
+#define PACKAGE_VERSION_PATCHLEVEL 9
/* Enable DRI driver support */
#undef SISDRI
@@ -86,7 +86,7 @@
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION "0.10.8"
+#define VERSION "0.10.9"
/* Build support for Exa */
#define XF86EXA 1
Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.6 xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.7
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c:1.6 Tue Jun 4 22:20:42 2013
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo_accel.c Sun Mar 5 01:42:55 2017
@@ -34,8 +34,6 @@
#include <X11/fonts/fontstruct.h>
#include "dixfontstr.h"
#include "fb.h"
-#include "mifillarc.h"
-#include "miwideline.h"
#include "mi.h"
#include "leo.h"
