From nobody Sat Feb 24 05:24:14 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 4Thb0J1hngz5C35G; Sat, 24 Feb 2024 05:24:16 +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 4Thb0G40YHz3xcg; Sat, 24 Feb 2024 05:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708752254; 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=Rl23mLRo7G1w+utuQ5YoMgAXz+VV/oqTZNyZVK9TlI0=; b=nLRq7Rexh1AMeKeqnRpcWLn4Q1XKjJl1qQ2PrbtQ++WeuKAaScK78nSigztPlJNiUsanD5 rtXXwl0W9nOZpfm+deevsM+7yno6MbFkZIOx64+UP+HWCJIPfNe3DJ4qD7Rci1AdU/hL6c J56F4/I5BQO248saqSVFZ3v/hkpJSlTj8WxpHyMUfiujxquqNOz9nJCLFi9R3oOlNiQdQ4 PlIHffjwf+Ht16JqDt4dN9wgjQiAXcbDU4ArBryW9CBcA+ejVDIqhNqj0yg+K2hiaYxgHX axoJNlqCyVqoaMMDeJZ405Uptjk1h/XUNeKxBN6m3Htk+Axi71DAhov4/UgTng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708752254; a=rsa-sha256; cv=none; b=lAVLC2OQSjC8n1bLDkbHmKyFH/ToNDp8H6psuO0YO6Cy32nG9hCU4AdqXDJcqhIe8nksba uTjUOrHfJgTF6w9ACGh5XW/0i6Az0gOMAQe5vf/MYgk2qi488O2bC2wtjCyva2C4ETNH0P 98sDcZOWa9bBsvl/Hw2ghabZXRnARigeoSFJhCv0DTOzmPk/LOWYE55SStLUPHJMQkjqLj BYxJrH81Izb+fMOM4MrSPy2G18C3/o3O9IoiXUyHDXQKuiIX64J5cyFeH1nthdL5UOZzX7 XgDNpUdN+RA5IY9lwSJeXmPdf7/39putJSPBuwHod97NF7dFG6iQHtBkfHvmVQ== 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=1708752254; 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=Rl23mLRo7G1w+utuQ5YoMgAXz+VV/oqTZNyZVK9TlI0=; b=ZavMgIiZSWXF19Bc0OVworjCDS8uhEOdWJdqQkPHQMrzhwdwzuT2VlBXk4JCUn0ABsZ72X g0ZRTfK/vGdP1Dstc+TgV6BQUDCnGeZ/vIVzl36l1XdRMZ73CCM5+OTEH7orADmHmim6Ig baXb3sX8kEvwoxdAxd8Iw/TftbgW0HqzSPPYDX742GsUTqH4LEgLIkNPntseX+dQ9uhrCy pGZouK8bsv1BfcYhXh/PW4AfRNIZOicJllc6L0PUwRFlK3jF4f7moWSApI/+VeJzN6CHb2 T7DHl6O5Q2qf3ykvZ7INsLazxcsCOZ9lJFnybsotkmODmS+taeEUJNa7iQHkHA== 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 4Thb0G2ssTzmfr; Sat, 24 Feb 2024 05:24:14 +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 41O5OECM086605; Sat, 24 Feb 2024 05:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41O5OE24086602; Sat, 24 Feb 2024 05:24:14 GMT (envelope-from git) Date: Sat, 24 Feb 2024 05:24:14 GMT Message-Id: <202402240524.41O5OE24086602@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: 38181eafc218 - main - graphics/qgis-ltr: 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: 38181eafc218f1aaeba262f6d0a9e0089e1814ce Auto-Submitted: auto-generated The branch main has been updated by lbartoletti: URL: https://cgit.FreeBSD.org/ports/commit/?id=38181eafc218f1aaeba262f6d0a9e0089e1814ce commit 38181eafc218f1aaeba262f6d0a9e0089e1814ce Author: Loïc Bartoletti AuthorDate: 2024-02-22 21:14:10 +0000 Commit: Loïc Bartoletti CommitDate: 2024-02-24 05:23:53 +0000 graphics/qgis-ltr: fix build against pdal 2.6.3 --- graphics/qgis-ltr/Makefile | 4 +- graphics/qgis-ltr/files/patch-cmake_FindPDAL.cmake | 83 ++++++++++++++++++++++ 2 files changed, 85 insertions(+), 2 deletions(-) diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index ad0eff27a3d5..b95dc84e5e0c 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -1,6 +1,6 @@ PORTNAME= qgis DISTVERSION= 3.28.15 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography MASTER_SITES= https://qgis.org/downloads/ PKGNAMESUFFIX= -ltr @@ -43,7 +43,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libmdal.so:math/mdal \ libnetcdf.so:science/netcdf \ libOpenCL.so:devel/ocl-icd \ - libpdal_base.so:math/pdal \ + libpdalcpp.so:math/pdal \ libproj.so:graphics/proj \ libprotobuf-lite.so:devel/protobuf \ libqjson-qt5.so:devel/qjson \ diff --git a/graphics/qgis-ltr/files/patch-cmake_FindPDAL.cmake b/graphics/qgis-ltr/files/patch-cmake_FindPDAL.cmake new file mode 100644 index 000000000000..8e3ebf2b787e --- /dev/null +++ b/graphics/qgis-ltr/files/patch-cmake_FindPDAL.cmake @@ -0,0 +1,83 @@ +--- cmake/FindPDAL.cmake.orig 2024-02-22 21:12:12 UTC ++++ cmake/FindPDAL.cmake +@@ -7,8 +7,7 @@ + # CMake module to search for PDAL library + # + # If it's found it sets PDAL_FOUND to TRUE +-# and following variables are set: +-# PDAL_INCLUDE_DIR ++# and adds the following variable containing library target(s): + # PDAL_LIBRARIES + + # FIND_PATH and FIND_LIBRARY normally search standard locations +@@ -18,6 +17,28 @@ + # locations. When an earlier FIND_* succeeds, subsequent FIND_*s + # searching for the same item do nothing. + ++find_package(PDAL CONFIG) ++ ++if(PDAL_FOUND) ++ if(NOT PDAL_FIND_QUIETLY) ++ message(STATUS "Found PDAL: ${PDAL_LIBRARIES} (${PDAL_VERSION})") ++ endif() ++ ++ if(PDAL_VERSION VERSION_LESS "1.7.0") ++ message(FATAL_ERROR "PDAL version is too old (${PDAL_VERSION}). Use 1.7 or higher.") ++ endif() ++ ++ if(MSVC) ++ foreach(PDAL_TARG ${PDAL_LIBRARIES}) ++ target_compile_definitions(${PDAL_TARG} INTERFACE WIN32_LEAN_AND_MEAN) ++ endforeach() ++ endif() ++ ++ return() ++endif() ++ ++# Fallback for systems where PDAL's config-file package is not present. ++# It is not adapted for PDAL 2.6+ (where pdal_util library is removed). + FIND_PATH(PDAL_INCLUDE_DIR pdal/pdal.hpp + "$ENV{LIB_DIR}/include" + "/usr/include" +@@ -50,7 +71,7 @@ IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTI + + IF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN) + SET(PDAL_FOUND TRUE) +- SET(PDAL_LIBRARIES ${PDAL_CPP_LIBRARY} ${PDAL_UTIL_LIBRARY}) ++ SET(PDAL_LIBRARIES pdalcpp pdal_util) + ENDIF (PDAL_INCLUDE_DIR AND PDAL_CPP_LIBRARY AND PDAL_UTIL_LIBRARY AND PDAL_BIN) + + IF (PDAL_FOUND) +@@ -60,8 +81,8 @@ IF (PDAL_FOUND) + OUTPUT_VARIABLE PDAL_VERSION_OUT ) + STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\1" PDAL_VERSION_MAJOR "${PDAL_VERSION_OUT}") + STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\2" PDAL_VERSION_MINOR "${PDAL_VERSION_OUT}") +- STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\3" PDAL_VERSION_MICRO "${PDAL_VERSION_OUT}") +- STRING(CONCAT PDAL_VERSION ${PDAL_VERSION_MAJOR} "." ${PDAL_VERSION_MINOR} "." ${PDAL_VERSION_MICRO}) ++ STRING(REGEX REPLACE "^.*([0-9]+)\\.([0-9]+)\\.([0-9]+).*$" "\\3" PDAL_VERSION_PATCH "${PDAL_VERSION_OUT}") ++ STRING(CONCAT PDAL_VERSION ${PDAL_VERSION_MAJOR} "." ${PDAL_VERSION_MINOR} "." ${PDAL_VERSION_PATCH}) + + IF (NOT PDAL_FIND_QUIETLY) + MESSAGE(STATUS "Found PDAL: ${PDAL_LIBRARIES} (${PDAL_VERSION})") +@@ -70,6 +91,21 @@ IF (PDAL_FOUND) + IF ((PDAL_VERSION_MAJOR EQUAL 1) AND (PDAL_VERSION_MINOR LESS 7)) + MESSAGE (FATAL_ERROR "PDAL version is too old (${PDAL_VERSION}). Use 1.7 or higher.") + ENDIF() ++ ++ add_library(pdalcpp UNKNOWN IMPORTED) ++ target_link_libraries(pdalcpp INTERFACE ${PDAL_CPP_LIBRARY}) ++ target_include_directories(pdalcpp INTERFACE ${PDAL_INCLUDE_DIR}) ++ set_target_properties(pdalcpp PROPERTIES IMPORTED_LOCATION ${PDAL_CPP_LIBRARY}) ++ ++ add_library(pdal_util UNKNOWN IMPORTED) ++ target_link_libraries(pdal_util INTERFACE ${PDAL_UTIL_LIBRARY}) ++ target_include_directories(pdal_util INTERFACE ${PDAL_INCLUDE_DIR}) ++ set_target_properties(pdal_util PROPERTIES IMPORTED_LOCATION ${PDAL_UTIL_LIBRARY}) ++ ++ if(MSVC) ++ target_compile_definitions(pdalcpp INTERFACE WIN32_LEAN_AND_MEAN) ++ target_compile_definitions(pdal_util INTERFACE WIN32_LEAN_AND_MEAN) ++ endif() + + ELSE (PDAL_FOUND) + IF (PDAL_FIND_REQUIRED)