From nobody Mon Jan 29 11:06:31 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TNlqC3BJFz58TmP; Mon, 29 Jan 2024 11:06:31 +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 4TNlqC20t7z3xWN; Mon, 29 Jan 2024 11:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706526391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WXkPqJdMYHhQgKsUrbpFcN/TbupeCB3yUtyQhy/7R0g=; b=NhbBhK4q7/Bx5GMAIIZ8P+ZdI1ku5BIwyV2voXhUarWUm71wWY3r2Pmdklnai1vxufXumx JwRiEwo7E98bymHU5W2JcP924k2t2lCcxdsfd0XdtOF3DJjq76r97yoCDjjrJCznjKjx03 hQjbPOGbYEA1l/ZbopDqQWWZXbxLBjeIE4oF2gnKFfecqk1s+8WoDcdrogf9gz1pw0Sob/ uYJkLNB+inbKMgeBV1FSeDtVVskSrSwrRqE06dZwYDaZy0EIRFGDGjpdep+PM+siG4ZAM/ 80Jwh7+WyUDaVQv6JhAWEwS5B7Cw138KnJZxNYf9rFl7lsc8sR5velFLslbtUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706526391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WXkPqJdMYHhQgKsUrbpFcN/TbupeCB3yUtyQhy/7R0g=; b=sziXIDVrk5F74zqDLMf3nzhs2JLkboEcXkGcCdjDLZ37X75LI4m597IYG++yLOj95vPF3z 2bvntjA7Zot9xRWA2KZeVi2S8MPUAGQfMC9lJozlY2N46pxSxa0adg/GpE08SnKG8XRg+f hw10hoDC7cZuuOjCyHcQpyoU9VHvjhKO/nB8k//81Ljljcty5CbICbKujLgRZwD2/nnGeY mw4i/mXq2WEf76kiEATJIjPaL1MTKNLSGDs3TABakstcCyxLXls5OM4iWbnsvOofv9StOz rHZRmHJ4I9xC3KZpRw7Hg1YE6/YHNjWQwBoX1IPx2wSZMtbhztlzAIX9Hj5Jcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706526391; a=rsa-sha256; cv=none; b=j0ItElFVYUqFNit6jMqSYypMiIbLuNPLOmHSeDvlrLqyTfdEwWxa9TB0Zcu5C/GaYc+3OK hIJKIY06O3zeC2gb3t0oksFeJ6Ho5uzMnQ2MARNpMp/668MnRhyO8ZvNy7rl9t0PrlUR6K 26oVqaI/79x+/j2G9hdVpoZMOWxnB+tIW6wNhViW8gsjoRQnY/OIY64H4fdoIfsESLwan2 BwwKleepph6KiKTNXMjKpcZgLpD9p5sj0nbwP0FdpUi/9V4ahkl1QzABrWu/C7ppje5PVS rcUCyC5WYmK4MYsakNhB3HT6SFrk7EhOegTqbSY+s5NZfLatQT6ciC7mkfIjDg== 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 4TNlqC166Fzp68; Mon, 29 Jan 2024 11:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40TB6V8H049908; Mon, 29 Jan 2024 11:06:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TB6Ve0049905; Mon, 29 Jan 2024 11:06:31 GMT (envelope-from git) Date: Mon, 29 Jan 2024 11:06:31 GMT Message-Id: <202401291106.40TB6Ve0049905@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: 367a49562bc9 - main - x11/libei: convert BASU to subpackage List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org 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: 367a49562bc9dcda92e4e49fa1fcd2ba1277cf8c Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=367a49562bc9dcda92e4e49fa1fcd2ba1277cf8c commit 367a49562bc9dcda92e4e49fa1fcd2ba1277cf8c Author: Jan Beich AuthorDate: 2024-01-24 12:50:49 +0000 Commit: Jan Beich CommitDate: 2024-01-29 10:59:41 +0000 x11/libei: convert BASU to subpackage Split GPLv2 dependency from MIT-licensed package. Approved by: pizzamig (portmgr) Differential Revision: https://reviews.freebsd.org/D43568 --- x11-servers/xwayland-devel/Makefile | 11 ++++++++--- x11/libei/Makefile | 6 +++++- x11/libei/pkg-descr.basu | 8 ++++++++ x11/libei/pkg-plist | 10 +++++----- 4 files changed, 26 insertions(+), 9 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 9759fc744065..6132a9e6bb1d 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 21.0.99.1-664 DISTVERSIONSUFFIX= -g133e0d651 +PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel @@ -64,14 +65,18 @@ DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} -OPTIONS_DEFINE= CSD EI NVIDIA -OPTIONS_DEFAULT=CSD EI +OPTIONS_DEFINE= BASU CSD EI NVIDIA +OPTIONS_DEFAULT=BASU CSD EI + +BASU_DESC= Emulated input via libei portal +BASU_LIB_DEPENDS= liboeffis.so:x11/libei~basu +BASU_IMPLIES= EI CSD_DESC= Client-side decorations via libdecor CSD_LIB_DEPENDS= libdecor-0.so:x11-toolkits/libdecor CSD_MESON_TRUE= libdecor -EI_DESC= Emulated input via libei +EI_DESC= Emulated input via libei socket EI_LIB_DEPENDS= libei.so:x11/libei EI_MESON_OFF= -Dxwayland_ei=false diff --git a/x11/libei/Makefile b/x11/libei/Makefile index a1940a290588..a72acda75bca 100644 --- a/x11/libei/Makefile +++ b/x11/libei/Makefile @@ -1,5 +1,6 @@ PORTNAME= libei DISTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -34,7 +35,10 @@ OPTIONS_DEFAULT=BASU OPTIONS_SUB= yes BASU_DESC= XDG RemoteDesktop portal via basu -BASU_LIB_DEPENDS= libbasu.so:devel/basu +BASU_SUBPACKAGES= basu +COMMENT.basu= ${BASU_DESC} +LIB_DEPENDS.basu= libbasu.so:devel/basu \ + libepoll-shim.so:devel/libepoll-shim BASU_MESON_ENABLED= liboeffis .ifdef GH_TUPLE diff --git a/x11/libei/pkg-descr.basu b/x11/libei/pkg-descr.basu new file mode 100644 index 000000000000..b3e9dad0fc37 --- /dev/null +++ b/x11/libei/pkg-descr.basu @@ -0,0 +1,8 @@ +libei is a library for Emulated Input, primarily aimed at the Wayland +stack. It provides three parts: +- EI (Emulated Input) for the client side (libei) +- EIS (Emulated Input Server) for the server side (libeis) +- oeffis is an optional helper library for DBus communication with the + XDG RemoteDesktop portal (liboeffis) + +This package provides liboeffis. diff --git a/x11/libei/pkg-plist b/x11/libei/pkg-plist index c6f1f0580429..c2a818793748 100644 --- a/x11/libei/pkg-plist +++ b/x11/libei/pkg-plist @@ -1,16 +1,16 @@ bin/ei-debug-events include/libei-1.0/libei.h include/libei-1.0/libeis.h -%%BASU%%include/libei-1.0/liboeffis.h +%%BASU%%@@basu@@include/libei-1.0/liboeffis.h lib/libei.so lib/libei.so.1 lib/libei.so.1.2.0 lib/libeis.so lib/libeis.so.1 lib/libeis.so.1.2.0 -%%BASU%%lib/liboeffis.so -%%BASU%%lib/liboeffis.so.1 -%%BASU%%lib/liboeffis.so.1.2.0 +%%BASU%%@@basu@@lib/liboeffis.so +%%BASU%%@@basu@@lib/liboeffis.so.1 +%%BASU%%@@basu@@lib/liboeffis.so.1.2.0 libdata/pkgconfig/libei-1.0.pc libdata/pkgconfig/libeis-1.0.pc -%%BASU%%libdata/pkgconfig/liboeffis-1.0.pc +%%BASU%%@@basu@@libdata/pkgconfig/liboeffis-1.0.pc