From nobody Mon Jan 29 11:06:32 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 4TNlqD4jVDz58TkF; Mon, 29 Jan 2024 11:06:32 +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 4TNlqD367Yz3xYp; Mon, 29 Jan 2024 11:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706526392; 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=FUvDFsxCn0YjIj/0aF1bXJvzSzCiSEA3kjMODb6OQpc=; b=h/9L2y1ZQPIm1xP4iA1renr6ua7gMLHXinXrQnhNNDuAVaowzSt/x/U8YtSW0vp+bNx4VM 95KfGfvFgc8kSCYtCItaeTOoaFhSUG81q8IYpeg0+7Y2GTQCs1T4hIN0t/4DcMIaZzk+D9 AKwX3wTNwcIVieScEoeWjObTQcvgM/HJfTcn+xj8et1wKZV+hmHHsWhb/ocTT/WMgGXYnW OzfLY6pvFdOUx9UiijY2wGyNb5rm1PWdFsfdvwJOEHQPmXTKCqoPqcBa//Af/fz19ddCpu 1x9dHneY227CQsdOCuVR1iyqnpY816zOCCpDYC7VqM2BJhrvXu1USeYIHurUDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706526392; 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=FUvDFsxCn0YjIj/0aF1bXJvzSzCiSEA3kjMODb6OQpc=; b=wewsZHobi17JYUdnx/ATT5dD1QkPFR7+x3gHNu5TOWRg77MOQwJsr8/h7PgPrtzL0FyyYa peJ7+AGGoaYfHNtlIxo/k7FSs8lgOHjRTTwYVaHNCcuuxEt0xoIpNBcs5DWhpZ/vTzqzTy wykOaJsovy30VASR8D2HpSjUkyBTofKjbCG/6ZynaBfjwCskg26Jy9MoygoeIXOYqpAulX 7yZFzEjwmjASTS3JPxyJZ1aqShn61PqyD69GryxW+xI8F8H5cpQd6jchj62QNMoV335xQc VfMs4+4MXk7GIHdGs2ksE4ZwBoZzvLOrSULub3E+QuHv7cn6gOF+1jFnpDGrCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706526392; a=rsa-sha256; cv=none; b=PrI4nBD9GS4zb2ntHUk7BrgtmpXpr5zDFsK2spPsS1gTSMh754UPtOAJFfA9hbwq//cFGn zckZSMsYtW7UGSnaw7OkMc2YzAMA7V+PIG7pdSaN14KzFTpbWsH0OGEnTZVUwMoxNCThs5 C0Nd2hD6ubNN3UvmI02m8vZBsElRwTrvr07jeCOUSo1aVdyfuTL+mJZmuzK1+uOqOKxiHl qSbq43Nx1Q5xNAq3xSw+EaR57kAUvnBfkY5Hwsv+WpzxildGaijKPaxCtJNYEZh0eyYG5g aibNVc4kgMjmWH3sEB0/glBqa1ULNGbUwJZO4YHpgqLpAKk7Py2vXuKzl3dQ1w== 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 4TNlqD2BLfzp69; Mon, 29 Jan 2024 11:06:32 +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 40TB6W6R049956; Mon, 29 Jan 2024 11:06:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40TB6WkC049953; Mon, 29 Jan 2024 11:06:32 GMT (envelope-from git) Date: Mon, 29 Jan 2024 11:06:32 GMT Message-Id: <202401291106.40TB6WkC049953@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: 94a4803c442c - main - x11-toolkits/libdecor: convert cairo plugin to port option 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: 94a4803c442c16aa3a53ad2c03624dd19c62fbed Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=94a4803c442c16aa3a53ad2c03624dd19c62fbed commit 94a4803c442c16aa3a53ad2c03624dd19c62fbed Author: Jan Beich AuthorDate: 2024-01-29 09:50:10 +0000 Commit: Jan Beich CommitDate: 2024-01-29 10:59:43 +0000 x11-toolkits/libdecor: convert cairo plugin to port option libdecor is under MIT but Cairo, Pango, DBus are under GPL variants. GPL may not be permitted with LICENSES_REJECTED, so let users opt out when libdecor support cannot be disabled in consumers. --- x11-toolkits/libdecor/Makefile | 26 ++++++++++++++++++-------- x11-toolkits/libdecor/pkg-plist | 2 +- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/x11-toolkits/libdecor/Makefile b/x11-toolkits/libdecor/Makefile index aec021e758fb..b9e865b8e4bf 100644 --- a/x11-toolkits/libdecor/Makefile +++ b/x11-toolkits/libdecor/Makefile @@ -9,25 +9,35 @@ WWW= https://gitlab.freedesktop.org/libdecor/libdecor LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wayland-protocols>=1.15:graphics/wayland-protocols +BUILD_DEPENDS= wayland-protocols>=1.15:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland -USES= gnome meson pkgconfig +USES= meson pkgconfig USE_GITLAB= yes -USE_GNOME= cairo pango USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org MESON_ARGS= -Ddemo=false -OPTIONS_DEFINE= DBUS GTK3 -OPTIONS_DEFAULT=DBUS GTK3 +OPTIONS_DEFINE= CAIRO DBUS GTK3 +OPTIONS_DEFAULT=CAIRO DBUS GTK3 OPTIONS_SUB= yes -DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus +CAIRO_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto +CAIRO_USES= gnome +CAIRO_USE= GNOME=cairo,pango + +# Unused by the main library +DBUS_LIB_DEPENDS= ${"${PORT_OPTIONS:NDBUS}":?libdbus-1.so\:devel/dbus:} DBUS_MESON_ENABLED= dbus -GTK3_USE= GNOME=gtk30 +GTK3_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto +GTK3_USES= gnome +GTK3_USE= GNOME=cairo,gtk30 GTK3_MESON_ENABLED= gtk +post-patch-CAIRO-off: + @${REINPLACE_CMD} '/cairo/d' ${WRKSRC}/src/plugins/meson.build + @${REINPLACE_CMD} "s/'cairo'/&, required: false, disabler: true/" \ + ${WRKSRC}/src/plugins/common/meson.build + .include diff --git a/x11-toolkits/libdecor/pkg-plist b/x11-toolkits/libdecor/pkg-plist index b8d3ea54c4b1..fb2f6f8ec583 100644 --- a/x11-toolkits/libdecor/pkg-plist +++ b/x11-toolkits/libdecor/pkg-plist @@ -2,6 +2,6 @@ include/libdecor-0/libdecor.h lib/libdecor-0.so lib/libdecor-0.so.0 lib/libdecor-0.so.0.200.2 -lib/libdecor/plugins-1/libdecor-cairo.so +%%CAIRO%%lib/libdecor/plugins-1/libdecor-cairo.so %%GTK3%%lib/libdecor/plugins-1/libdecor-gtk.so libdata/pkgconfig/libdecor-0.pc