From 077eaabfa60375b518fefbf8b25f53fa619c981f Mon Sep 17 00:00:00 2001 From: Stefan Frederik Date: Mon, 17 Jan 2022 17:55:27 +0100 Subject: [PATCH] remove xcb probing in hooks.c --- config.h.in | 3 --- scconfig/hooks.c | 38 +------------------------------------- 2 files changed, 1 insertion(+), 40 deletions(-) diff --git a/config.h.in b/config.h.in index 10f2be67..1a5105dc 100644 --- a/config.h.in +++ b/config.h.in @@ -23,9 +23,6 @@ print [@/*************************************************************/ print {\n\n/* Define this var if cairo is available and is to be used */\n} print_ternary ?libs/gui/cairo/presents {#define HAS_CAIRO 1} {/*#undef HAS_CAIRO */} -print {\n\n/* Define this var if Xlib's xcb is available */\n} -print_ternary ?libs/gui/xcb/presents {#define HAS_XCB 1} {/*#undef HAS_XCB */} - print {\n\n/* Define this var if Xlib's xrender is available */\n} print_ternary ?libs/gui/xrender/presents {#define HAS_XRENDER 1} {/*#undef HAS_RENDER */} diff --git a/scconfig/hooks.c b/scconfig/hooks.c index 3e9643ae..335ee32f 100644 --- a/scconfig/hooks.c +++ b/scconfig/hooks.c @@ -164,21 +164,6 @@ int hook_detect_host() return 0; } -static void disable_xcb(void) -{ - put("libs/gui/xcb/presents", ""); - put("libs/gui/xcb/includes", ""); - put("libs/gui/xcb/cflags", ""); - put("libs/gui/xcb/ldflags", ""); - put("libs/gui/xcb_render/presents", ""); - put("libs/gui/xcb_render/includes", ""); - put("libs/gui/xcb_render/cflags", ""); - put("libs/gui/xcb_render/ldflags", ""); - put("libs/gui/xgetxcbconnection/presents", ""); - put("libs/gui/xgetxcbconnection/includes", ""); - put("libs/gui/xgetxcbconnection/cflags", ""); - put("libs/gui/xgetxcbconnection/ldflags", ""); -} /* Runs when things should be detected for the host->target system (commands that will be executed on host but will produce files to be used on target) */ @@ -242,31 +227,11 @@ int hook_detect_target() require("libs/io/dup2/*", 0, 0); /* Stefan: query dup2() availability */ require("parsgen/flex/presents", 0, 1); require("parsgen/bison/presents", 0, 1); - require("libs/script/tk/*", 0, 1); /* this will also bring libs/script/tcl/* */ + require("libs/script/tk/*", 0, 1); /* this will also bring libs/script/tcl */ require("fstools/awk", 0, 1); require("libs/gui/xpm/*", 0, 1); require("libs/gui/cairo/*", 0, 0); require("libs/gui/xrender/*", 0, 0); - - if (require("libs/gui/cairo-xcb/*", 0, 0) != 0) { - put("libs/gui/xcb/presents", sfalse); - } - else if (require("libs/gui/xcb/*", 0, 0) == 0) { - /* if xcb is used, the code requires these: */ - require("libs/gui/xgetxcbconnection/*", 0, 0); - if (!istrue(get("libs/gui/xgetxcbconnection/presents"))) { - report("Disabling xcb because xgetxcbconnection is not found...\n"); - disable_xcb(); - } - else { - require("libs/gui/xcb_render/*", 0, 0); - if (!istrue(get("libs/gui/xcb_render/presents"))) { - report("Disabling xcb because xcb_render is not found...\n"); - disable_xcb(); - } - } - } - return 0; } @@ -316,7 +281,6 @@ int hook_generate() printf(" tk: %s\n", get("/target/libs/script/tk/ldflags")); printf(" cairo: %s\n", istrue(get("/target/libs/gui/cairo/presents")) ? "yes" : "no"); printf(" xrender: %s\n", istrue(get("/target/libs/gui/xrender/presents")) ? "yes" : "no"); - printf(" xcb: %s\n", istrue(get("/target/libs/gui/xcb/presents")) ? "yes" : "no"); printf("\nConfiguration complete, ready to compile.\n\n"); }