From 32326a4b3b8234f56bb1c5f47b5bdd6c8fec7917 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Mon, 27 Nov 2017 12:46:47 -0800 Subject: macx-clang: Opt-in xcb QPA support with XQuartz Enable xcb QPA plugin when XQuartz is available. This is done in a single build, alongside the Cocoa version. We delegate part of the configuration stage to pkg-config, so this becomes a requirement. Ensure that PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:/opt/X11/share/pkgconfig is in your environment, or pkg-config is properly set up. Tested with the following configure options: configure \ -pkg-config \ -fontconfig -system-freetype \ -system-xcb -xkb -no-opengl \ -qt-xkbcommon -qt-xkbcommon-x11 Change-Id: I2eb5a0491172368afc4c629c540cbef08580348d Reviewed-by: Jake Petroules Reviewed-by: Oswald Buddenhagen --- src/gui/configure.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/configure.json b/src/gui/configure.json index 0a591e110c..a68f2eed16 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -928,7 +928,8 @@ }, "fontconfig": { "label": "Fontconfig", - "condition": "!config.win32 && !config.darwin && features.system-freetype && libs.fontconfig", + "autoDetect": "!config.darwin", + "condition": "!config.win32 && features.system-freetype && libs.fontconfig", "output": [ "privateFeature", "feature" ] }, "gbm": { @@ -1498,6 +1499,13 @@ "condition": "features.xcb && !features.xkbcommon-system && !features.xkb-config-root", "message": "Could not find XKB config root, use -xkb-config-root to set a path to XKB configuration data. This is required for keyboard input support." + }, + { + "type": "note", + "condition": "features.xcb && config.darwin", + "message": "XCB support on macOS is minimal and untested. Some features will +not work properly or at all (e.g. OpenGL, desktop services or accessibility), +or may depend on your system and XQuartz setup." }, { "type": "note", -- cgit v1.2.3