From nobody Sun Oct 24 07:08:53 2021 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 6556A1822BB8; Sun, 24 Oct 2021 07:08:53 +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 4HcThj2QTxz3MxW; Sun, 24 Oct 2021 07:08:53 +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 2F16E113CD; Sun, 24 Oct 2021 07:08:53 +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 19O78rNx037544; Sun, 24 Oct 2021 07:08:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19O78rfD037543; Sun, 24 Oct 2021 07:08:53 GMT (envelope-from git) Date: Sun, 24 Oct 2021 07:08:53 GMT Message-Id: <202110240708.19O78rfD037543@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rainer Hurling Subject: git: 069de9cc7922 - main - graphics/qgis: Switch to external MDAL 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: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 069de9cc7922058c9521a63f1414bacdc8249217 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=069de9cc7922058c9521a63f1414bacdc8249217 commit 069de9cc7922058c9521a63f1414bacdc8249217 Author: Rainer Hurling AuthorDate: 2021-10-24 07:02:34 +0000 Commit: Rainer Hurling CommitDate: 2021-10-24 07:08:16 +0000 graphics/qgis: Switch to external MDAL Now that math/mdal is updated to v0.9.0, using it again. Thanks to wen@ --- graphics/qgis/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 122ce70841eb..b0d33bf813bf 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -3,6 +3,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 3_22_0 +PORTREVISION= 1 CATEGORIES= graphics geography PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -44,6 +45,7 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ libgsl.so:math/gsl \ libhdf5.so:science/hdf5 \ liblazperf.so:archivers/lazperf \ + libmdal.so:math/mdal \ libnetcdf.so:science/netcdf \ libOpenCL.so:devel/ocl-icd \ libpdal_base.so:math/pdal \ @@ -124,7 +126,7 @@ SHEBANG_FILES= src/plugins/grass/scripts/*.py CMAKE_ARGS+= -DCMAKE_BUILD_TYPE:STRING=Release \ -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \ -DLazPerf_INCLUDE_DIR:PATH=${LOCALBASE}/include/lazperf \ - -DWITH_INTERNAL_MDAL:BOOL=true \ + -DWITH_INTERNAL_MDAL:BOOL=false \ -DPYRCC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER} \ -DPYUIC_PROGRAM:FILEPATH=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \ -DQSCI_SIP_DIR:PATH=${PYQT_SIPDIR}/Qsci \