From nobody Mon Jan 29 15:29:13 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 4TNsfL1n9bz58v2P; Mon, 29 Jan 2024 15:29:14 +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 4TNsfL1K3rz4fPV; Mon, 29 Jan 2024 15:29:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706542154; 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=Kv7ZyoTKQdAcOoN0/V6fTk7hj0T3Yzzq5M2SJZl3z10=; b=rx/R/vpLXrXNrwChImWheE178ip5XO9jALvLWXBV7gK61xiW9x4sgJoSOVZkP6r/IKzRie L1AJ7vopCP1vLIkes3GYJef/yJpGXFFM+/gVWIvei29yWuLwnZXQUSxAdFJ7uvVylxSsHa AX6W1/qeioz6PCZK+feqJ7y9jiachIlls50iP5cKqqS5MTfo0aqvU9RsTf5iYVRCFjIMxA Q+Cp/hHyTiiixAIzhEuF6cVJG2ErfWj2fiAT7Sii6uRC75mMVuDR1eQtB+hzKNc4OcgL3v 3qvfILtVi7cAZ3QdLSkUGKPVkkJnfZBRXa9Q4kNbdEo1Vp5qRgVcobDO9iW9QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706542154; 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=Kv7ZyoTKQdAcOoN0/V6fTk7hj0T3Yzzq5M2SJZl3z10=; b=W1MHp0riAYde+2PyPt9pmqMxZqT3ly3K73kh11kpaTsRiUsaD5yHtn+/IhMF9cX4/+73JC qo96BWT5hjxup4uoYW4NqLFeEMaQOKZvkStf418+BoE8vXUtxgeiMEqBuwaHnVh1iXk3ub NyED1ZGnnfHkgr9qvuoa2bm/B+hAYgChsAczcmJRT58Q89J8NkhPFr5Nr6p6gUqBNitVhx ROhuSGktoMlY8KxS0qTkjTnFf7D/KuSBGVuL2CaY2PpUofgGJWOExEvdc1bBahaUvlLRaA dgPxFPIPU1ezSiiJ43aH/91/7JHs5N5OAfMjrieUb9xuvIdgsYAW+JWeXJvkmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706542154; a=rsa-sha256; cv=none; b=dkyhFfbtfuK2rgiXbxQ59i5DsAjE8TJsxGgq23xQ4zkDCzGJAr3lOBUlkkqpz40QEL/KgY 6ZiokKDkwloUSClHwkjFAF1YEhRwtSvffcA7/WJPU8QESja9AOVh8gSQApJI9uYbL/+oq/ ajSFmhA2XSLegUxjkJy2h61GRGFSpYjsgA1Fv/hMlJR+VQNyH4+eypdgGuCbcjU5Irktg5 J3GIS2ZqhFt1KUEv2G5sUFXProIIffwspNCNazljvjdXk6GyqvoHV1wEAMOQe+TLGc5owy yU3ae6W2xZ4U0JPPmoCC8Gt+EtCfWrAk6zMYnpqGwj+/mdoI3iOp3AqWmTLbYg== 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 4TNsfL0N5mzwkD; Mon, 29 Jan 2024 15:29:14 +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 40TFTDAi087208; Mon, 29 Jan 2024 15:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TFTDm8087205; Mon, 29 Jan 2024 15:29:13 GMT (envelope-from git) Date: Mon, 29 Jan 2024 15:29:13 GMT Message-Id: <202401291529.40TFTDm8087205@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: 0482926a54ac - main - x11/libei: temporarily drop subpackages 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: 0482926a54acf27476e244fe560a1e14ce82c33c Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=0482926a54acf27476e244fe560a1e14ce82c33c commit 0482926a54acf27476e244fe560a1e14ce82c33c Author: Jan Beich AuthorDate: 2024-01-29 15:24:28 +0000 Commit: Jan Beich CommitDate: 2024-01-29 15:24:59 +0000 x11/libei: temporarily drop subpackages Whole tree builds fail to parse subpackage syntax in *_DEPENDS. $ poudriere bulk -j 132amd64 -a [...] [00:02:31] Error: compute_deps_pkg failed to lookup pkgname for x11/libei~basu processing package xwayland-devel-21.0.99.1.664_1 from x11-servers/xwayland-devel -- Is SUBDIR+=libei missing in x11/Makefile? $ make index [...] make_index: xwayland-devel-21.0.99.1.664_1: no entry for /usr/ports/x11/libei~basu make_index: xwayland-devel-21.0.99.1.664_1: no entry for /usr/ports/x11/libei~basu Reported by: David Wolfskill This reverts commit 367a49562bc9dcda92e4e49fa1fcd2ba1277cf8c. --- x11-servers/xwayland-devel/Makefile | 11 +++-------- x11/libei/Makefile | 6 +----- x11/libei/pkg-descr.basu | 8 -------- x11/libei/pkg-plist | 10 +++++----- 4 files changed, 9 insertions(+), 26 deletions(-) diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index 6132a9e6bb1d..9759fc744065 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -2,7 +2,6 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- DISTVERSION= 21.0.99.1-664 DISTVERSIONSUFFIX= -g133e0d651 -PORTREVISION= 1 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel @@ -65,18 +64,14 @@ DEFAULT_FONTPATH_LIST= \ ${FONTPATH_ROOT}/75dpi/ \ catalogue:${FONTPATHD} -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 +OPTIONS_DEFINE= CSD EI NVIDIA +OPTIONS_DEFAULT=CSD 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 socket +EI_DESC= Emulated input via libei EI_LIB_DEPENDS= libei.so:x11/libei EI_MESON_OFF= -Dxwayland_ei=false diff --git a/x11/libei/Makefile b/x11/libei/Makefile index a72acda75bca..a1940a290588 100644 --- a/x11/libei/Makefile +++ b/x11/libei/Makefile @@ -1,6 +1,5 @@ PORTNAME= libei DISTVERSION= 1.2.0 -PORTREVISION= 1 CATEGORIES= x11 MAINTAINER= jbeich@FreeBSD.org @@ -35,10 +34,7 @@ OPTIONS_DEFAULT=BASU OPTIONS_SUB= yes BASU_DESC= XDG RemoteDesktop portal via basu -BASU_SUBPACKAGES= basu -COMMENT.basu= ${BASU_DESC} -LIB_DEPENDS.basu= libbasu.so:devel/basu \ - libepoll-shim.so:devel/libepoll-shim +BASU_LIB_DEPENDS= libbasu.so:devel/basu BASU_MESON_ENABLED= liboeffis .ifdef GH_TUPLE diff --git a/x11/libei/pkg-descr.basu b/x11/libei/pkg-descr.basu deleted file mode 100644 index b3e9dad0fc37..000000000000 --- a/x11/libei/pkg-descr.basu +++ /dev/null @@ -1,8 +0,0 @@ -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 c2a818793748..c6f1f0580429 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%%@@basu@@include/libei-1.0/liboeffis.h +%%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%%@@basu@@lib/liboeffis.so -%%BASU%%@@basu@@lib/liboeffis.so.1 -%%BASU%%@@basu@@lib/liboeffis.so.1.2.0 +%%BASU%%lib/liboeffis.so +%%BASU%%lib/liboeffis.so.1 +%%BASU%%lib/liboeffis.so.1.2.0 libdata/pkgconfig/libei-1.0.pc libdata/pkgconfig/libeis-1.0.pc -%%BASU%%@@basu@@libdata/pkgconfig/liboeffis-1.0.pc +%%BASU%%libdata/pkgconfig/liboeffis-1.0.pc