package/gdal: giflib and qhull are mandatory

giflib and qhull are mandatory since the addition of the package in
commit 1e64fa2956 and
cb136fc051

Indeed, as explained in above commit, internal (bundled) libraries will
be used if GDAL_USE_GIF and GDAL_USE_QHULL are set to OFF

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Fabrice Fontaine 2024-01-02 21:47:55 +01:00 committed by Thomas Petazzoni
parent 00d55c0730
commit 4c6ff16cf2
2 changed files with 16 additions and 4 deletions

View File

@ -1,18 +1,20 @@
config BR2_PACKAGE_GDAL config BR2_PACKAGE_GDAL
bool "gdal" bool "gdal"
depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c
depends on BR2_INSTALL_LIBSTDCPP # proj depends on BR2_INSTALL_LIBSTDCPP # proj, qhull
# configure can't find proj, when linking statically # configure can't find proj, when linking statically
depends on !BR2_STATIC_LIBS depends on !BR2_STATIC_LIBS
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11, proj
depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597 depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_27597
depends on BR2_TOOLCHAIN_HAS_THREADS # proj depends on BR2_TOOLCHAIN_HAS_THREADS # proj
depends on BR2_USE_WCHAR # proj depends on BR2_USE_WCHAR # proj
select BR2_PACKAGE_GIFLIB
select BR2_PACKAGE_JPEG select BR2_PACKAGE_JPEG
select BR2_PACKAGE_JSON_C select BR2_PACKAGE_JSON_C
select BR2_PACKAGE_LIBGEOTIFF select BR2_PACKAGE_LIBGEOTIFF
select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_PROJ select BR2_PACKAGE_PROJ
select BR2_PACKAGE_QHULL
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
help help
GDAL is a translator library for raster and vector geospatial GDAL is a translator library for raster and vector geospatial

View File

@ -20,16 +20,28 @@ GDAL_SUPPORTS_IN_SOURCE_BUILD = NO
# enabled but it seems, in contrast to mrf driver support, that they # enabled but it seems, in contrast to mrf driver support, that they
# can be implicitly disabled, by configuring gdal without their # can be implicitly disabled, by configuring gdal without their
# respectively needed dependencies. # respectively needed dependencies.
GDAL_DEPENDENCIES = host-pkgconf jpeg json-c libgeotiff libpng proj tiff zlib GDAL_DEPENDENCIES = \
giflib \
host-pkgconf \
jpeg \
json-c \
libgeotiff \
libpng \
proj \
qhull \
tiff \
zlib
# Yes, even though they have -DDGDAL_USE options, a few libraries are # Yes, even though they have -DDGDAL_USE options, a few libraries are
# mandatory. If we don't provide them, bundled versions are used. # mandatory. If we don't provide them, bundled versions are used.
GDAL_CONF_OPTS = \ GDAL_CONF_OPTS = \
-DGDAL_USE_GEOTIFF=ON \ -DGDAL_USE_GEOTIFF=ON \
-DGDAL_USE_GIF=ON \
-DGDAL_USE_JPEG=ON \ -DGDAL_USE_JPEG=ON \
-DGDAL_USE_JSONC=ON \ -DGDAL_USE_JSONC=ON \
-DGDAL_USE_ZLIB=ON \ -DGDAL_USE_ZLIB=ON \
-DGDAL_USE_PNG=ON \ -DGDAL_USE_PNG=ON \
-DGDAL_USE_QHULL=ON \
-DGDAL_USE_ARMADILLO=OFF \ -DGDAL_USE_ARMADILLO=OFF \
-DGDAL_USE_BLOSC=OFF \ -DGDAL_USE_BLOSC=OFF \
-DGDAL_USE_BRUNSLI=OFF \ -DGDAL_USE_BRUNSLI=OFF \
@ -57,7 +69,6 @@ GDAL_CONF_OPTS = \
-DGDAL_USE_KDU=OFF \ -DGDAL_USE_KDU=OFF \
-DGDAL_USE_KEA=OFF \ -DGDAL_USE_KEA=OFF \
-DGDAL_USE_LERC=OFF \ -DGDAL_USE_LERC=OFF \
-DGDAL_USE_GIF=OFF \
-DGDAL_USE_LIBLZMA=OFF \ -DGDAL_USE_LIBLZMA=OFF \
-DGDAL_USE_DEFLATE=OFF \ -DGDAL_USE_DEFLATE=OFF \
-DGDAL_USE_MONGOCXX=OFF \ -DGDAL_USE_MONGOCXX=OFF \
@ -76,7 +87,6 @@ GDAL_CONF_OPTS = \
-DGDAL_USE_PDFIUM=OFF \ -DGDAL_USE_PDFIUM=OFF \
-DGDAL_USE_PODOFO=OFF \ -DGDAL_USE_PODOFO=OFF \
-DGDAL_USE_POPPLER=OFF \ -DGDAL_USE_POPPLER=OFF \
-DGDAL_USE_QHULL=OFF \
-DGDAL_USE_RASDAMAN=OFF \ -DGDAL_USE_RASDAMAN=OFF \
-DGDAL_USE_RASTERLITE2=OFF \ -DGDAL_USE_RASTERLITE2=OFF \
-DGDAL_USE_RDB=OFF \ -DGDAL_USE_RDB=OFF \