PolytreeDE
/
polybar
mirror of https://github.com/polybar/polybar.git
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
patrick96 2019-06-01 19:14:12 +02:00 committed by Patrick Ziegler
parent 2b0bf463b1
commit 6ff2b2b37f
12 changed files with 1 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/02-opts.cmake
View File

@ -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)

1
cmake/03-libs.cmake
View File

@ -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)

1
cmake/05-summary.cmake
View File

@ -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)

3
include/CMakeLists.txt
View File

@ -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()

4
include/settings.hpp.cmake
View File

@ -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 ? '+' : '-'),

3
include/x11/extensions/all.hpp
View File

@ -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

5
include/x11/extensions/fwd.hpp
View File

@ -8,11 +8,6 @@ namespace xpp {
class extension;
}
#endif
#if WITH_XRENDER
namespace render {
class extension;
}
#endif
#if WITH_XRANDR
namespace randr {
class extension;

23
include/x11/extensions/render.hpp
View File

@ -1,23 +0,0 @@
#pragma once
#include "settings.hpp"
#if not WITH_XRENDER
#error "X Render extension is disabled..."
#endif
#include <xcb/render.h>
#include <xpp/proto/render.hpp>
#include "common.hpp"
POLYBAR_NS
// fwd
class connection;
namespace render_util {
void query_extension(connection& conn);
}
POLYBAR_NS_END

3
lib/CMakeLists.txt
View File

@ -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()

3
src/CMakeLists.txt
View File

@ -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()

3
src/x11/connection.cpp
View File

@ -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

20
src/x11/extensions/render.cpp
View File

@ -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<xpp::render::extension>()->present) {
throw application_error("Missing X extension: Render");
}
}
}
POLYBAR_NS_END