From 6ff2b2b37f6e1b267fe3ec4d21c76f901365cdf3 Mon Sep 17 00:00:00 2001 From: patrick96 Date: Sat, 1 Jun 2019 19:14:12 +0200 Subject: [PATCH] build: remove xrender extension Some build recipes (exherbo, sourcemage) for some reason enable this even though it doesn't do anything any only causes compilation issues. Ref: #1730 --- cmake/02-opts.cmake | 1 - cmake/03-libs.cmake | 1 - cmake/05-summary.cmake | 1 - include/CMakeLists.txt | 3 --- include/settings.hpp.cmake | 4 +--- include/x11/extensions/all.hpp | 3 --- include/x11/extensions/fwd.hpp | 5 ----- include/x11/extensions/render.hpp | 23 ----------------------- lib/CMakeLists.txt | 3 --- src/CMakeLists.txt | 3 --- src/x11/connection.cpp | 3 --- src/x11/extensions/render.cpp | 20 -------------------- 12 files changed, 1 insertion(+), 69 deletions(-) delete mode 100644 include/x11/extensions/render.hpp delete mode 100644 src/x11/extensions/render.cpp diff --git a/cmake/02-opts.cmake b/cmake/02-opts.cmake index e4193940..ad1ee741 100644 --- a/cmake/02-opts.cmake +++ b/cmake/02-opts.cmake @@ -44,7 +44,6 @@ option(ENABLE_PULSEAUDIO "Enable PulseAudio support" ON) option(WITH_XRANDR "xcb-randr support" ON) option(WITH_XRANDR_MONITORS "xcb-randr monitor support" ON) -option(WITH_XRENDER "xcb-render support" OFF) option(WITH_XDAMAGE "xcb-damage support" OFF) option(WITH_XSYNC "xcb-sync support" OFF) option(WITH_XCOMPOSITE "xcb-composite support" ON) diff --git a/cmake/03-libs.cmake b/cmake/03-libs.cmake index fc879f10..fa98cf64 100644 --- a/cmake/03-libs.cmake +++ b/cmake/03-libs.cmake @@ -22,7 +22,6 @@ querylib(WITH_XDAMAGE "pkg-config" xcb-damage libs dirs) querylib(WITH_XKB "pkg-config" xcb-xkb libs dirs) querylib(WITH_XRANDR "pkg-config" xcb-randr libs dirs) querylib(WITH_XRANDR_MONITORS "pkg-config" "xcb-randr>=1.12" libs dirs) -querylib(WITH_XRENDER "pkg-config" xcb-render libs dirs) querylib(WITH_XRM "pkg-config" xcb-xrm libs dirs) querylib(WITH_XSYNC "pkg-config" xcb-sync libs dirs) querylib(WITH_XCURSOR "pkg-config" xcb-cursor libs dirs) diff --git a/cmake/05-summary.cmake b/cmake/05-summary.cmake index 45a62e4d..bb360e0c 100644 --- a/cmake/05-summary.cmake +++ b/cmake/05-summary.cmake @@ -25,7 +25,6 @@ colored_option(" xkeyboard" WITH_XKB) message(STATUS " X extensions:") colored_option(" xcb-randr" WITH_XRANDR) colored_option(" xcb-randr (monitor support)" WITH_XRANDR_MONITORS) -colored_option(" xcb-render" WITH_XRENDER) colored_option(" xcb-damage" WITH_XDAMAGE) colored_option(" xcb-sync" WITH_XSYNC) colored_option(" xcb-composite" WITH_XCOMPOSITE) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 20bce72a..3e63db6a 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -7,9 +7,6 @@ list(APPEND dirs ${CMAKE_CURRENT_LIST_DIR}) if(WITH_XRANDR) list(APPEND XPP_EXTENSION_LIST xpp::randr::extension) endif() -if(WITH_XRENDER) - list(APPEND XPP_EXTENSION_LIST xpp::render::extension) -endif() if(WITH_XDAMAGE) list(APPEND XPP_EXTENSION_LIST xpp::damage::extension) endif() diff --git a/include/settings.hpp.cmake b/include/settings.hpp.cmake index 7a9bb4be..c387b9be 100644 --- a/include/settings.hpp.cmake +++ b/include/settings.hpp.cmake @@ -17,7 +17,6 @@ #cmakedefine01 ENABLE_PULSEAUDIO #cmakedefine01 WITH_XRANDR -#cmakedefine01 WITH_XRENDER #cmakedefine01 WITH_XDAMAGE #cmakedefine01 WITH_XSYNC #cmakedefine01 WITH_XCOMPOSITE @@ -99,10 +98,9 @@ const auto print_build_info = [](bool extended = false) { (ENABLE_XKEYBOARD ? '+' : '-')); if (extended) { printf("\n"); - printf("X extensions: %crandr (%cmonitors) %crender %cdamage %csync %ccomposite %cxkb %cxrm %cxcursor\n", + printf("X extensions: %crandr (%cmonitors) %cdamage %csync %ccomposite %cxkb %cxrm %cxcursor\n", (WITH_XRANDR ? '+' : '-'), (WITH_XRANDR_MONITORS ? '+' : '-'), - (WITH_XRENDER ? '+' : '-'), (WITH_XDAMAGE ? '+' : '-'), (WITH_XSYNC ? '+' : '-'), (WITH_XCOMPOSITE ? '+' : '-'), diff --git a/include/x11/extensions/all.hpp b/include/x11/extensions/all.hpp index 9fcf9c82..da01423b 100644 --- a/include/x11/extensions/all.hpp +++ b/include/x11/extensions/all.hpp @@ -5,9 +5,6 @@ #if WITH_XDAMAGE #include "x11/extensions/damage.hpp" #endif -#if WITH_XRENDER -#include "x11/extensions/render.hpp" -#endif #if WITH_XRANDR #include "x11/extensions/randr.hpp" #endif diff --git a/include/x11/extensions/fwd.hpp b/include/x11/extensions/fwd.hpp index 0d3f5023..4ec02aed 100644 --- a/include/x11/extensions/fwd.hpp +++ b/include/x11/extensions/fwd.hpp @@ -8,11 +8,6 @@ namespace xpp { class extension; } #endif -#if WITH_XRENDER - namespace render { - class extension; - } -#endif #if WITH_XRANDR namespace randr { class extension; diff --git a/include/x11/extensions/render.hpp b/include/x11/extensions/render.hpp deleted file mode 100644 index f22f5267..00000000 --- a/include/x11/extensions/render.hpp +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "settings.hpp" - -#if not WITH_XRENDER -#error "X Render extension is disabled..." -#endif - -#include -#include - -#include "common.hpp" - -POLYBAR_NS - -// fwd -class connection; - -namespace render_util { - void query_extension(connection& conn); -} - -POLYBAR_NS_END diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 3bcb66d5..bdf20803 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -17,9 +17,6 @@ set(XCB_PROTOS xproto) if(WITH_XRANDR) list(APPEND XCB_PROTOS randr) endif() -if(WITH_XRENDER) - list(APPEND XCB_PROTOS render) -endif() if(WITH_XDAMAGE) list(APPEND XCB_PROTOS damage) endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ef6a2cb9..1bc29ebd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -42,9 +42,6 @@ endif() if(NOT WITH_XRANDR) list(REMOVE_ITEM files x11/extensions/randr.cpp) endif() -if(NOT WITH_XRENDER) - list(REMOVE_ITEM files x11/extensions/render.cpp) -endif() if(NOT WITH_XDAMAGE) list(REMOVE_ITEM files x11/extensions/damage.cpp) endif() diff --git a/src/x11/connection.cpp b/src/x11/connection.cpp index 4862ec95..ad05062a 100644 --- a/src/x11/connection.cpp +++ b/src/x11/connection.cpp @@ -41,9 +41,6 @@ connection::connection(xcb_connection_t* c, int default_screen) : base_type(c, d #if WITH_XDAMAGE damage_util::query_extension(*this); #endif -#if WITH_XRENDER - render_util::query_extension(*this); -#endif #if WITH_XRANDR randr_util::query_extension(*this); #endif diff --git a/src/x11/extensions/render.cpp b/src/x11/extensions/render.cpp deleted file mode 100644 index 730b3250..00000000 --- a/src/x11/extensions/render.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "x11/extensions/render.hpp" -#include "errors.hpp" -#include "x11/connection.hpp" - -POLYBAR_NS - -namespace render_util { - /** - * Query for the XRENDER extension - */ - void query_extension(connection& conn) { - conn.render().query_version(XCB_RENDER_MAJOR_VERSION, XCB_RENDER_MINOR_VERSION); - - if (!conn.extension()->present) { - throw application_error("Missing X extension: Render"); - } - } -} - -POLYBAR_NS_END