Module Name: xsrc
Committed By: rin
Date: Thu Jul 7 12:56:01 UTC 2022
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
Fix build for xorg-server 1.10, which doesn't have shadowUpdateAfb8().
For amiga, fall back to 1-bpp on xorg-server 1.10.
NFC for xorg-server 1.20 and higher.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
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-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.40 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.41
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.40 Thu Jul 7 11:48:16 2022
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Thu Jul 7 12:56:01 2022
@@ -579,6 +579,7 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
#endif
#ifdef WSDISPLAY_TYPE_AMIGACC
if (wstype == WSDISPLAY_TYPE_AMIGACC) {
+# if XORG_VERSION_CURRENT >= (1) * 10000000 + (20) * 100000
/*
* Video memory is organized in bitplanes.
* 8bpp or 1bpp supported in this driver.
@@ -588,7 +589,9 @@ WsfbPreInit(ScrnInfoPtr pScrn, int flags
*/
if (bitsperpixel == 8) {
fPtr->planarAfb = TRUE;
- } else {
+ } else
+# endif
+ {
default_depth = 1;
bitsperpixel = 1;
}
@@ -865,7 +868,13 @@ WsfbCreateScreenResources(ScreenPtr pScr
} else if (fPtr->rotate) {
shadowproc = shadowUpdateRotatePacked;
} else if (fPtr->planarAfb) {
+#if XORG_VERSION_CURRENT >= (1) * 10000000 + (20) * 100000
shadowproc = shadowUpdateAfb8;
+#else
+ xf86Msg(X_ERROR,
+ "Planar fb requires xorg-server 1.20 or higher.");
+ return FALSE;
+#endif
windowproc = WsfbWindowAfb;
} else
shadowproc = shadowUpdatePacked;
