rpm/qgis
SHA256
1
0
Fork 0
forked from pool/qgis
Code Pull Requests Activity

Accepting request 910379 from home:licehunter:branches:Application:Geo

Browse Source 
- Enable PDAL

The current builds of QGIS do not include PDAL (WITH_PDAL=FALSE) meaning that it is not possible to work with point clouds.

This submission is my attempt at getting PDAL enabled in QGIS. Successfully tested on Tumbleweed. At the time of branching, Leap 15.x builds were broken due to unrelated changes and remain so in this package.

OBS-URL: https://build.opensuse.org/request/show/910379
OBS-URL: https://build.opensuse.org/package/show/Application:Geo/qgis?expand=0&rev=332
This commit is contained in:
Nicolas Rochard 2021-08-08 11:18:00 +00:00 committed by Git OBS Bridge
parent c718df224d
commit 3af38f85fe
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
qgis-fix-cmake-findpdal.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/cmake/FindPDAL.cmake 2021-08-05 12:51:21.255398497 +0000
+++ b/cmake/FindPDAL.cmake 2021-08-05 12:51:42.319428567 +0000
@@ -40,7 +40,7 @@ FIND_LIBRARY(PDAL_UTIL_LIBRARY NAMES pda
)
FIND_LIBRARY(PDAL_UTIL_LIBRARY NAMES pdal_util libpdal_util)
-FIND_PROGRAM(PDAL_BIN pdal
+FIND_PROGRAM(PDAL_BIN pdal-config
$ENV{LIB_DIR}/bin
/usr/local/bin/
/usr/bin/

5
qgis.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Aug 5 17:41:56 UTC 2021 - D. Berge <opensuse@navlost.eu>
- Enable PDAL
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Aug 3 08:40:57 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de> Tue Aug 3 08:40:57 UTC 2021 - Dirk Stoecker <opensuse@dstoecker.de>

9
qgis.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package qgis # spec file for package qgis-ltr
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
@ -39,7 +39,11 @@ Patch1: fix-fastcgi-include.patch
Patch2: qgis-fix-missing-qwt-inc.patch Patch2: qgis-fix-missing-qwt-inc.patch
# PATCH-FIX-UPSTREAM - https://github.com/qgis/QGIS/commit/581cb40603dd3daca2916b564a4cd2630d005556 # PATCH-FIX-UPSTREAM - https://github.com/qgis/QGIS/commit/581cb40603dd3daca2916b564a4cd2630d005556
Patch3: qgis-fix-missing-qwt-inc-part2.patch Patch3: qgis-fix-missing-qwt-inc-part2.patch
Patch4: qgis-fix-cmake-findpdal.patch
BuildRequires: FastCGI-devel BuildRequires: FastCGI-devel
BuildRequires: PDAL-devel
# PDAL-devel depends on this (laszip_api.h)
BuildRequires: laszip-devel
BuildRequires: bison >= 2.4 BuildRequires: bison >= 2.4
BuildRequires: cmake >= 3.0.0 BuildRequires: cmake >= 3.0.0
BuildRequires: fdupes BuildRequires: fdupes
@ -117,6 +121,7 @@ BuildRequires: pkgconfig(Qt5Qwt6)
BuildRequires: pkgconfig(gsl) >= 1.8 BuildRequires: pkgconfig(gsl) >= 1.8
BuildRequires: pkgconfig(libpq) > 9.4 BuildRequires: pkgconfig(libpq) > 9.4
BuildRequires: pkgconfig(libzip) BuildRequires: pkgconfig(libzip)
BuildRequires: pkgconfig(pdal) >= 2.2.0
BuildRequires: pkgconfig(proj) >= 6.3.1 BuildRequires: pkgconfig(proj) >= 6.3.1
BuildRequires: pkgconfig(python3) >= 3.7 BuildRequires: pkgconfig(python3) >= 3.7
BuildRequires: pkgconfig(qca2-qt5) BuildRequires: pkgconfig(qca2-qt5)
@ -127,6 +132,7 @@ Requires: libQt5Sql5-postgresql
Requires: libQt5Sql5-sqlite Requires: libQt5Sql5-sqlite
# proj.db is required # proj.db is required
Requires: proj Requires: proj
Requires: pdal
Requires: python3-GDAL Requires: python3-GDAL
Requires: python3-Jinja2 Requires: python3-Jinja2
Requires: python3-OWSLib Requires: python3-OWSLib
@ -222,6 +228,7 @@ export PATH=$PATH:$QTDIR/bin
-DWITH_SERVER=TRUE \ -DWITH_SERVER=TRUE \
-DWITH_SERVER_PLUGINS=TRUE \ -DWITH_SERVER_PLUGINS=TRUE \
-DWITH_POSTGRESQL=TRUE \ -DWITH_POSTGRESQL=TRUE \
-DWITH_PDAL=TRUE \
-DWITH_QTWEBKIT=FALSE \ -DWITH_QTWEBKIT=FALSE \
-DFCGI_INCLUDE_DIR=%{_includedir}/fastcgi \ -DFCGI_INCLUDE_DIR=%{_includedir}/fastcgi \
-DPOSTGRES_LIBRARY=%{_libdir}/libpq.so \ -DPOSTGRES_LIBRARY=%{_libdir}/libpq.so \