Module Name: xsrc
Committed By: mrg
Date: Fri Jul 15 04:13:16 UTC 2022
Modified Files:
xsrc/external/mit/xf86-video-ati-kms/dist/src: compat-api.h radeon.h
xsrc/external/mit/xf86-video-ati/dist/src: radeon_modes.c
xsrc/external/mit/xf86-video-intel-2014/dist/src: compat-api.h
xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa: intel_driver.c
xsrc/external/mit/xf86-video-intel/dist/src/sna: sna_accel.c
sna_video.h
xsrc/external/mit/xf86-video-intel/dist/src/uxa: intel_driver.c
xsrc/external/mit/xf86-video-nouveau/dist/src: compat-api.h
xsrc/external/mit/xf86-video-s3/dist/src: s3.h
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb.h
Log Message:
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")
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_video.h
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/xf86-video-s3/dist/src/s3.h
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.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-ati-kms/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h:1.1.1.5 xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h:1.2
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h:1.1.1.5 Sun Mar 11 19:42:43 2018
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/compat-api.h Fri Jul 15 04:13:15 2022
@@ -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
Index: xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h
diff -u xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h:1.2 xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h:1.3
--- xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h:1.2 Sun Mar 8 18:27:51 2020
+++ xsrc/external/mit/xf86-video-ati-kms/dist/src/radeon.h Fri Jul 15 04:13:15 2022
@@ -190,6 +190,10 @@ radeon_master_screen(ScreenPtr screen)
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)
{
Index: xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c
diff -u xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.3 xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.4
--- xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c:1.3 Thu Jan 31 20:41:37 2019
+++ xsrc/external/mit/xf86-video-ati/dist/src/radeon_modes.c Fri Jul 15 04:13:15 2022
@@ -146,7 +146,11 @@ static DisplayModePtr RADEONFPNativeMode
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;
Index: xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h:1.1.1.1 xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h:1.2
--- xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h:1.1.1.1 Fri May 10 06:22:22 2019
+++ xsrc/external/mit/xf86-video-intel-2014/dist/src/compat-api.h Fri Jul 15 04:13:15 2022
@@ -236,4 +236,10 @@ static inline void FreePixmap(PixmapPtr
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
Index: xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c
diff -u xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c:1.1.1.1 xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c:1.2
--- xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c:1.1.1.1 Fri May 10 06:22:23 2019
+++ xsrc/external/mit/xf86-video-intel-2014/dist/src/uxa/intel_driver.c Fri Jul 15 04:13:15 2022
@@ -623,6 +623,10 @@ static Bool I830PreInit(ScrnInfoPtr scrn
}
#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)
{
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.6 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.7
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c:1.6 Wed Mar 20 07:17:35 2019
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_accel.c Fri Jul 15 04:13:15 2022
@@ -17662,6 +17662,10 @@ static bool sna_accel_do_expire(struct s
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;
Index: xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_video.h
diff -u xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_video.h:1.1.1.3 xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_video.h:1.2
--- xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_video.h:1.1.1.3 Wed Mar 20 06:34:04 2019
+++ xsrc/external/mit/xf86-video-intel/dist/src/sna/sna_video.h Fri Jul 15 04:13:15 2022
@@ -38,7 +38,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR
#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 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR
}
/* 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 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR
{'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, \
Index: xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c
diff -u xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c:1.4 xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c:1.5
--- xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c:1.4 Wed Mar 20 07:17:36 2019
+++ xsrc/external/mit/xf86-video-intel/dist/src/uxa/intel_driver.c Fri Jul 15 04:13:15 2022
@@ -616,6 +616,10 @@ static Bool I830PreInit(ScrnInfoPtr scrn
}
#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)
{
Index: xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h
diff -u xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h:1.1.1.2 xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h:1.2
--- xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h:1.1.1.2 Sun Mar 5 02:03:32 2017
+++ xsrc/external/mit/xf86-video-nouveau/dist/src/compat-api.h Fri Jul 15 04:13:16 2022
@@ -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
Index: xsrc/external/mit/xf86-video-s3/dist/src/s3.h
diff -u xsrc/external/mit/xf86-video-s3/dist/src/s3.h:1.8 xsrc/external/mit/xf86-video-s3/dist/src/s3.h:1.9
--- xsrc/external/mit/xf86-video-s3/dist/src/s3.h:1.8 Sun Feb 23 06:33:20 2020
+++ xsrc/external/mit/xf86-video-s3/dist/src/s3.h Fri Jul 15 04:13:16 2022
@@ -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
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.7 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.8
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h:1.7 Wed Jul 6 14:27:50 2022
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb.h Fri Jul 15 04:13:16 2022
@@ -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
