Skip to content

Commit

Permalink
debian packaging: include pdal support for noble-ubuntugis (fixes #58485
Browse files Browse the repository at this point in the history
)

(cherry picked from commit 4a1540e)
  • Loading branch information
jef-n committed Aug 28, 2024
1 parent bb444d0 commit 9cd96b7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion debian/control.in
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Build-Depends:
qtpositioning5-dev,
qttools5-dev-tools,
qttools5-dev,
#jammy bullseye# libpdal-dev, pdal,
#pdal# libpdal-dev, pdal,
libprotobuf-dev,
protobuf-compiler,
libzstd-dev,
Expand Down
4 changes: 2 additions & 2 deletions debian/qgis-providers.install.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
usr/lib/qgis/crssync
#jammy bullseye#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
Expand All @@ -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 bullseye#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
Expand Down
16 changes: 10 additions & 6 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,6 @@ ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA)
endif

ifneq (,$(findstring $(DISTRIBUTION),"jammy bullseye"))
CMAKE_OPTS += -DWITH_PDAL=TRUE
else
CMAKE_OPTS += -DWITH_PDAL=FALSE
endif

ifneq (,$(findstring ;$(GRASSVER);, ";7;8;"))
CMAKE_OPTS += \
-DWITH_GRASS=TRUE \
Expand Down Expand Up @@ -200,6 +194,16 @@ endif

CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER)

ifneq (,$(findstring $(DISTRIBUTION),"jammy bullseye"))
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
Expand Down

0 comments on commit 9cd96b7

Please sign in to comment.