[xsrc/trunk]: xsrc/external/mit more xf86RamDac.h vs xf86Cursor.h.

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/22205c8dc647
branches:  trunk
changeset: 7104:22205c8dc647
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 15 04:30:05 2022 +0000

description:
more xf86RamDac.h vs xf86Cursor.h.

diffstat:

 external/mit/xf86-video-ag10e/dist/src/ag10e.h     |  6 +++++-
 external/mit/xf86-video-crime/dist/src/crime.h     |  8 ++++++--
 external/mit/xf86-video-glint/dist/src/glint.h     |  6 +++++-
 external/mit/xf86-video-igs/dist/src/igs.h         |  8 ++++++--
 external/mit/xf86-video-mgx/dist/src/mgx.h         |  6 +++++-
 external/mit/xf86-video-pnozz/dist/src/pnozz.h     |  8 ++++++--
 external/mit/xf86-video-suncg14/dist/src/cg14.h    |  6 +++++-
 external/mit/xf86-video-suncg6/dist/src/cg6.h      |  6 +++++-
 external/mit/xf86-video-sunffb/dist/src/ffb.h      |  6 +++++-
 external/mit/xf86-video-sunleo/dist/src/leo.h      |  6 +++++-
 external/mit/xf86-video-suntcx/dist/src/tcx.h      |  6 +++++-
 external/mit/xf86-video-tga/dist/src/tga.h         |  6 +++++-
 external/mit/xf86-video-trident/dist/src/trident.h |  6 +++++-
 13 files changed, 68 insertions(+), 16 deletions(-)

diffs (229 lines):

diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-ag10e/dist/src/ag10e.h
--- a/external/mit/xf86-video-ag10e/dist/src/ag10e.h    Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-ag10e/dist/src/ag10e.h    Fri Jul 15 04:30:05 2022 +0000
@@ -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"
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-crime/dist/src/crime.h
--- a/external/mit/xf86-video-crime/dist/src/crime.h    Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-crime/dist/src/crime.h    Fri Jul 15 04:30:05 2022 +0000
@@ -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
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-glint/dist/src/glint.h
--- a/external/mit/xf86-video-glint/dist/src/glint.h    Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-glint/dist/src/glint.h    Fri Jul 15 04:30:05 2022 +0000
@@ -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"
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-igs/dist/src/igs.h
--- a/external/mit/xf86-video-igs/dist/src/igs.h        Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-igs/dist/src/igs.h        Fri Jul 15 04:30:05 2022 +0000
@@ -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
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-mgx/dist/src/mgx.h
--- a/external/mit/xf86-video-mgx/dist/src/mgx.h        Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-mgx/dist/src/mgx.h        Fri Jul 15 04:30:05 2022 +0000
@@ -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"
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-pnozz/dist/src/pnozz.h
--- a/external/mit/xf86-video-pnozz/dist/src/pnozz.h    Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-pnozz/dist/src/pnozz.h    Fri Jul 15 04:30:05 2022 +0000
@@ -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"
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-suncg14/dist/src/cg14.h
--- a/external/mit/xf86-video-suncg14/dist/src/cg14.h   Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-suncg14/dist/src/cg14.h   Fri Jul 15 04:30:05 2022 +0000
@@ -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"
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-suncg6/dist/src/cg6.h
--- a/external/mit/xf86-video-suncg6/dist/src/cg6.h     Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-suncg6/dist/src/cg6.h     Fri Jul 15 04:30:05 2022 +0000
@@ -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"
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-sunffb/dist/src/ffb.h
--- a/external/mit/xf86-video-sunffb/dist/src/ffb.h     Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-sunffb/dist/src/ffb.h     Fri Jul 15 04:30:05 2022 +0000
@@ -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
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-sunleo/dist/src/leo.h
--- a/external/mit/xf86-video-sunleo/dist/src/leo.h     Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-sunleo/dist/src/leo.h     Fri Jul 15 04:30:05 2022 +0000
@@ -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"
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-suntcx/dist/src/tcx.h
--- a/external/mit/xf86-video-suntcx/dist/src/tcx.h     Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-suntcx/dist/src/tcx.h     Fri Jul 15 04:30:05 2022 +0000
@@ -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"
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-tga/dist/src/tga.h
--- a/external/mit/xf86-video-tga/dist/src/tga.h        Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-tga/dist/src/tga.h        Fri Jul 15 04:30:05 2022 +0000
@@ -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"
 
diff -r f1b78c37baed -r 22205c8dc647 external/mit/xf86-video-trident/dist/src/trident.h
--- a/external/mit/xf86-video-trident/dist/src/trident.h        Fri Jul 15 04:13:15 2022 +0000
+++ b/external/mit/xf86-video-trident/dist/src/trident.h        Fri Jul 15 04:30:05 2022 +0000
@@ -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"