From 31f33b3503dcfc8a6a237466a221d2cb17e1fc82 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Mon, 28 Jul 2025 14:45:18 +0200 Subject: [PATCH] configure: fix broken xserver version detection Back a decade ago, somebody obviously idn't know how to check for xserver version and abused a quite unrelated exported symbol instead. Since that symbol isn't exported anymore (because no driver was using it), this black magic now fails. We're not trying to support more than a decade old Xservers, so there's no point in this check at all, just drop it. Fixes: ae92d1765fa370a8d94c2856ad6c45d273ec3c69 Signed-off-by: Enrico Weigelt, metux IT consult --- configure.ac | 10 ---------- src/radeon_glamor.c | 6 +----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 82af192c..29302a56 100644 --- a/configure.ac +++ b/configure.ac @@ -161,16 +161,6 @@ AC_CHECK_DECL(RegionDuplicate, [#include #include ]) -AC_CHECK_DECL(fbGlyphs, - [AC_DEFINE(HAVE_FBGLYPHS, 1, [Have fbGlyphs API])], [], - [#include - #include - #include - #include - #include - #include - #include ]) - AC_CHECK_DECL(xf86CursorResetCursor, [AC_DEFINE(HAVE_XF86_CURSOR_RESET_CURSOR, 1, [Have xf86CursorResetCursor API])], [], diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index 9630b92d..27cfc3b0 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -425,18 +425,14 @@ radeon_glamor_init(ScreenPtr screen) ScrnInfoPtr scrn = xf86ScreenToScrn(screen); RADEONInfoPtr info = RADEONPTR(scrn); #ifdef RENDER -#ifdef HAVE_FBGLYPHS UnrealizeGlyphProcPtr SavedUnrealizeGlyph = NULL; -#endif PictureScreenPtr ps = NULL; if (info->shadow_primary) { ps = GetPictureScreenIfSet(screen); if (ps) { -#ifdef HAVE_FBGLYPHS SavedUnrealizeGlyph = ps->UnrealizeGlyph; -#endif info->glamor.SavedGlyphs = ps->Glyphs; info->glamor.SavedTriangles = ps->Triangles; info->glamor.SavedTrapezoids = ps->Trapezoids; @@ -458,7 +454,7 @@ radeon_glamor_init(ScreenPtr screen) if (info->shadow_primary) radeon_glamor_screen_init(screen); -#if defined(RENDER) && defined(HAVE_FBGLYPHS) +#if defined(RENDER) /* For ShadowPrimary, we need fbUnrealizeGlyph instead of * glamor_unrealize_glyph */