From nobody Sat Feb 24 05:24:13 2024 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 4Thb0F47QVz5C2xQ; Sat, 24 Feb 2024 05:24:13 +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 4Thb0F2RCZz3xZG; Sat, 24 Feb 2024 05:24:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708752253; 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=v0DcI5r5I6y+v2O51DkCpa+gIA0IH9mgARjVtOgjvzs=; b=UG34t8WUTRfy4C0IXbjYJxTXkcDSJ6WhuPniKJoKSJTkBrbdA7dio+b9/X71Weinb0Aq81 Vl4WF4SexU9+WGEyxrJ5/h/gvH6jGMLcwCtcJqI2H9BrhF8UB0HEsT29FIDm5sIfKw46b1 LG3jeRVDqgC6PRdfO5mj9Pn9XlVGjnAvotZn0F8y/V+YP6+wtmyQLIcI/E4HYDuOagmTz4 2pH0TLDVb1ojq985d2DGAlAnHlnDwIQRi2cvgIw4RU2qC/gb4qg+9jMCIB7zcOD51ne2N2 gP5Snx67SpRz89ly3nbtskmHeN3SX9h2v0OZtds1IMpuS9eVUVlM71+9OK0dLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708752253; a=rsa-sha256; cv=none; b=Y27ZbgNKfK9KT07pO3Xc4cQ3Yka0O0WOqK7SlVALfWFcfZu70b1+LhVqq5xT+AMVe7+63h PH2oLYGYHrQ4zxHuumMYHdXCjmah6YD86N1tLo/wwjmlJeP0HUJOtFl8EGufKyoSx+Su9Q Q5ALipRlc+hXERSljdX71W0VI5K9OfiTk9ANek6zF+yaXf97jsuM3MMMCeKn5Alo9lyWlA B+ZsPNLtoEZ0d6X30FgTcBahS/IiQKQj6ydDeMIMjevdwLObjaPhTkgOihx5eQnbKY0lwb O2ScIXjaa/3gFmCM5WZsCdSU9cBOJxl8t9q68dehJPnIfL0MpwrcurNuU+uBUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708752253; 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=v0DcI5r5I6y+v2O51DkCpa+gIA0IH9mgARjVtOgjvzs=; b=yIULNsR9AamGOrmMIBxZ66RLxSlBeq0EKM+3ZCdtzOHvpD8uv8bMZ+mzpk11UrDwF4FGWm 4yGHtOL7cI3NCetwzFvq90c8gB0hXGcvO87xz7FUV+DtB85P4maZsuB1neeiziEYPO+1Gb vDaRHV/rhJ5GTKALvGLsC+0xOO+PfjgkbZhORpdpcclkAMYP+BHWJ2trEeqyhd97tXmI5L 8xBvCnkqzu3jLWHhqgs71tKsejkSbj2iSuimgy4ELF8WnJFfcCoqbRF1cA3aOO8Qp1FH7P aleI8jMEUI5jIuosIvVD8Iho9jOiGI4HF0OQBau0m1QecajJSx/eHznEWVqtHA== 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 4Thb0F1W8yzn64; Sat, 24 Feb 2024 05:24:13 +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 41O5ODl1086557; Sat, 24 Feb 2024 05:24:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41O5OD1r086554; Sat, 24 Feb 2024 05:24:13 GMT (envelope-from git) Date: Sat, 24 Feb 2024 05:24:13 GMT Message-Id: <202402240524.41O5OD1r086554@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Lo=C3=AFc?= Bartoletti Subject: git: fc5745d2f621 - main - math/saga: fix build against pdal 2.6.3 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: lbartoletti X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fc5745d2f621970d9b80e5b05e7fe215378d4e1e Auto-Submitted: auto-generated The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=fc5745d2f621970d9b80e5b05e7fe215378d4e1e commit fc5745d2f621970d9b80e5b05e7fe215378d4e1e Author: Loïc Bartoletti AuthorDate: 2024-02-22 21:07:14 +0000 Commit: Loïc Bartoletti CommitDate: 2024-02-24 05:23:53 +0000 math/saga: fix build against pdal 2.6.3 --- math/saga/Makefile | 3 ++- math/saga/files/patch-cmake_modules_FindPDAL.cmake | 23 ++++++++++++++++++++++ .../patch-src_tools_io_io__pdal_CMakeLists.txt | 17 ++++++++++++++++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/math/saga/Makefile b/math/saga/Makefile index 1704cf419f6c..0e68194b13aa 100644 --- a/math/saga/Makefile +++ b/math/saga/Makefile @@ -1,5 +1,6 @@ PORTNAME= saga PORTVERSION= 9.3.1 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF/saga-gis/SAGA%20-%20${PORTVERSION:C/\.[[:digit:]]\.[[:digit:]]*$//}/SAGA%20-%20${PORTVERSION} @@ -22,7 +23,7 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libhpdf.so:print/libharu \ libodbc.so:databases/unixODBC \ libopencv_core.so:graphics/opencv \ - libpdal_base.so:math/pdal \ + libpdalcpp.so:math/pdal \ libproj.so:graphics/proj \ libsvm.so:science/libsvm \ libsz.so:science/libaec \ diff --git a/math/saga/files/patch-cmake_modules_FindPDAL.cmake b/math/saga/files/patch-cmake_modules_FindPDAL.cmake new file mode 100644 index 000000000000..e6879b50383c --- /dev/null +++ b/math/saga/files/patch-cmake_modules_FindPDAL.cmake @@ -0,0 +1,23 @@ +--- cmake/modules/FindPDAL.cmake.orig 2024-02-22 20:36:47 UTC ++++ cmake/modules/FindPDAL.cmake +@@ -35,17 +35,10 @@ FIND_LIBRARY(PDAL_CPP_LIBRARY NAMES pdalcpp libpdalcpp + ) + FIND_LIBRARY(PDAL_CPP_LIBRARY NAMES pdalcpp libpdalcpp) + +-FIND_LIBRARY(PDAL_UTIL_LIBRARY NAMES pdal_util libpdal_util PATHS +- "$ENV{LIB_DIR}/lib" +- c:/msys/local/lib +- NO_DEFAULT_PATH +- ) +-FIND_LIBRARY(PDAL_UTIL_LIBRARY NAMES pdal_util libpdal_util) +- +-IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY) ++IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY) + SET(PDAL_FOUND TRUE) +- SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY} ${PDAL_UTIL_LIBRARY}) +-ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY) ++ SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY}) ++ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY) + + IF (PDAL_FOUND) + IF (NOT PDAL_FIND_QUIETLY) diff --git a/math/saga/files/patch-src_tools_io_io__pdal_CMakeLists.txt b/math/saga/files/patch-src_tools_io_io__pdal_CMakeLists.txt new file mode 100644 index 000000000000..bda10dfd1e8d --- /dev/null +++ b/math/saga/files/patch-src_tools_io_io__pdal_CMakeLists.txt @@ -0,0 +1,17 @@ +--- src/tools/io/io_pdal/CMakeLists.txt.orig 2024-02-22 20:37:05 UTC ++++ src/tools/io/io_pdal/CMakeLists.txt +@@ -9,11 +9,10 @@ if(WITH_TOOLS_PDAL) + endif() + find_path (PDAL_INCLUDE_DIR NAMES pdal/pdal.hpp PATHS "${LIB4SAGA}/include") + find_library(PDAL_LIBRARY_CPP NAMES pdalcpp libpdalcpp PATHS "${LIB4SAGA}/lib") +- find_library(PDAL_LIBRARY_UTIL NAMES pdal_util libpdal_util PATHS "${LIB4SAGA}/lib") +- mark_as_advanced(PDAL_INCLUDE_DIR PDAL_LIBRARY_CPP PDAL_LIBRARY_UTIL) ++ mark_as_advanced(PDAL_INCLUDE_DIR PDAL_LIBRARY_CPP) + include(FindPackageHandleStandardArgs) +- FIND_PACKAGE_HANDLE_STANDARD_ARGS(PDAL REQUIRED_VARS PDAL_LIBRARY_UTIL PDAL_LIBRARY_CPP PDAL_INCLUDE_DIR) +- set(PDAL_LIBRARIES ${PDAL_LIBRARY_CPP} ${PDAL_LIBRARY_UTIL} ws2_32) ++ FIND_PACKAGE_HANDLE_STANDARD_ARGS(PDAL REQUIRED_VARS PDAL_LIBRARY_CPP PDAL_INCLUDE_DIR) ++ set(PDAL_LIBRARIES ${PDAL_LIBRARY_CPP} ws2_32) + endif() + if(NOT PDAL_FOUND) + find_package(PDAL QUIET) # link PDAL library