From nobody Sun Nov 27 11:10:25 2022 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 4NKm9F4LbNz4hZNl; Sun, 27 Nov 2022 11:10:25 +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 4NKm9F3s7Xz4PHH; Sun, 27 Nov 2022 11:10:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669547425; 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=xcnizDClMjDPBzn8wowtYgOopThGIUTF27gvnXxdzc0=; b=r+1Q4RvG+e7oKnRGBBGdG8KIpZcMftmfk+2jBevZTGelhPRYMfYN7hUiI5qa8uVQ4wGv+i V7FAmXEkdkTlFbKHrhCBVadJvMTJBmH1adt0HUNcQJAw/7a8PI5/ym7ffmBkSjPOO6SLUP LRZd73lkCpTHi/6Cgdp/y+xVSl58WhPGo/szSfkd1U+qUfnXPBU0TZNcHaSPFGGArANz5j SeSvqkSF3rXv7u8m0yFq9Hc3TO8Gin9dxLbR45Tc/THY0WyMuVYVrpmfjFiUgz2PvMNBOk fYXPre5xfGb6AEOdctG3CtiFW46BS/ANhXXLswQpoux7f6ytx6iuzQNJYvTG6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669547425; 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=xcnizDClMjDPBzn8wowtYgOopThGIUTF27gvnXxdzc0=; b=t4TX8OXemguo59ZOR40oqRpeU5Ii9fcLI6g4YwE3WNXIJM7lTHxVuvOsuT6veCLy/y88d4 hGyJlwcux+6TGGFg7AHuy9/ur8x6muJxH+B7Vr3jZ2CRXySipsTb5z4cKN5rJhYYYTHdsD pMh8Xy5CJEhulnWJrbFnWaj35v/JTqnqQnAEd2/If3kpGFhhe1qr+5DB2hFR+S4lyGHTlU 0rMyrzMMNRJTnjwfcFmHaHistdoRM8hm41l1y0YAO+5b+fbyt7WCar7r0XYREZv1CgmURA WlSgCeDdU48YgsweeEI/k9JAce+i9TOdMVdppsvXS0GYQ7eJi3dpRHkVfAbZbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669547425; a=rsa-sha256; cv=none; b=uanmzB/hfR5co3H3eQStqYIQSwQ4105a/sVV5kALWm5zCP3n1gbAXm9gMLgaMr6MPekiu6 PA58Uv4BBvdLBJ46AqIYx5jelrOeOm2G0Kzx5r1x+YA3Z/XQ3nSm+x/XTWPtHJi9IS2kX3 dBrw8ipStDd6ibsWgbc9CHbJPmg1wTUeNkqsGNgNiyQXKX5bsY6+9gsInLR+f7R4tEl+ph dBNDiRcOEKKipxx5LgWFZmF2UXu3oT/3IT+QhhrrPgoERKI358EKFJ+ZhQr3EVPdmNbL9H uanyTgwQEPkxn1Q5vYOCVftuRHxpEaZrwUP5fY3jDy2tJgjLR66i7DDbDe+SDw== 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 4NKm9F2k1PzwLg; Sun, 27 Nov 2022 11:10:25 +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 2ARBAPRL008360; Sun, 27 Nov 2022 11:10:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ARBAP4S008359; Sun, 27 Nov 2022 11:10:25 GMT (envelope-from git) Date: Sun, 27 Nov 2022 11:10:25 GMT Message-Id: <202211271110.2ARBAP4S008359@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 20b1cb36dae1 - main - math/ceres-solver: chase the upgrade of SuiteSparse 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: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20b1cb36dae15be1adeb92f297b5815151999029 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=20b1cb36dae15be1adeb92f297b5815151999029 commit 20b1cb36dae15be1adeb92f297b5815151999029 Author: Thierry Thomas AuthorDate: 2022-11-26 18:54:41 +0000 Commit: Thierry Thomas CommitDate: 2022-11-27 11:09:57 +0000 math/ceres-solver: chase the upgrade of SuiteSparse Patch from upstream . PR: 267746 Approved by: yuri (maintainer) Obtained from: https://github.com/ceres-solver/ceres-solver/issues/919 --- math/ceres-solver/Makefile | 1 + .../files/patch-cmake_FindSuiteSparse.cmake | 52 ++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile index 1eda7ad4680f..0a1cad198ccc 100644 --- a/math/ceres-solver/Makefile +++ b/math/ceres-solver/Makefile @@ -1,5 +1,6 @@ PORTNAME= ceres-solver DISTVERSION= 2.1.0 +PORTREVISION= 1 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org diff --git a/math/ceres-solver/files/patch-cmake_FindSuiteSparse.cmake b/math/ceres-solver/files/patch-cmake_FindSuiteSparse.cmake new file mode 100644 index 000000000000..a5a9781b6f6b --- /dev/null +++ b/math/ceres-solver/files/patch-cmake_FindSuiteSparse.cmake @@ -0,0 +1,52 @@ +--- cmake/FindSuiteSparse.cmake.orig 2022-03-28 14:02:35 UTC ++++ cmake/FindSuiteSparse.cmake +@@ -394,26 +394,36 @@ if (TARGET SuiteSparse::Config) + else (NOT EXISTS ${SuiteSparse_VERSION_FILE}) + file(READ ${SuiteSparse_VERSION_FILE} Config_CONTENTS) + +- string(REGEX MATCH "#define SUITESPARSE_MAIN_VERSION [0-9]+" +- SuiteSparse_VERSION_MAJOR "${Config_CONTENTS}") +- string(REGEX REPLACE "#define SUITESPARSE_MAIN_VERSION ([0-9]+)" "\\1" +- SuiteSparse_VERSION_MAJOR "${SuiteSparse_VERSION_MAJOR}") ++ string(REGEX MATCH "#define SUITESPARSE_MAIN_VERSION[ \t]+([0-9]+)" ++ SuiteSparse_VERSION_LINE "${Config_CONTENTS}") ++ set (SuiteSparse_VERSION_MAJOR ${CMAKE_MATCH_1}) + +- string(REGEX MATCH "#define SUITESPARSE_SUB_VERSION [0-9]+" +- SuiteSparse_VERSION_MINOR "${Config_CONTENTS}") +- string(REGEX REPLACE "#define SUITESPARSE_SUB_VERSION ([0-9]+)" "\\1" +- SuiteSparse_VERSION_MINOR "${SuiteSparse_VERSION_MINOR}") ++ string(REGEX MATCH "#define SUITESPARSE_SUB_VERSION[ \t]+([0-9]+)" ++ SuiteSparse_VERSION_LINE "${Config_CONTENTS}") ++ set (SuiteSparse_VERSION_MINOR ${CMAKE_MATCH_1}) + +- string(REGEX MATCH "#define SUITESPARSE_SUBSUB_VERSION [0-9]+" +- SuiteSparse_VERSION_PATCH "${Config_CONTENTS}") +- string(REGEX REPLACE "#define SUITESPARSE_SUBSUB_VERSION ([0-9]+)" "\\1" +- SuiteSparse_VERSION_PATCH "${SuiteSparse_VERSION_PATCH}") ++ string(REGEX MATCH "#define SUITESPARSE_SUBSUB_VERSION[ \t]+([0-9]+)" ++ SuiteSparse_VERSION_LINE "${Config_CONTENTS}") ++ set (SuiteSparse_VERSION_PATCH ${CMAKE_MATCH_1}) + ++ unset (SuiteSparse_VERSION_LINE) ++ + # This is on a single line s/t CMake does not interpret it as a list of + # elements and insert ';' separators which would result in 4.;2.;1 nonsense. + set(SuiteSparse_VERSION + "${SuiteSparse_VERSION_MAJOR}.${SuiteSparse_VERSION_MINOR}.${SuiteSparse_VERSION_PATCH}") +- set(SuiteSparse_VERSION_COMPONENTS 3) ++ ++ if (SuiteSparse_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+") ++ set(SuiteSparse_VERSION_COMPONENTS 3) ++ else (SuiteSparse_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+") ++ message (WARNING "Could not parse SuiteSparse_config.h: SuiteSparse " ++ "version will not be available") ++ ++ unset (SuiteSparse_VERSION) ++ unset (SuiteSparse_VERSION_MAJOR) ++ unset (SuiteSparse_VERSION_MINOR) ++ unset (SuiteSparse_VERSION_PATCH) ++ endif (SuiteSparse_VERSION MATCHES "[0-9]+\\.[0-9]+\\.[0-9]+") + endif (NOT EXISTS ${SuiteSparse_VERSION_FILE}) + endif (TARGET SuiteSparse::Config) +