From nobody Thu Jan 18 02:59:16 2024 X-Original-To: dev-commits-ports-all@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 4TFnX46rcyz57Rkn; Thu, 18 Jan 2024 02:59:16 +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 4TFnX46JVPz4mm1; Thu, 18 Jan 2024 02:59:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705546756; 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=M/+KIRD8HYrHoh9OgL9RomnuGUSU1aDUsUVtHSyfd+w=; b=HATkBMSVY6lk51yok9RuQeKLmWCN1RhCvGiXbe58VAWlTd7bnN4hrPz3N6z3oH7OcW9+pZ 3AJy8nFkCYl6OuQpDZCi+c0Ag6BEh/UqfweLwVwNLHiG5uY75vPlnAhNT405XhK94f7i9P 1+MOXPRMNHQiiqwJ/VCebuA/DAEe2TJ8WGukG7Qcbxvp8HM9aXv0SrpqZo9SP1QgpZvxS4 EYgdo6zIVUKaPYwKhiiJw9hCkEbwE5cM0NnOaKdwwBMA0SaUVXddDByk3rbxfCvSIdDeZ7 DuAatCcDImTCLgAFEGW4LIkdAsqPvxwiQPwZXNBQIcWvR57VbIGsnDbJCIpyRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705546756; 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=M/+KIRD8HYrHoh9OgL9RomnuGUSU1aDUsUVtHSyfd+w=; b=dTbtoBXNhRSd414TcCuOgWTQgFYcMjnTKrOEa9gZeVoFaMp49oxKd4M6wnWXAVIyb9tDlB G/Bwa/oy0CN7BCp9j+hI0yo6YieEwl4z/lC5AZNCS7D+tTrPFXXpX6LlQ+ui5D/dlFaPZU JxgdtpXSIdHb4D+vB1VEUYxZ2QXIeg5T5hamGSBk/MkIaSMrVLyx5NY8ApgjJMJ/MYMSWt l9MpH5UOC4L14sZuWLGXhoql7cGaa5H+9arJDM0Q+yIYjiMAe6rSP1Ob7zD443mrcrnsq9 ReyLmOzKg7qh3d1RlTGaCfTRV72D9uO1mqpchYb0v4PHOjEsRhcAAF2ThLbhyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705546756; a=rsa-sha256; cv=none; b=SKv+CVVvHF/R36QFfIuxtzS1DMfkii+nXKzUS9DGUSd/IJ4fet7HLwIUwP2+rJggsKyXhN t7YDb2xGsY+Trp8gk3WXbb4gcBfDADU9qLPojuxREf4YcEv0q504s2+YGE7g8VEOkNWRQF E1sE8Amd3c6ZpTXuJeUKzS00v0FwdO7AUVABtycGnfrx2YWnP+X9vE4C7UY5znv+9lsB4U aku1udepKgnjS4Bq1sjvL9YmPcpfpSBDkYm+j3GBvQna8xM9uUGsrFB+4qY+WVTObcfsdm R+/5diRcacRjRQqvsYJujoC+Dw/JQPzZJR54mvTsFK1uVaptxtkOIyJjmC6pqQ== 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 4TFnX45MB0zqV7; Thu, 18 Jan 2024 02:59:16 +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 40I2xG6K020126; Thu, 18 Jan 2024 02:59:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40I2xGBT020123; Thu, 18 Jan 2024 02:59:16 GMT (envelope-from git) Date: Thu, 18 Jan 2024 02:59:16 GMT Message-Id: <202401180259.40I2xGBT020123@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: 21a74b9aac80 - main - x11-toolkits/wlroots: dedup *_DEPENDS in consumers List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 21a74b9aac80dc16a8b0392bb1cf9c410649c35c Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=21a74b9aac80dc16a8b0392bb1cf9c410649c35c commit 21a74b9aac80dc16a8b0392bb1cf9c410649c35c Author: Jan Beich AuthorDate: 2024-01-18 02:02:37 +0000 Commit: Jan Beich CommitDate: 2024-01-18 02:57:13 +0000 x11-toolkits/wlroots: dedup *_DEPENDS in consumers LIB_DEPENDS against a port with non-default USE_LDCONFIG can desync RUN_DEPENDS and BUILD_DEPENDS, leading to incorrectly registered dependencies when built in a dirty environment. $ make install -C x11-toolkits/wlroots $ make install -C x11-wm/hikari $ pkg info -xr wlroots wlroots-0.17.1: hikari-2.3.3_4 wlroots015-0.15.1_2: $ make run-depends-list -C x11-wm/hikari | fgrep wlroots /usr/ports/main/x11-toolkits/wlroots015 $ make actual-package-depends -C x11-wm/hikari | fgrep wlroots "wlroots": {origin: "x11-toolkits/wlroots", version: "0.17.1"} --- x11-toolkits/wlroots015/override.mk | 4 ++-- x11-toolkits/wlroots016/override.mk | 4 ++-- x11-wm/cage/Makefile | 3 +-- x11-wm/cagebreak/Makefile | 3 +-- x11-wm/dwl/Makefile | 3 +-- x11-wm/gamescope/Makefile | 3 +-- x11-wm/hikari/Makefile | 3 +-- x11-wm/hyprland/Makefile | 3 +-- x11-wm/labwc/Makefile | 3 +-- x11-wm/phoc/Makefile | 3 +-- x11-wm/river/Makefile | 1 - x11-wm/sway-devel/Makefile | 3 +-- x11-wm/sway/Makefile | 3 +-- x11-wm/wayfire/Makefile | 3 +-- 14 files changed, 15 insertions(+), 27 deletions(-) diff --git a/x11-toolkits/wlroots015/override.mk b/x11-toolkits/wlroots015/override.mk index 556e497fa9e2..c94d1ab53853 100644 --- a/x11-toolkits/wlroots015/override.mk +++ b/x11-toolkits/wlroots015/override.mk @@ -1,7 +1,7 @@ WLR_SUFFIX= 015 +SOVERSION= 10 -BUILD_DEPENDS:= ${BUILD_DEPENDS:S/wlroots/&${WLR_SUFFIX}/g} -LIB_DEPENDS:= ${LIB_DEPENDS:S/wlroots$/&${WLR_SUFFIX}/} +LIB_DEPENDS:= ${LIB_DEPENDS:S/wlroots.so/&.${SOVERSION}/:S/wlroots$/&${WLR_SUFFIX}/} USES+= localbase # -isystem CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/wlroots${WLR_SUFFIX}/libdata/pkgconfig" diff --git a/x11-toolkits/wlroots016/override.mk b/x11-toolkits/wlroots016/override.mk index 443008a3c69d..f690580b51dc 100644 --- a/x11-toolkits/wlroots016/override.mk +++ b/x11-toolkits/wlroots016/override.mk @@ -1,7 +1,7 @@ WLR_SUFFIX= 016 +SOVERSION= 11 -BUILD_DEPENDS:= ${BUILD_DEPENDS:S/wlroots/&${WLR_SUFFIX}/g} -LIB_DEPENDS:= ${LIB_DEPENDS:S/wlroots$/&${WLR_SUFFIX}/} +LIB_DEPENDS:= ${LIB_DEPENDS:S/wlroots.so/&.${SOVERSION}/:S/wlroots$/&${WLR_SUFFIX}/} USES+= localbase # -isystem CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/wlroots${WLR_SUFFIX}/libdata/pkgconfig" diff --git a/x11-wm/cage/Makefile b/x11-wm/cage/Makefile index 7b53b2cbd82e..37e4de888633 100644 --- a/x11-wm/cage/Makefile +++ b/x11-wm/cage/Makefile @@ -15,8 +15,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wayland-protocols>=1.14:graphics/wayland-protocols \ - wlroots>=0.16.0:x11-toolkits/wlroots + wayland-protocols>=1.14:graphics/wayland-protocols LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libxkbcommon.so:x11/libxkbcommon diff --git a/x11-wm/cagebreak/Makefile b/x11-wm/cagebreak/Makefile index 795ac1e11843..e520686cdbdf 100644 --- a/x11-wm/cagebreak/Makefile +++ b/x11-wm/cagebreak/Makefile @@ -11,8 +11,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wayland-protocols>=1.14:graphics/wayland-protocols \ - wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots + wayland-protocols>=1.14:graphics/wayland-protocols LIB_DEPENDS= libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd \ libwayland-server.so:graphics/wayland \ diff --git a/x11-wm/dwl/Makefile b/x11-wm/dwl/Makefile index 465224343006..42d471e31a8f 100644 --- a/x11-wm/dwl/Makefile +++ b/x11-wm/dwl/Makefile @@ -15,8 +15,7 @@ LICENSE_FILE_GPLv3+ = ${WRKSRC}/LICENSE LICENSE_FILE_MIT= ${WRKSRC}/LICENSE.dwm BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wayland-protocols>0:graphics/wayland-protocols \ - wlroots>=0.17.0:x11-toolkits/wlroots + wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index a264de4a3835..d6134b15e9ce 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -20,8 +20,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ vulkan-headers>0:graphics/vulkan-headers \ wayland-protocols>=1.17:graphics/wayland-protocols \ glm>0:math/glm \ - hwdata>0:misc/hwdata \ - wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots + hwdata>0:misc/hwdata LIB_DEPENDS= libdrm.so:graphics/libdrm \ libliftoff.so:graphics/libliftoff \ libvulkan.so:graphics/vulkan-loader \ diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile index 0077486cb809..fffc73477b11 100644 --- a/x11-wm/hikari/Makefile +++ b/x11-wm/hikari/Makefile @@ -12,8 +12,7 @@ LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wayland-protocols>=1.14:graphics/wayland-protocols \ - wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots + wayland-protocols>=1.14:graphics/wayland-protocols LIB_DEPENDS= libinput.so:x11/libinput \ libucl.so:textproc/libucl \ libwayland-server.so:graphics/wayland \ diff --git a/x11-wm/hyprland/Makefile b/x11-wm/hyprland/Makefile index 15a28b674686..cdf253e88808 100644 --- a/x11-wm/hyprland/Makefile +++ b/x11-wm/hyprland/Makefile @@ -13,8 +13,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= cmake:devel/cmake-core \ evdev-proto>0:devel/evdev-proto \ - wayland-protocols>=1.25:graphics/wayland-protocols \ - wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots + wayland-protocols>=1.25:graphics/wayland-protocols LIB_DEPENDS= libtomlplusplus.so:devel/tomlplusplus \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ diff --git a/x11-wm/labwc/Makefile b/x11-wm/labwc/Makefile index 7b80ec4cc6d9..d84a75e4c118 100644 --- a/x11-wm/labwc/Makefile +++ b/x11-wm/labwc/Makefile @@ -13,8 +13,7 @@ WWW= https://github.com/labwc/labwc LICENSE= GPLv2 BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wayland-protocols>0:graphics/wayland-protocols \ - wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots + wayland-protocols>0:graphics/wayland-protocols LIB_DEPENDS= libpng.so:graphics/png \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile index d8ca2a225323..23e5b42d70ba 100644 --- a/x11-wm/phoc/Makefile +++ b/x11-wm/phoc/Makefile @@ -12,8 +12,7 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wayland-protocols>=1.15:graphics/wayland-protocols \ - wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots + wayland-protocols>=1.15:graphics/wayland-protocols LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ diff --git a/x11-wm/river/Makefile b/x11-wm/river/Makefile index b0e675dc55fe..254833be4e6a 100644 --- a/x11-wm/river/Makefile +++ b/x11-wm/river/Makefile @@ -12,7 +12,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols \ - wlroots>=0.16.0:x11-toolkits/wlroots \ zig>=0.11.0:lang/zig LIB_DEPENDS= libevdev.so:devel/libevdev \ libwayland-server.so:graphics/wayland \ diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile index b28783b7a6d9..0474e7026540 100644 --- a/x11-wm/sway-devel/Makefile +++ b/x11-wm/sway-devel/Makefile @@ -17,8 +17,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wayland-protocols>=1.24:graphics/wayland-protocols \ - wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots + wayland-protocols>=1.24:graphics/wayland-protocols LIB_DEPENDS= libjson-c.so:devel/json-c \ libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd \ diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index e05b328e60d8..26a870c608ff 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -18,8 +18,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - wayland-protocols>=1.24:graphics/wayland-protocols \ - wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots + wayland-protocols>=1.24:graphics/wayland-protocols LIB_DEPENDS= libjson-c.so:devel/json-c \ libevdev.so:devel/libevdev \ libudev.so:devel/libudev-devd \ diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index 7fb927e0ee61..b4871b83d91d 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -20,8 +20,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wf-config>=0.8.0<0.9.0:devel/wf-config \ ${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \ wayland-protocols>=1.12:graphics/wayland-protocols \ - glm>=0.9.8:math/glm \ - wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots + glm>=0.9.8:math/glm LIB_DEPENDS= libevdev.so:devel/libevdev \ libinotify.so:devel/libinotify \ libwf-config.so:devel/wf-config \