From owner-dev-commits-ports-main@freebsd.org Fri Apr 9 10:47:09 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 39C115D43BC; Fri, 9 Apr 2021 10:47:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FGvvw6sl4z4Zqd; Fri, 9 Apr 2021 10:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B5C841CA90; Fri, 9 Apr 2021 10:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 139Al87g073350; Fri, 9 Apr 2021 10:47:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 139Al8IP073349; Fri, 9 Apr 2021 10:47:08 GMT (envelope-from git) Date: Fri, 9 Apr 2021 10:47:08 GMT Message-Id: <202104091047.139Al8IP073349@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: f8df68865e29 - main - x11/libxkbcommon: expose Wayland support in xkbcli MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f8df68865e291a4dad8e6139de1ede798310f3f1 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Apr 2021 10:47:09 -0000 The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=f8df68865e291a4dad8e6139de1ede798310f3f1 commit f8df68865e291a4dad8e6139de1ede798310f3f1 Author: Jan Beich AuthorDate: 2021-03-26 16:33:24 +0000 Commit: Jan Beich 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