Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge xf86-video-suncg14 1.1.3, xf86-video-su...
details: https://anonhg.NetBSD.org/xsrc/rev/51ad6d3f2012
branches: trunk
changeset: 7373:51ad6d3f2012
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Jan 08 22:03:02 2023 +0000
description:
merge xf86-video-suncg14 1.1.3, xf86-video-suncg6 1.1.3,
xf86-video-sunffb 1.2.3, xf86-video-sunleo 1.2.3,
and xf86-video-suntcx 1.1.3.
ffb_driver.c probably needs explicit testing that the EXA/XAA
code still works properly.
diffstat:
external/mit/xf86-video-suncg14/dist/README | 20 -
external/mit/xf86-video-suncg14/dist/src/cg14.h | 5 -
external/mit/xf86-video-suncg14/dist/src/cg14_driver.c | 1 +
external/mit/xf86-video-suncg6/dist/README | 20 -
external/mit/xf86-video-suncg6/dist/src/cg6.h | 6 +-
external/mit/xf86-video-sunffb/dist/README | 20 -
external/mit/xf86-video-sunffb/dist/src/ffb.h | 6 +-
external/mit/xf86-video-sunffb/dist/src/ffb_driver.c | 14 +-
external/mit/xf86-video-sunffb/dist/src/ffb_regs.h | 4 +-
external/mit/xf86-video-sunleo/dist/README | 20 -
external/mit/xf86-video-sunleo/dist/src/leo.h | 6 +-
external/mit/xf86-video-sunleo/dist/src/leo_accel.c | 2 +-
external/mit/xf86-video-suntcx/dist/ChangeLog | 87 +-
external/mit/xf86-video-suntcx/dist/Makefile.am | 2 +
external/mit/xf86-video-suntcx/dist/Makefile.in | 295 +-
external/mit/xf86-video-suntcx/dist/README | 20 -
external/mit/xf86-video-suntcx/dist/aclocal.m4 | 20003 +++++++-------
external/mit/xf86-video-suntcx/dist/config.guess | 1704 +-
external/mit/xf86-video-suntcx/dist/config.h.in | 13 +-
external/mit/xf86-video-suntcx/dist/config.sub | 2918 +-
external/mit/xf86-video-suntcx/dist/configure | 17998 +++++++------
external/mit/xf86-video-suntcx/dist/configure.ac | 6 +-
external/mit/xf86-video-suntcx/dist/depcomp | 410 +-
external/mit/xf86-video-suntcx/dist/install-sh | 416 +-
external/mit/xf86-video-suntcx/dist/ltmain.sh | 6292 +++-
external/mit/xf86-video-suntcx/dist/man/Makefile.in | 119 +-
external/mit/xf86-video-suntcx/dist/man/suntcx.man | 3 +-
external/mit/xf86-video-suntcx/dist/missing | 397 +-
external/mit/xf86-video-suntcx/dist/src/Makefile.in | 199 +-
external/mit/xf86-video-suntcx/dist/src/tcx.h | 6 +-
30 files changed, 27817 insertions(+), 23195 deletions(-)
diffs (truncated from 63726 to 300 lines):
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-suncg14/dist/README
--- a/external/mit/xf86-video-suncg14/dist/README Sun Jan 08 21:52:57 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-xf86-video-suncg14 - CG14 video driver for the Xorg X server
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-suncg14
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-suncg14
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-suncg14/dist/src/cg14.h
--- a/external/mit/xf86-video-suncg14/dist/src/cg14.h Sun Jan 08 21:52:57 2023 +0000
+++ b/external/mit/xf86-video-suncg14/dist/src/cg14.h Sun Jan 08 22:03:02 2023 +0000
@@ -26,11 +26,6 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
-#include "xf86RamDac.h"
-#else
-#include "xf86Cursor.h"
-#endif
#include <X11/Xmd.h>
#include "gcstruct.h"
#include "xf86sbusBus.h"
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-suncg14/dist/src/cg14_driver.c
--- a/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c Sun Jan 08 21:52:57 2023 +0000
+++ b/external/mit/xf86-video-suncg14/dist/src/cg14_driver.c Sun Jan 08 22:03:02 2023 +0000
@@ -25,6 +25,7 @@
#include "config.h"
#endif
+#include <unistd.h>
#include <sys/ioctl.h>
#include <string.h>
#include <sys/ioctl.h>
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-suncg6/dist/README
--- a/external/mit/xf86-video-suncg6/dist/README Sun Jan 08 21:52:57 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-xf86-video-suncg6 - GX/Turbo GX video driver for the Xorg X server
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-suncg6
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-suncg6
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-suncg6/dist/src/cg6.h
--- a/external/mit/xf86-video-suncg6/dist/src/cg6.h Sun Jan 08 21:52:57 2023 +0000
+++ b/external/mit/xf86-video-suncg6/dist/src/cg6.h Sun Jan 08 22:03:02 2023 +0000
@@ -26,11 +26,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
-#include "xf86RamDac.h"
-#else
-#include "xf86Cursor.h"
-#endif
+#include "xf86Cursor.h"
#include <X11/Xmd.h>
#include "gcstruct.h"
#include "cg6_regs.h"
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-sunffb/dist/README
--- a/external/mit/xf86-video-sunffb/dist/README Sun Jan 08 21:52:57 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-ffb - SUNFFB video driver for the Xorg X server
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-sunffb
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-sunffb
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-sunffb/dist/src/ffb.h
--- a/external/mit/xf86-video-sunffb/dist/src/ffb.h Sun Jan 08 21:52:57 2023 +0000
+++ b/external/mit/xf86-video-sunffb/dist/src/ffb.h Sun Jan 08 22:03:02 2023 +0000
@@ -30,11 +30,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
-#include "xf86RamDac.h"
-#else
-#include "xf86Cursor.h"
-#endif
+#include "xf86Cursor.h"
#ifdef HAVE_XAA_H
#include "xaa.h"
#endif
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-sunffb/dist/src/ffb_driver.c
--- a/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c Sun Jan 08 21:52:57 2023 +0000
+++ b/external/mit/xf86-video-sunffb/dist/src/ffb_driver.c Sun Jan 08 22:03:02 2023 +0000
@@ -762,17 +762,19 @@
#endif
if (xf86NameCmp(optstr, "EXA") == 0) {
xf86Msg(X_INFO, "using EXA\n");
- if (xf86LoadSubModule(pScrn, "exa") != NULL) {
- if (!FFBInitEXA(pScreen))
- return FALSE;
+ if (xf86LoadSubModule(pScrn, "exa") == NULL ||
+ !FFBInitEXA(pScreen)) {
+ pFfb->NoAccel = TRUE;
+ return FALSE;
}
}
#ifdef HAVE_XAA_H
else if (xf86NameCmp(optstr, "XAA") == 0) {
xf86Msg(X_INFO, "using XAA\n");
- if (xf86LoadSubModule(pScrn, "xaa") != NULL) {
- if (!FFBAccelInit(pScreen, pFfb))
- return FALSE;
+ if (xf86LoadSubModule(pScrn, "xaa") == NULL ||
+ !FFBAccelInit(pScreen, pFfb)) {
+ pFfb->NoAccel = TRUE;
+ return FALSE;
}
}
#endif
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-sunffb/dist/src/ffb_regs.h
--- a/external/mit/xf86-video-sunffb/dist/src/ffb_regs.h Sun Jan 08 21:52:57 2023 +0000
+++ b/external/mit/xf86-video-sunffb/dist/src/ffb_regs.h Sun Jan 08 22:03:02 2023 +0000
@@ -28,7 +28,7 @@
#ifndef FFBREGS_H
#define FFBREGS_H
-/* Auxilliary clips. */
+/* Auxiliary clips. */
typedef struct {
volatile unsigned int min;
volatile unsigned int max;
@@ -148,7 +148,7 @@
/*294*/ volatile unsigned int xpmask; /* X PlaneMask */
/*298*/ volatile unsigned int ypmask; /* Y PlaneMask */
/*29c*/ volatile unsigned int zpmask; /* Z PlaneMask */
-/*2a0*/ ffb_auxclip auxclip[4]; /* Auxilliary Viewport Clip */
+/*2a0*/ ffb_auxclip auxclip[4]; /* Auxiliary Viewport Clip */
/* New 3dRAM III support regs */
/*2c0*/ volatile unsigned int rawblend2;
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-sunleo/dist/README
--- a/external/mit/xf86-video-sunleo/dist/README Sun Jan 08 21:52:57 2023 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-xf86-video-sunleo - Leo video driver for the Xorg X server
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-sunleo
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-sunleo
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-sunleo/dist/src/leo.h
--- a/external/mit/xf86-video-sunleo/dist/src/leo.h Sun Jan 08 21:52:57 2023 +0000
+++ b/external/mit/xf86-video-sunleo/dist/src/leo.h Sun Jan 08 22:03:02 2023 +0000
@@ -26,11 +26,7 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
-#include "xf86RamDac.h"
-#else
-#include "xf86Cursor.h"
-#endif
+#include "xf86Cursor.h"
#include <X11/Xmd.h>
#include "gcstruct.h"
#include "leo_regs.h"
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-sunleo/dist/src/leo_accel.c
--- a/external/mit/xf86-video-sunleo/dist/src/leo_accel.c Sun Jan 08 21:52:57 2023 +0000
+++ b/external/mit/xf86-video-sunleo/dist/src/leo_accel.c Sun Jan 08 22:03:02 2023 +0000
@@ -117,7 +117,7 @@
pLeo->lc0 = lc0 = (LeoCommand0 *) ((char *)pLeo->fb + LEO_LC0_VOFF);
pLeo->ld0 = ld0 = (LeoDraw *) ((char *)pLeo->fb + LEO_LD0_VOFF);
- if (!pLeo->NoAccel) /* XXX do nothing */ ;
+ if (!pLeo->NoAccel) { /* XXX do nothing */ }
/* We will now clear the screen: we'll draw a rectangle covering all the
* viewscreen, using a 'blackness' ROP.
diff -r 6194835c17f3 -r 51ad6d3f2012 external/mit/xf86-video-suntcx/dist/ChangeLog
--- a/external/mit/xf86-video-suntcx/dist/ChangeLog Sun Jan 08 21:52:57 2023 +0000
+++ b/external/mit/xf86-video-suntcx/dist/ChangeLog Sun Jan 08 22:03:02 2023 +0000
@@ -1,3 +1,88 @@
+commit 66e3f631a52dfe423fd99a19f59c41adf2b8f48e
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Fri Dec 9 10:50:07 2022 -0800
+
+ xf86-video-suntcx 1.1.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 6da3b83ea89e4325c3a91d0abaebd328dc98b129
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Fri Dec 9 10:45:50 2022 -0800
+
+ Add supported hardware info to README and man page
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit b97b49a3861815f9f2c250e8c741b7800239bb26
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Thu Jul 28 17:30:21 2022 -0700
+
+ gitlab CI: stop requiring Signed-off-by in commits
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit f93c9fd759f98833311b6d7738bc9c59f88ec193
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Jan 29 11:47:36 2022 -0800
+
+ Include xf86Cursor.h instead of xf86RamDac.h
+
+ ramdac drivers have been removed from xserver since version 21.0.99.1
+ and xorg/xserver@f0385fb4 resulting in the following build failure:
+
+ In file included from ../../src/tcx_cursor.c:31:
+ ../../src/tcx.h:29:10: fatal error: xf86RamDac.h: No such file or directory
+ 29 | #include "xf86RamDac.h"
+ | ^~~~~~~~~~~~~~
+
+ but xf86RamDac.h in turn included xf86Cursor.h which we still need.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 211f8163b0eb669567ec92b44857c1c96f22208f
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Jan 29 11:38:11 2022 -0800
+
+ gitlab CI: add a basic build test
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit b466faaf416b176ae149962e40f679c540603d70
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Jan 29 11:37:18 2022 -0800
+
+ Fix spelling/wording issues
+
+ Found by using:
+ codespell --builtin clear,rare,usage,informal,code,names
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+
+commit 6b810a3ab235713e9128105b5e39db29b0b47ea8
+Author: Alan Coopersmith <alan.coopersmith%oracle.com@localhost>
+Date: Sat Jan 29 11:36:41 2022 -0800
Home |
Main Index |
Thread Index |
Old Index