Module Name: xsrc
Committed By: mrg
Date: Fri Jul 15 04:30:06 UTC 2022
Modified Files:
xsrc/external/mit/xf86-video-ag10e/dist/src: ag10e.h
xsrc/external/mit/xf86-video-crime/dist/src: crime.h
xsrc/external/mit/xf86-video-glint/dist/src: glint.h
xsrc/external/mit/xf86-video-igs/dist/src: igs.h
xsrc/external/mit/xf86-video-mgx/dist/src: mgx.h
xsrc/external/mit/xf86-video-pnozz/dist/src: pnozz.h
xsrc/external/mit/xf86-video-suncg14/dist/src: cg14.h
xsrc/external/mit/xf86-video-suncg6/dist/src: cg6.h
xsrc/external/mit/xf86-video-sunffb/dist/src: ffb.h
xsrc/external/mit/xf86-video-sunleo/dist/src: leo.h
xsrc/external/mit/xf86-video-suntcx/dist/src: tcx.h
xsrc/external/mit/xf86-video-tga/dist/src: tga.h
xsrc/external/mit/xf86-video-trident/dist/src: trident.h
Log Message:
more xf86RamDac.h vs xf86Cursor.h.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-crime/dist/src/crime.h
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/xf86-video-glint/dist/src/glint.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-igs/dist/src/igs.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-mgx/dist/src/mgx.h
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h
cvs rdiff -u -r1.17 -r1.18 \
xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xf86-video-tga/dist/src/tga.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-trident/dist/src/trident.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-ag10e/dist/src/ag10e.h
diff -u xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.3 xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.4
--- xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h:1.3 Mon May 23 19:53:36 2011
+++ xsrc/external/mit/xf86-video-ag10e/dist/src/ag10e.h Fri Jul 15 04:30:05 2022
@@ -27,7 +27,11 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
+#include "xf86RamDac.h"
+#else
+#include "xf86Cursor.h"
+#endif
#include "Xmd.h"
#include "gcstruct.h"
#include "ag10e_regs.h"
Index: xsrc/external/mit/xf86-video-crime/dist/src/crime.h
diff -u xsrc/external/mit/xf86-video-crime/dist/src/crime.h:1.7 xsrc/external/mit/xf86-video-crime/dist/src/crime.h:1.8
--- xsrc/external/mit/xf86-video-crime/dist/src/crime.h:1.7 Tue Sep 29 20:41:21 2009
+++ xsrc/external/mit/xf86-video-crime/dist/src/crime.h Fri Jul 15 04:30:05 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: crime.h,v 1.7 2009/09/29 20:41:21 macallan Exp $ */
+/* $NetBSD: crime.h,v 1.8 2022/07/15 04:30:05 mrg Exp $ */
/*
* Copyright (c) 2008 Michael Lorenz
* All rights reserved.
@@ -38,7 +38,11 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
+#include "xf86RamDac.h"
+#else
+#include "xf86Cursor.h"
+#endif
#include "xaa.h"
#ifndef CRIME_H
Index: xsrc/external/mit/xf86-video-glint/dist/src/glint.h
diff -u xsrc/external/mit/xf86-video-glint/dist/src/glint.h:1.4 xsrc/external/mit/xf86-video-glint/dist/src/glint.h:1.5
--- xsrc/external/mit/xf86-video-glint/dist/src/glint.h:1.4 Fri Dec 23 06:52:17 2016
+++ xsrc/external/mit/xf86-video-glint/dist/src/glint.h Fri Jul 15 04:30:05 2022
@@ -41,7 +41,11 @@
#include "exa.h"
#include "xf86fbman.h"
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
+#include "xf86RamDac.h"
+#else
+#include "xf86Cursor.h"
+#endif
#include "xf86cmap.h"
#include "xf86i2c.h"
#include "xf86DDC.h"
Index: xsrc/external/mit/xf86-video-igs/dist/src/igs.h
diff -u xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.7 xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.8
--- xsrc/external/mit/xf86-video-igs/dist/src/igs.h:1.7 Thu Aug 18 09:32:26 2016
+++ xsrc/external/mit/xf86-video-igs/dist/src/igs.h Fri Jul 15 04:30:05 2022
@@ -1,5 +1,5 @@
/* $OpenBSD: wsfb_driver.c,v 1.18 2003/04/02 16:42:13 jason Exp $ */
-/* $NetBSD: igs.h,v 1.7 2016/08/18 09:32:26 mrg Exp $ */
+/* $NetBSD: igs.h,v 1.8 2022/07/15 04:30:05 mrg Exp $ */
/*
* Copyright (c) 2001 Matthieu Herrb
* 2009 Michael Lorenz
@@ -49,7 +49,11 @@
#include "xf86_OSproc.h"
#include "compiler.h"
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
+#include "xf86RamDac.h"
+#else
+#include "xf86Cursor.h"
+#endif
#include "exa.h"
#ifndef IGS_H
Index: xsrc/external/mit/xf86-video-mgx/dist/src/mgx.h
diff -u xsrc/external/mit/xf86-video-mgx/dist/src/mgx.h:1.2 xsrc/external/mit/xf86-video-mgx/dist/src/mgx.h:1.3
--- xsrc/external/mit/xf86-video-mgx/dist/src/mgx.h:1.2 Fri Nov 12 19:01:19 2021
+++ xsrc/external/mit/xf86-video-mgx/dist/src/mgx.h Fri Jul 15 04:30:05 2022
@@ -30,7 +30,11 @@
#include "xf86.h"
#include "xf86_OSproc.h"
#include "compiler.h"
-#include "xf86RamDac.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"
Index: xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h
diff -u xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h:1.2 xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h:1.3
--- xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h:1.2 Thu May 27 04:48:10 2021
+++ xsrc/external/mit/xf86-video-pnozz/dist/src/pnozz.h Fri Jul 15 04:30:05 2022
@@ -20,14 +20,18 @@
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-/* $NetBSD: pnozz.h,v 1.2 2021/05/27 04:48:10 jdc Exp $ */
+/* $NetBSD: pnozz.h,v 1.3 2022/07/15 04:30:05 mrg Exp $ */
#ifndef PNOZZ_H
#define PNOZZ_H
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
+#include "xf86RamDac.h"
+#else
+#include "xf86Cursor.h"
+#endif
#include <X11/Xmd.h>
#include <dev/sun/fbio.h>
#include "gcstruct.h"
Index: xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h
diff -u xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h:1.17 xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h:1.18
--- xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h:1.17 Fri Dec 24 05:30:07 2021
+++ xsrc/external/mit/xf86-video-suncg14/dist/src/cg14.h Fri Jul 15 04:30:05 2022
@@ -26,7 +26,11 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86RamDac.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"
Index: xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h
diff -u xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h:1.7 xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h:1.8
--- xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h:1.7 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-suncg6/dist/src/cg6.h Fri Jul 15 04:30:05 2022
@@ -26,7 +26,11 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86RamDac.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 "cg6_regs.h"
Index: xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h
diff -u xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.9 xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.10
--- xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h:1.9 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-sunffb/dist/src/ffb.h Fri Jul 15 04:30:05 2022
@@ -30,7 +30,11 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
+#include "xf86RamDac.h"
+#else
+#include "xf86Cursor.h"
+#endif
#ifdef HAVE_XAA_H
#include "xaa.h"
#endif
Index: xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h
diff -u xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h:1.3 xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h:1.4
--- xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h:1.3 Tue Jun 4 22:20:42 2013
+++ xsrc/external/mit/xf86-video-sunleo/dist/src/leo.h Fri Jul 15 04:30:06 2022
@@ -26,7 +26,11 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86RamDac.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 "leo_regs.h"
Index: xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h
diff -u xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.8 xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.9
--- xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h:1.8 Fri Sep 23 20:50:54 2016
+++ xsrc/external/mit/xf86-video-suntcx/dist/src/tcx.h Fri Jul 15 04:30:06 2022
@@ -26,7 +26,11 @@
#include "xf86.h"
#include "xf86_OSproc.h"
-#include "xf86RamDac.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"
Index: xsrc/external/mit/xf86-video-tga/dist/src/tga.h
diff -u xsrc/external/mit/xf86-video-tga/dist/src/tga.h:1.1.1.3 xsrc/external/mit/xf86-video-tga/dist/src/tga.h:1.2
--- xsrc/external/mit/xf86-video-tga/dist/src/tga.h:1.1.1.3 Mon Jun 3 09:59:08 2013
+++ xsrc/external/mit/xf86-video-tga/dist/src/tga.h Fri Jul 15 04:30:06 2022
@@ -29,7 +29,11 @@
#ifdef HAVE_XAA_H
#include "xaa.h"
#endif
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
+#include "xf86RamDac.h"
+#else
+#include "xf86Cursor.h"
+#endif
#include "compat-api.h"
Index: xsrc/external/mit/xf86-video-trident/dist/src/trident.h
diff -u xsrc/external/mit/xf86-video-trident/dist/src/trident.h:1.3 xsrc/external/mit/xf86-video-trident/dist/src/trident.h:1.4
--- xsrc/external/mit/xf86-video-trident/dist/src/trident.h:1.3 Sat Aug 20 00:27:22 2016
+++ xsrc/external/mit/xf86-video-trident/dist/src/trident.h Fri Jul 15 04:30:06 2022
@@ -38,7 +38,11 @@
#include "xaa.h"
#endif
#include "xf86fbman.h"
-#include "xf86RamDac.h"
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
+#include "xf86RamDac.h"
+#else
+#include "xf86Cursor.h"
+#endif
#include "compiler.h"
#include "vgaHW.h"
#include "xf86i2c.h"
