From 3aaa12aa17f83605e00db25cfebe85b806af9fab Mon Sep 17 00:00:00 2001 From: Shaolin Date: Fri, 2 Feb 2018 07:52:48 -0200 Subject: [PATCH] cmake: Add xcb-xinput support Ubuntu 17.04 updated libxcb1-dev to 1.12 where xinput should be enabled by default but debian disables it by default atm. Compile libxcb with --enable-xinput to use this within obs. Arch enables it by default, debian does not and fedora is untested. --- cmake/Modules/FindXCB.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake/Modules/FindXCB.cmake b/cmake/Modules/FindXCB.cmake index efeea58af..7f948bc7c 100644 --- a/cmake/Modules/FindXCB.cmake +++ b/cmake/Modules/FindXCB.cmake @@ -21,6 +21,7 @@ # XCB_GLX_FOUND XCB_GLX_INCLUDE_DIR XCB_GLX_LIBRARY # XCB_SHM_FOUND XCB_SHM_INCLUDE_DIR XCB_SHM_LIBRARY # XCB_XV_FOUND XCB_XV_INCLUDE_DIR XCB_XV_LIBRARY +# XCB_XINPUT_FOUND XCB_XINPUT_INCLUDE_DIR XCB_XINPUT_LIBRARY # XCB_SYNC_FOUND XCB_SYNC_INCLUDE_DIR XCB_SYNC_LIBRARY # XCB_XTEST_FOUND XCB_XTEST_INCLUDE_DIR XCB_XTEST_LIBRARY # XCB_ICCCM_FOUND XCB_ICCCM_INCLUDE_DIR XCB_ICCCM_LIBRARY @@ -54,6 +55,7 @@ set(knownComponents XCB XFIXES XTEST XV + XINPUT XINERAMA) unset(unknownComponents) @@ -112,6 +114,8 @@ foreach(comp ${comps}) list(APPEND pkgConfigModules "xcb-xtest") elseif("${comp}" STREQUAL "XV") list(APPEND pkgConfigModules "xcb-xv") + elseif("${comp}" STREQUAL "XINPUT") + list(APPEND pkgConfigModules "xcb-xinput") elseif("${comp}" STREQUAL "XINERAMA") list(APPEND pkgConfigModules "xcb-xinerama") endif() @@ -190,6 +194,9 @@ macro(_XCB_HANDLE_COMPONENT _comp) elseif("${_comp}" STREQUAL "XV") set(_header "xcb/xv.h") set(_lib "xcb-xv") + elseif("${_comp}" STREQUAL "XINPUT") + set(_header "xcb/xinput.h") + set(_lib "xcb-xinput") elseif("${_comp}" STREQUAL "XINERAMA") set(_header "xcb/xinerama.h") set(_lib "xcb-xinerama")