debian packaging: include pdal support for noble-ubuntugis (fixes #58485)

This commit is contained in:
Juergen E. Fischer 2024-08-28 18:28:42 +02:00 committed by Nyall Dawson
parent 18ab8260da
commit c4b6eccc88
3 changed files with 13 additions and 9 deletions

2
debian/control.in vendored
View File

@ -75,7 +75,7 @@ Build-Depends:
qtpositioning5-dev,
qttools5-dev-tools,
qttools5-dev,
#jammy# libpdal-dev, pdal,
#pdal# libpdal-dev, pdal,
libprotobuf-dev,
protobuf-compiler,
libzstd-dev,

View File

@ -1,5 +1,5 @@
usr/lib/qgis/crssync
#jammy#usr/lib/qgis/untwine
#pdal#usr/lib/qgis/untwine
#pdal_wrench#usr/lib/qgis/pdal_wrench
usr/lib/qgis/plugins/libauthmethod_apiheader.so
usr/lib/qgis/plugins/libauthmethod_awss3.so
@ -16,7 +16,7 @@ usr/lib/qgis/plugins/libprovider_gpx.so
usr/lib/qgis/plugins/libprovider_hana.so
usr/lib/qgis/plugins/libprovider_mdal.so
usr/lib/qgis/plugins/libprovider_mssql.so
#jammy#usr/lib/qgis/plugins/libprovider_pdal.so
#pdal#usr/lib/qgis/plugins/libprovider_pdal.so
usr/lib/qgis/plugins/libprovider_postgres.so
usr/lib/qgis/plugins/libprovider_postgresraster.so
usr/lib/qgis/plugins/libprovider_spatialite.so

16
debian/rules vendored
View File

@ -107,12 +107,6 @@ ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA)
endif
ifneq (,$(findstring $(DISTRIBUTION),"jammy"))
CMAKE_OPTS += -DWITH_PDAL=TRUE
else
CMAKE_OPTS += -DWITH_PDAL=FALSE
endif
ifneq (,$(findstring ;$(GRASSVER);, ";7;8;"))
CMAKE_OPTS += \
-DWITH_GRASS=TRUE \
@ -201,6 +195,16 @@ endif
CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER)
ifneq (,$(findstring $(DISTRIBUTION),"jammy"))
CONTROL_EXPRESSIONS += pdal
CMAKE_OPTS += -DWITH_PDAL=TRUE
else ifneq (,$(findstring -noble-ubuntugis-,$(DEB_BUILD_NAME)))
CONTROL_EXPRESSIONS += pdal
CMAKE_OPTS += -DWITH_PDAL=TRUE
else
CMAKE_OPTS += -DWITH_PDAL=FALSE
endif
ifneq (,$(WITH_APIDOC))
CONTROL_EXPRESSIONS += apidoc
endif