From owner-dev-commits-ports-main@freebsd.org Thu May 20 16:15:33 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 55088642D51; Thu, 20 May 2021 16:15:33 +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 4FmFFw65d5z3Lwr; Thu, 20 May 2021 16:15:32 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B4FDA29331; Thu, 20 May 2021 16:15:32 +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 14KGFWAC003875; Thu, 20 May 2021 16:15:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14KGFWGU003874; Thu, 20 May 2021 16:15:32 GMT (envelope-from git) Date: Thu, 20 May 2021 16:15:32 GMT Message-Id: <202105201615.14KGFWGU003874@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 2d3698b77294 - main - math/ceres-solver: Fix PLIST with glog 0.5.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2d3698b772949fbd4c3434d2ac2020ca033df9b2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 May 2021 16:15:33 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=2d3698b772949fbd4c3434d2ac2020ca033df9b2 commit 2d3698b772949fbd4c3434d2ac2020ca033df9b2 Author: Po-Chuan Hsieh AuthorDate: 2021-05-20 16:14:28 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-05-20 16:14:56 +0000 math/ceres-solver: Fix PLIST with glog 0.5.0 - Add BUILD_DEPENDS to ensure glog 0.5.0+ - Bump PORTREVISION for package change In aac990618e17966d1b5865526efd9c89332701fe, glog changed to cmake and provided its own cmake module, therefore ceres-solver does not install its glog-detection cmake module [1]. from CMakeLists.txt [1]: 762 if (GLOG_FOUND AND NOT FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION) 763 # Version of glog detected was not built with CMake, install our glog module 764 # file to enable detection in CeresConfig. 765 install(FILES "${Ceres_SOURCE_DIR}/cmake/FindGlog.cmake" 766 DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR}) 767 endif() Reported by: thierry --- math/ceres-solver/Makefile | 3 ++- math/ceres-solver/pkg-plist | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile index aa7b62bffd83..076d4f79d46f 100644 --- a/math/ceres-solver/Makefile +++ b/math/ceres-solver/Makefile @@ -1,6 +1,6 @@ PORTNAME= ceres-solver DISTVERSION= 2.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MAINTAINER= ports@FreeBSD.org @@ -9,6 +9,7 @@ COMMENT= Nonlinear least squares minimizer LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= glog>=0.5.0:devel/glog LIB_DEPENDS= libglog.so:devel/glog RUN_DEPENDS:= ${BUILD_DEPENDS:Meigen*} diff --git a/math/ceres-solver/pkg-plist b/math/ceres-solver/pkg-plist index 512210ade0b8..12f9fd524053 100644 --- a/math/ceres-solver/pkg-plist +++ b/math/ceres-solver/pkg-plist @@ -55,7 +55,6 @@ lib/cmake/Ceres/CeresConfig.cmake lib/cmake/Ceres/CeresConfigVersion.cmake lib/cmake/Ceres/CeresTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Ceres/CeresTargets.cmake -lib/cmake/Ceres/FindGlog.cmake lib/libceres.so lib/libceres.so.2 lib/libceres.so.%%VERSION%%