[xsrc/trunk]: xsrc/external/mit various updates to build against xorg-server ...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/f1b78c37baed
branches:  trunk
changeset: 7103:f1b78c37baed
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jul 15 04:13:15 2022 +0000

description:
various updates to build against xorg-server 21.1.3.

- avoid a const issue with an expanded __UNCONST().
- cope with renamed member names
- deal with "xf86RamDac.h" going away (now use "xf86Cursor.h")

diffstat:

 external/mit/xf86-video-ati-kms/dist/src/compat-api.h          |  6 ++++++
 external/mit/xf86-video-ati-kms/dist/src/radeon.h              |  4 ++++
 external/mit/xf86-video-ati/dist/src/radeon_modes.c            |  6 +++++-
 external/mit/xf86-video-intel-2014/dist/src/compat-api.h       |  6 ++++++
 external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c |  4 ++++
 external/mit/xf86-video-intel/dist/src/sna/sna_accel.c         |  4 ++++
 external/mit/xf86-video-intel/dist/src/sna/sna_video.h         |  4 ++++
 external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c      |  4 ++++
 external/mit/xf86-video-nouveau/dist/src/compat-api.h          |  6 ++++++
 external/mit/xf86-video-s3/dist/src/s3.h                       |  4 ++++
 external/mit/xf86-video-wsfb/dist/src/wsfb.h                   |  4 ++++
 11 files changed, 51 insertions(+), 1 deletions(-)

diffs (173 lines):

diff -r 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-ati-kms/dist/src/compat-api.h
--- a/external/mit/xf86-video-ati-kms/dist/src/compat-api.h     Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-ati-kms/dist/src/compat-api.h     Fri Jul 15 04:13:15 2022 +0000
@@ -34,4 +34,10 @@
 #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask
 #endif
 
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(25, 2)
+#define current_master current_primary
+#define master_pixmap primary_pixmap
+#define slave_dst secondary_dst
 #endif
+
+#endif
diff -r 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-ati-kms/dist/src/radeon.h
--- a/external/mit/xf86-video-ati-kms/dist/src/radeon.h Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-ati-kms/dist/src/radeon.h Fri Jul 15 04:13:15 2022 +0000
@@ -190,6 +190,10 @@
     return screen;
 }
 
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 25
+#define slave_dst secondary_dst
+#define master_pixmap primary_pixmap
+#endif
 static inline ScreenPtr
 radeon_dirty_master(PixmapDirtyUpdatePtr dirty)
 {
diff -r 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-ati/dist/src/radeon_modes.c
--- a/external/mit/xf86-video-ati/dist/src/radeon_modes.c       Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-ati/dist/src/radeon_modes.c       Fri Jul 15 04:13:15 2022 +0000
@@ -146,7 +146,11 @@
        new             = xnfcalloc(1, sizeof (DisplayModeRec));
        sprintf(stmp, "%dx%d", native_mode->PanelXRes, native_mode->PanelYRes);
        new->name       = xnfalloc(strlen(stmp) + 1);
-       strcpy(new->name, stmp);
+       /*
+        * XXX - expanded __UNCONST() version, new->name became const in
+        * xorg-server 21.*
+        */
+       strcpy((void *)(unsigned long)(const void *)new->name, stmp);
        new->HDisplay   = native_mode->PanelXRes;
        new->VDisplay   = native_mode->PanelYRes;
 
diff -r 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-intel-2014/dist/src/compat-api.h
--- a/external/mit/xf86-video-intel-2014/dist/src/compat-api.h  Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-intel-2014/dist/src/compat-api.h  Fri Jul 15 04:13:15 2022 +0000
@@ -236,4 +236,10 @@
                          dstx, dsty)
 #endif
 
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
+#define current_primary current_master
+#define primary_pixmap master_pixmap
+#define secondary_dst slave_dst
 #endif
+
+#endif
diff -r 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c
--- a/external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c    Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c    Fri Jul 15 04:13:15 2022 +0000
@@ -623,6 +623,10 @@
 }
 
 #ifdef INTEL_PIXMAP_SHARING
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 25
+#define slave_dst secondary_dst
+#define master_pixmap primary_pixmap
+#endif
 static void
 redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
 {
diff -r 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-intel/dist/src/sna/sna_accel.c
--- a/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c    Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c    Fri Jul 15 04:13:15 2022 +0000
@@ -17662,6 +17662,10 @@
 static void sna_accel_post_damage(struct sna *sna)
 {
 #if HAS_PIXMAP_SHARING
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 25
+#define slave_dst secondary_dst
+#define master_pixmap primary_pixmap
+#endif
        ScreenPtr screen = to_screen_from_sna(sna);
        PixmapDirtyUpdatePtr dirty;
 
diff -r 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-intel/dist/src/sna/sna_video.h
--- a/external/mit/xf86-video-intel/dist/src/sna/sna_video.h    Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-intel/dist/src/sna/sna_video.h    Fri Jul 15 04:13:15 2022 +0000
@@ -38,7 +38,9 @@
 #define FOURCC_XVMC (('C' << 24) + ('M' << 16) + ('V' << 8) + 'X')
 #define FOURCC_RGB565 ((16 << 24) + ('B' << 16) + ('G' << 8) + 'R')
 #define FOURCC_RGB888 ((24 << 24) + ('B' << 16) + ('G' << 8) + 'R')
+#ifndef FOURCC_NV12 /* xorg-server 21.x's fourcc.h uses raw number. */
 #define FOURCC_NV12 (('2' << 24) + ('1' << 16) + ('V' << 8) + 'N')
+#endif
 #define FOURCC_AYUV (('V' << 24) + ('U' << 16) + ('Y' << 8) + 'A')
 
 /*
@@ -72,6 +74,7 @@
 }
 
 /* no standard define for this */
+#ifndef XVIMAGE_NV12 /* xorg-server 21.x's fourcc.h uses raw number. */
 #define XVIMAGE_NV12 { \
        FOURCC_NV12, XvYUV, LSBFirst,                           \
        {'N','V','1','2', 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
@@ -79,6 +82,7 @@
        {'Y','U','V', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, \
        XvTopToBottom \
 }
+#endif
 
 #define XVIMAGE_AYUV { \
        FOURCC_AYUV, XvYUV, LSBFirst, \
diff -r 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c
--- a/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c Fri Jul 15 04:13:15 2022 +0000
@@ -616,6 +616,10 @@
 }
 
 #ifdef INTEL_PIXMAP_SHARING
+#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 25
+#define slave_dst secondary_dst
+#define master_pixmap primary_pixmap
+#endif
 static void
 redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
 {
diff -r 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-nouveau/dist/src/compat-api.h
--- a/external/mit/xf86-video-nouveau/dist/src/compat-api.h     Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-nouveau/dist/src/compat-api.h     Fri Jul 15 04:13:15 2022 +0000
@@ -102,4 +102,10 @@
 
 #endif
 
+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(25, 2)
+#define current_master current_primary
+#define master_pixmap primary_pixmap
+#define slave_dst secondary_dst
 #endif
+
+#endif
diff -r 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-s3/dist/src/s3.h
--- a/external/mit/xf86-video-s3/dist/src/s3.h  Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-s3/dist/src/s3.h  Fri Jul 15 04:13:15 2022 +0000
@@ -34,7 +34,11 @@
 
 #include "xf86.h"
 #include "xf86Pci.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 439bcf6c1bd5 -r f1b78c37baed external/mit/xf86-video-wsfb/dist/src/wsfb.h
--- a/external/mit/xf86-video-wsfb/dist/src/wsfb.h      Fri Jul 15 04:10:54 2022 +0000
+++ b/external/mit/xf86-video-wsfb/dist/src/wsfb.h      Fri Jul 15 04:13:15 2022 +0000
@@ -46,7 +46,11 @@
 #include "xf86.h"
 #include "xf86_OSproc.h"
 
+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
 #include "xf86RamDac.h"
+#else
+#include "xf86Cursor.h"
+#endif
 
 #ifndef WSFB_H
 #define WSFB_H