Require XCB 1.10

We need XCB 1.10 for sync to work. Sync was optional with a version check
to make it work on build.kde.org. The CI system supports XCB 1.10 now, so
it's better to have it as a mandatory requirement.
icc-effect-5.14.5
Martin Gräßlin 2015-06-04 18:39:04 +02:00
parent 8a9bbf7ca3
commit 6c0c513874
4 changed files with 1 additions and 16 deletions

View File

@ -182,7 +182,7 @@ set_package_properties(X11 PROPERTIES DESCRIPTION "X11 libraries"
)
# All the required XCB components
find_package(XCB
find_package(XCB 1.10
REQUIRED COMPONENTS
XCB
XFIXES
@ -208,12 +208,6 @@ if (XCB_ICCCM_VERSION VERSION_LESS "0.4")
endif()
add_feature_info("XCB-ICCCM" XCB_ICCCM_FOUND "Required for building test applications for KWin")
set(HAVE_XCB_SYNC TRUE)
if (XCB_VERSION VERSION_LESS "1.10")
set(HAVE_XCB_SYNC FALSE)
endif()
add_feature_info("XCB-SYNC" HAVE_XCB_SYNC "XCB Sync version >= 1.10 required for synced window resizing")
find_package(X11_XCB)
set_package_properties(X11_XCB PROPERTIES
PURPOSE "Required for OpenGL support in X11 windowed backend of kwin_wayland"

View File

@ -1782,7 +1782,6 @@ void Client::getIcons()
void Client::getSyncCounter()
{
#if HAVE_XCB_SYNC
if (!Xcb::Extensions::self()->isSyncAvailable())
return;
@ -1818,7 +1817,6 @@ void Client::getSyncCounter()
}
}
}
#endif
}
/**

View File

@ -12,7 +12,6 @@
#cmakedefine01 HAVE_WAYLAND_CURSOR
#cmakedefine01 HAVE_XKB
#cmakedefine01 HAVE_INPUT
#cmakedefine01 HAVE_XCB_SYNC
#cmakedefine01 HAVE_X11_XCB
#cmakedefine01 HAVE_DRM
#cmakedefine01 HAVE_GBM

View File

@ -1382,12 +1382,6 @@ QString Workspace::supportInformation() const
support.append(yes);
#else
support.append(no);
#endif
support.append(QStringLiteral("HAVE_XCB_SYNC: "));
#if HAVE_XCB_SYNC
support.append(yes);
#else
support.append(no);
#endif
support.append(QStringLiteral("HAVE_X11_XCB: "));
#if HAVE_X11_XCB