[xsrc/trunk]: xsrc/external/mit/xf86-video-wsfb/dist/src Fix build for xorg-s...

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

details:   https://anonhg.NetBSD.org/xsrc/rev/e9eaf97accbf
branches:  trunk
changeset: 6992:e9eaf97accbf
user:      rin <rin%NetBSD.org@localhost>
date:      Thu Jul 07 12:56:01 2022 +0000

description:
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.

diffstat:

 external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (36 lines):

diff -r d19677dec50d -r e9eaf97accbf external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
--- a/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c       Thu Jul 07 11:48:16 2022 +0000
+++ b/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c       Thu Jul 07 12:56:01 2022 +0000
@@ -579,6 +579,7 @@
 #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 @@
                 */
                if (bitsperpixel == 8) {
                        fPtr->planarAfb = TRUE;
-               } else {
+               } else
+#  endif
+               {
                        default_depth = 1;
                        bitsperpixel = 1;
                }
@@ -865,7 +868,13 @@
        } 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;