summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2021-05-20 07:47:21 +0200
committerMatt Turner <mattst88@gentoo.org>2021-05-20 19:30:26 -0700
commitb0e6866dd94cbd748143842a9d841d4d40489afa (patch)
tree23840507b619ea52bf57b042c318f8ceb1bf9c79 /x11-libs/libxkbcommon
parentdev-cpp/mm-common: Version bump to 1.0.3 (diff)
downloadgentoo-b0e6866dd94cbd748143842a9d841d4d40489afa.tar.gz
gentoo-b0e6866dd94cbd748143842a9d841d4d40489afa.tar.bz2
gentoo-b0e6866dd94cbd748143842a9d841d4d40489afa.zip
x11-libs/libxkbcommon: Add support for wayland
Closes: https://github.com/gentoo/gentoo/pull/20893 Signed-off-by: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'x11-libs/libxkbcommon')
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild10
1 files changed, 7 insertions, 3 deletions
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
index ce2e09668261..38cc5c15931e 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
@@ -18,7 +18,7 @@ inherit meson multilib-minimal ${GIT_ECLASS} python-any-r1 virtualx
DESCRIPTION="keymap handling library for toolkits and window systems"
HOMEPAGE="https://xkbcommon.org/ https://github.com/xkbcommon/libxkbcommon/"
LICENSE="MIT"
-IUSE="X doc static-libs test"
+IUSE="doc static-libs test wayland X"
RESTRICT="!test? ( test )"
SLOT="0"
@@ -26,14 +26,18 @@ BDEPEND="
sys-devel/bison
doc? ( app-doc/doxygen )
test? ( ${PYTHON_DEPS} )
+ wayland? ( dev-util/wayland-scanner )
"
RDEPEND="
X? ( >=x11-libs/libxcb-1.10:=[${MULTILIB_USEDEP},xkb] )
+ wayland? ( >=dev-libs/wayland-1.2.0 )
dev-libs/libxml2[${MULTILIB_USEDEP}]
x11-misc/compose-tables
"
DEPEND="${RDEPEND}
- X? ( x11-base/xorg-proto )"
+ X? ( x11-base/xorg-proto )
+ wayland? ( >=dev-libs/wayland-protocols-1.12 )
+"
pkg_setup() {
if use test; then
@@ -45,7 +49,7 @@ multilib_src_configure() {
local emesonargs=(
-Ddefault_library="$(usex static-libs both shared)"
-Dxkb-config-root="${EPREFIX}/usr/share/X11/xkb"
- -Denable-wayland=false # Demo applications
+ $(meson_use wayland enable-wayland)
$(meson_use X enable-x11)
$(meson_use doc enable-docs)
)