git: f8df68865e29 - main - x11/libxkbcommon: expose Wayland support in xkbcli

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f8df68865e291a4dad8e6139de1ede798310f3f1

commit f8df68865e291a4dad8e6139de1ede798310f3f1
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-03-26 16:33:24 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-04-09 10:45:27 +0000

    x11/libxkbcommon: expose Wayland support in xkbcli
    
    $ xkbcli interactive-wayland
    seat0: keysyms [ h                ] unicode [ h ] layout [ English (US) (0) ] level [ 0 ] mods [ ] leds [ ]
    seat0: keysyms [ i                ] unicode [ i ] layout [ English (US) (0) ] level [ 0 ] mods [ ] leds [ ]
    
    Approved by:    manu
    Differential Revision:  https://reviews.freebsd.org/D29664
---
 x11/libxkbcommon/Makefile  | 10 +++++++---
 x11/libxkbcommon/pkg-plist |  2 ++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/x11/libxkbcommon/Makefile b/x11/libxkbcommon/Makefile
index fe07f14f6c7e..ebacd5c2495d 100644
--- a/x11/libxkbcommon/Makefile
+++ b/x11/libxkbcommon/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libxkbcommon
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
 DIST_SUBDIR=	xorg/lib
@@ -16,15 +17,18 @@ USES=		bison gnome meson pkgconfig tar:xz
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Denable-docs=false \
-		-Denable-wayland=false \
 		-Dx-locale-root="${PREFIX}/lib/X11/locale" \
 		${MESON_ARGS_${OPSYS}_${OSREL:R}}
 MESON_ARGS_FreeBSD_11=	-Ddefault-rules=xorg
 
-OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=X11
+OPTIONS_DEFINE=	WAYLAND X11
+OPTIONS_DEFAULT=WAYLAND X11
 OPTIONS_SUB=	yes
 
+WAYLAND_BUILD_DEPENDS=	wayland-protocols>=1.12:graphics/wayland-protocols
+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+WAYLAND_MESON_TRUE=	enable-wayland
+
 X11_USES=	xorg
 X11_USE=	XORG=xcb
 X11_MESON_TRUE=	enable-x11
diff --git a/x11/libxkbcommon/pkg-plist b/x11/libxkbcommon/pkg-plist
index f8a09642270f..131517a33ab8 100644
--- a/x11/libxkbcommon/pkg-plist
+++ b/x11/libxkbcommon/pkg-plist
@@ -20,10 +20,12 @@ libdata/pkgconfig/xkbcommon.pc
 libdata/pkgconfig/xkbregistry.pc
 libexec/xkbcommon/xkbcli-compile-keymap
 libexec/xkbcommon/xkbcli-how-to-type
+%%WAYLAND%%libexec/xkbcommon/xkbcli-interactive-wayland
 %%X11%%libexec/xkbcommon/xkbcli-interactive-x11
 libexec/xkbcommon/xkbcli-list
 man/man1/xkbcli-compile-keymap.1.gz
 man/man1/xkbcli-how-to-type.1.gz
+%%WAYLAND%%man/man1/xkbcli-interactive-wayland.1.gz
 %%X11%%man/man1/xkbcli-interactive-x11.1.gz
 man/man1/xkbcli-list.1.gz
 man/man1/xkbcli.1.gz