From nobody Fri Oct 14 14:28:48 2022 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 4MppfS6jkfz4fZVj; Fri, 14 Oct 2022 14:28:48 +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 4MppfS6JJsz44JK; Fri, 14 Oct 2022 14:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665757728; 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=A+0TPG5UIEsBG1TbpezmnkNWBHoubRtgrb9m19jwWGY=; b=JOqhyE9NICTmaWUGBwzT+6bttZcVB1qxwDhaaJXSLmjEdukqUR6vOiaz1PN9rdAKQIxP47 lCMu/Ojo36KqiFzMT65IOx5NFRXWn8El5Sick83/RyVz7us424vhX/Bh2nBwU2pcFASuEa UbugKfkMXSxWVGWO7IfiS/W33ukGTw5NAgrS4KSjG/XAGN1IVBoKqGkd0kYGwr60lCiOcz YPJnOF9eXhfT2Y2Atc64VTOcYIkshNrnkKNLuX5/tld5wgutL4vVDClclquNZS8TyoNsy5 kE1NVK3nupjfFXYKy7fTVJP7dL+zJkDXzbjJDriQ0/VzA6nBBY2nnjAkZOCrwg== 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 4MppfS55nfzp8F; Fri, 14 Oct 2022 14:28:48 +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 29EESmML014422; Fri, 14 Oct 2022 14:28:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29EESmGn014421; Fri, 14 Oct 2022 14:28:48 GMT (envelope-from git) Date: Fri, 14 Oct 2022 14:28:48 GMT Message-Id: <202210141428.29EESmGn014421@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: ac7c9db4410c - 2022Q4 - x11-toolkits/wlroots-devel: unbreak after 2f14955ca9e4 via bundling 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/2022Q4 X-Git-Reftype: branch X-Git-Commit: ac7c9db4410c3e3b50ea90c8a63ee16ce866ec16 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665757728; 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=A+0TPG5UIEsBG1TbpezmnkNWBHoubRtgrb9m19jwWGY=; b=OqkWSvCLTjWMcs6O/y5KVXFXe1iHz/TH7ST4tuKLS2TzZ72hRZfa5djlNh3h8LaoTdUX3V lHY2tPAhUPS1WWw4nlEJM08YtU+LfzGDBt0Z3A4u4Y1RCjIdwZAMoC1Xou4mxcqiUefQvs ok4uppUdYzVqLApgGyHm+dyR5zmho9JS46ka52IgEduvrZK73MfO9Sow602CcB4ueYAC57 5AyFhnynpsvc+pz7I/71oxDpsWX5pSpD4O3/3SmsS1xZi6YkXPH/T5rbQyfLDMtZG1rhXS FtByYHkIGn0JYVFcAjdcOaqQBn8geyejDysN18N/uO201fdJQ/vkdN6exwIOMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665757728; a=rsa-sha256; cv=none; b=kiLHT+IJkpHKfkf4gVBEJNDuPRqL8OCJlgu/9W1aR9W/20qWxA6nRqX2swBZd0Wm1B7CfJ h8UP7cFZy2Nz4Teq2CvkhtxLjhfyqo7cxxs2HRaGufki+2wkDRweCoAsQZrmQ8fK/0Q3/I v7IEEV8WUxaMrJrDzws1ZWIGQ9iR2JDvZyoeO4BQmV1UsNOU7h44OotGNutJHwYnqA/vdX 9ZElO9aokK5YrIqsBH/QzrHnywVzCFkr6payp5MVSNU66w7CznPZl5xLIaOqaKJVljzX1v yz0D6dT8awq/dcCIKWqI4zVUIs4hqAYaXCSQlD3fEJY52CADFZqjsLX4VTOuxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac7c9db4410c3e3b50ea90c8a63ee16ce866ec16 commit ac7c9db4410c3e3b50ea90c8a63ee16ce866ec16 Author: Jan Beich AuthorDate: 2022-10-10 11:43:43 +0000 Commit: Jan Beich CommitDate: 2022-10-14 14:27:25 +0000 x11-toolkits/wlroots-devel: unbreak after 2f14955ca9e4 via bundling ===> wlroots-devel-0.15.0.478 depends on package: wayland-protocols>=1.27 - not found ===> Installing existing package /packages/All/wayland-protocols-1.26.pkg Installing wayland-protocols-1.26... Extracting wayland-protocols-1.26: 100% ===> wlroots-devel-0.15.0.478 depends on package: wayland-protocols>=1.27 - not found *** Error code 1 Dependency wayland-protocols found: NO found 1.26 but need: '>=1.27' Did not find CMake 'cmake' Found CMake: NO Run-time dependency wayland-protocols found: NO (tried pkgconfig and cmake) Looking for a fallback subproject for the dependency wayland-protocols protocol/meson.build:1:0: ERROR: Neither a subproject directory nor a wayland-protocols.wrap file was found. protocol/meson.build:65:1: ERROR: File //usr/local/share/wayland-protocols/staging/ext-idle-notify/ext-idle-notify-v1.xml does not exist. (direct commit to 2022Q4 as 13a88fcede18 is missing on the branch) --- x11-toolkits/wlroots-devel/Makefile | 8 +++++++- x11-toolkits/wlroots-devel/distinfo | 2 ++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index 78326b09890f..4798d2bc9f1c 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -17,7 +17,6 @@ WWW= https://gitlab.freedesktop.org/wlroots/wlroots LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= wayland-protocols>=1.27:graphics/wayland-protocols LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ @@ -31,12 +30,19 @@ USE_XORG= pixman USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org GL_COMMIT= 3a949ea8eb0277f52d10ef0d54760323752321c9 +GL_TUPLE= wayland:wayland-protocols:e631010ab7b96988e7c64c24b7d90f64717eaeee:wlproto/subprojects/wayland-protocols MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} .ifdef PKGNAMESUFFIX PORTSCOUT= ignore:1 PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default MESON_ARGS+= -Ddatadir="${LOCALBASE}/share" + +post-install: post-install${PKGNAMESUFFIX} +post-install${PKGNAMESUFFIX}: +# XXX USES=meson invokes ninja directly, so doesn't support --skip-subprojects + @${RM} -r ${STAGEDIR}${LOCALBASE}/share/pkgconfig + @${RM} -r ${STAGEDIR}${LOCALBASE}/share/wayland-protocols .endif OPTIONS_DEFINE= DRM OPENGL VULKAN X11 diff --git a/x11-toolkits/wlroots-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo index 65ba532f5e48..efac4c067c6b 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,6 +1,8 @@ TIMESTAMP = 1665754575 SHA256 (wlroots-wlroots-3a949ea8eb0277f52d10ef0d54760323752321c9_GL0.tar.gz) = 932c461cc1cccfe992af12308fb3b17e2218cb58876b72ab446b6a4086d30ec2 SIZE (wlroots-wlroots-3a949ea8eb0277f52d10ef0d54760323752321c9_GL0.tar.gz) = 586059 +SHA256 (wayland-wayland-protocols-e631010ab7b96988e7c64c24b7d90f64717eaeee_GL0.tar.gz) = d6700f08259e7aabbd376e6f8dd2d85260452d0b05eac94150ad1219f714c28d +SIZE (wayland-wayland-protocols-e631010ab7b96988e7c64c24b7d90f64717eaeee_GL0.tar.gz) = 115303 SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e SIZE (7c0e2a271a4c.patch) = 5729 SHA256 (a5df0a02a2d9.patch) = df5deb1714001870b846501cbee1e775468ac9c61e735ee3b4ad3a2b83c5573e