From nobody Sun Mar 26 21:35:22 2023 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 4Pl8PQ4sfzz41Bfh; Sun, 26 Mar 2023 21:35:22 +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 4Pl8PQ4QgKz4J1s; Sun, 26 Mar 2023 21:35:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679866522; 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=gGOTo3s/nd6KXqJfYX13WoRktg75ARONX6ghO72x2Ik=; b=khYQJGlrrxqRuOHsaFFBzT03cXpHR0Ij2H7Ehe4GMKKA1efeVBYRnfz1RnpGv2Pgjm1wI/ J3d8OiKCpT+0IceS9uDOVmUzOV/p5KnEyPCRt0AwrxeJRis136fFgzemO2Q8T6U2NPD1ni bglisRtLzIBvLEZ/X9kxmjo/eksqNNTQJkbt2p7+2CUNp4Fb6xMmsp+tsydZGQVk79BliQ sIgrWugy771duCOXatR9VYiI7+Mtd81R0ecNDrHmliio+Tei4cjFW0KwR7G3YSQICplchF cKk4nCKhYsBZtW5BGwPl9f6hfqLo2BcLjI6HX6ke5Muyh6hF4nTRSh/4cEXofg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679866522; 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=gGOTo3s/nd6KXqJfYX13WoRktg75ARONX6ghO72x2Ik=; b=dgEgIe1qQ2itE9crBkZenHpEeJYIhvdv+lR2HUtPqQ7+1i4eW++6BciO4iW+RsIHdzGreJ 3xcR2AMvbMwB8fQ9ZspezZt8jXMAkhs8GWoa8StGCm3z5lDlT7nvtQ6YeLIFdNEWhxP0Su Aj0R38xbnqXxAwt9SgJvk9bHdc2z4J1gqJILszBjAcS/OhV8aYAO4mwmfa5QLLG7DxzH71 zhJy8Mg26iVXQ8KE6MPiUMXEXPQOzDudgQ6zW4xLCJtQnduM/kVmJu44bmliAcu9HvC+5d 2nesZQthu/5mNpvKZ3rOCJ51yMfgpgec/QZ/74eg7Vu+E0Ta9grNPY7aQAymeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679866522; a=rsa-sha256; cv=none; b=eXB4ESZqasQ2BRsPbkbyhaxeXOU1A6ggUNnkZxuXGO9XFZCKvsLe4a5MxpMPuERWBcPRBE 2MKxbBYkB74eUjHxKvpFYgH1xkC1rb1EQ64XFwgwrs3YDv8uyWurYhrg8fAEceb5MlhI2S E7CswK4TXaoICZuRX315OcWmaHrqFDjTBMR0bIfCn7awhaLtiOgSSX1XlPF0qKgFftUYDe fVRuVK5Y5PqfRvj+RdHqhzVImmU2zhlDqumGxYDPfFfmRRUopNvhuC8T3YwnwKIkvDnGr1 fRJaZvPWE2cXXtNR/2Vhc91Wi1rUdAiZ4K3g44pCrTGxqBdS/Nps0vgI8tl7+g== 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 4Pl8PQ3XrNzwmF; Sun, 26 Mar 2023 21:35:22 +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 32QLZMjT094054; Sun, 26 Mar 2023 21:35:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32QLZMBx094053; Sun, 26 Mar 2023 21:35:22 GMT (envelope-from git) Date: Sun, 26 Mar 2023 21:35:22 GMT Message-Id: <202303262135.32QLZMBx094053@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 1972bd9d1ffd - main - misc/sdformat: unbreak 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: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1972bd9d1ffd7069b1081269e5bbad01af73e4c0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=1972bd9d1ffd7069b1081269e5bbad01af73e4c0 commit 1972bd9d1ffd7069b1081269e5bbad01af73e4c0 Author: Adriaan de Groot AuthorDate: 2023-03-23 19:31:13 +0000 Commit: Adriaan de Groot CommitDate: 2023-03-26 21:31:32 +0000 misc/sdformat: unbreak Because we have separate directories with urdf (libraries and headers) the consumer that assumes they live in one place falls over because the headers are not found. --- misc/sdformat/Makefile | 2 -- misc/sdformat/files/patch-cmake_SearchForStuff.cmake | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/misc/sdformat/Makefile b/misc/sdformat/Makefile index 8a30e28ce09f..f9a963002b84 100644 --- a/misc/sdformat/Makefile +++ b/misc/sdformat/Makefile @@ -10,8 +10,6 @@ WWW= https://bitbucket.org/osrf/sdformat/src/default/ LICENSE= APACHE20 -BROKEN= does not build: src/parser_urdf.cc:30:10: fatal error: 'urdf_model/model.h' file not found - BUILD_DEPENDS= ignition-cmake==2:devel/ignition-cmake \ ignition-tools>0:devel/ignition-tools \ rubygem-rexml>0:textproc/rubygem-rexml diff --git a/misc/sdformat/files/patch-cmake_SearchForStuff.cmake b/misc/sdformat/files/patch-cmake_SearchForStuff.cmake index f302a1ebac69..39fe56827f33 100644 --- a/misc/sdformat/files/patch-cmake_SearchForStuff.cmake +++ b/misc/sdformat/files/patch-cmake_SearchForStuff.cmake @@ -1,4 +1,4 @@ ---- cmake/SearchForStuff.cmake.orig 2018-11-21 00:19:13 UTC +--- cmake/SearchForStuff.cmake.orig 2018-11-14 23:55:43 UTC +++ cmake/SearchForStuff.cmake @@ -9,24 +9,24 @@ if (USE_EXTERNAL_TINYXML) ################################################# @@ -32,3 +32,20 @@ endif() else() # Needed in WIN32 since in UNIX the flag is added in the code installed +@@ -55,6 +55,7 @@ endif() + if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_URDF) + # check for urdfdom with pkg-config + pkg_check_modules(URDF urdfdom>=1.0) ++ pkg_check_modules(URDF_h urdfdom_headers>=1.0) + + if (NOT URDF_FOUND) + if (NOT DEFINED USE_INTERNAL_URDF) +@@ -65,7 +66,7 @@ if (NOT DEFINED USE_INTERNAL_URDF OR NOT USE_INTERNAL_ + endif() + else() + # what am I doing here? pkg-config and cmake +- set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR}) ++ set(URDF_INCLUDE_DIRS ${URDF_INCLUDEDIR} ${URDF_h_INCLUDEDIR}) + set(URDF_LIBRARY_DIRS ${URDF_LIBDIR}) + endif() + endif()