CVS commit: pkgsrc/geography/py-gdal

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu May 23 13:45:11 UTC 2024

Modified Files:
        pkgsrc/geography/py-gdal: Makefile PLIST

Log Message:
geography/py-gdal: Update to 3.9.0

See ../gdal-lib; this is just a split package of the python bindings.


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/geography/py-gdal/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/py-gdal/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/py-gdal/Makefile
diff -u pkgsrc/geography/py-gdal/Makefile:1.65 pkgsrc/geography/py-gdal/Makefile:1.66
--- pkgsrc/geography/py-gdal/Makefile:1.65      Tue May 21 18:21:33 2024
+++ pkgsrc/geography/py-gdal/Makefile   Thu May 23 13:45:11 2024
@@ -1,25 +1,43 @@
-# $NetBSD: Makefile,v 1.65 2024/05/21 18:21:33 gdt Exp $
+# $NetBSD: Makefile,v 1.66 2024/05/23 13:45:11 gdt Exp $
 
-PKGREVISION=   10
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
 #PKGREVISION=  0
 
 COMMENT=       Translator library for raster geospatial data formats, Python binding
 
+# Beause this package runs cmake for all of gdal, everything that is
+# hard-required must be present, separately from whether it is needed
+# for the python bindings.
 USE_LANGUAGES=         c c++
-USE_C_FEATURES+=       c99
+USE_CC_FEATURES+=      c99
 USE_CXX_FEATURES+=     c++11
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 38
 
-PYSETUPSUBDIR=         swig/python
-
 .include "../../mk/bsd.prefs.mk"
 
 TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 TOOL_DEPENDS+= ${PYPKGPREFIX}-wheel>=0:../../devel/py-wheel
 
+WHEEL_NAME=            GDAL-${PKGVERSION_NOREV}
+PYSETUPSUBDIR=         build/swig/python
+
+# Upstream's distfile does not have a ready-to-use python module
+# source directory.  Creating it requires cmake, but apparently not
+# building the rest of gdal.
+#   \todo Consider enhancing cmake support to allow configure-only and
+#   not overriding the rest of the targets while allowing use of
+#   wheel's build/install targets.
+TOOL_DEPENDS+= cmake>=0:../../devel/cmake
+TOOL_DEPENDS+= swig4-[0-9]*:../../devel/swig4
+pre-build:
+       cd ${WRKSRC} && mkdir build && cd build && \
+       cmake .. && \
+       cd swig/python && \
+       ${MAKE} python_generated_files
+
+BUILDLINK_API_DEPENDS.gdal-lib+=       gdal-lib>=3.9.0
 .include "../../geography/gdal-lib/buildlink3.mk"
 # \todo Explain why wheel must be before tool (Python.h not found), or fix
 # documentation of python/foo.mk.

Index: pkgsrc/geography/py-gdal/PLIST
diff -u pkgsrc/geography/py-gdal/PLIST:1.6 pkgsrc/geography/py-gdal/PLIST:1.7
--- pkgsrc/geography/py-gdal/PLIST:1.6  Tue May 21 18:21:33 2024
+++ pkgsrc/geography/py-gdal/PLIST      Thu May 23 13:45:11 2024
@@ -1,25 +1,45 @@
-@comment $NetBSD: PLIST,v 1.6 2024/05/21 18:21:33 gdt Exp $
+@comment $NetBSD: PLIST,v 1.7 2024/05/23 13:45:11 gdt Exp $
+bin/gdal2tiles
 bin/gdal2tiles.py
+bin/gdal2xyz
 bin/gdal2xyz.py
+bin/gdal_calc
 bin/gdal_calc.py
+bin/gdal_edit
 bin/gdal_edit.py
+bin/gdal_fillnodata
 bin/gdal_fillnodata.py
+bin/gdal_merge
 bin/gdal_merge.py
+bin/gdal_pansharpen
 bin/gdal_pansharpen.py
+bin/gdal_polygonize
 bin/gdal_polygonize.py
+bin/gdal_proximity
 bin/gdal_proximity.py
+bin/gdal_retile
 bin/gdal_retile.py
+bin/gdal_sieve
 bin/gdal_sieve.py
+bin/gdalattachpct
 bin/gdalattachpct.py
+bin/gdalcompare
 bin/gdalcompare.py
+bin/gdalmove
 bin/gdalmove.py
+bin/ogr_layer_algebra
+bin/ogr_layer_algebra.py
+bin/ogrmerge
 bin/ogrmerge.py
+bin/pct2rgb
 bin/pct2rgb.py
+bin/rgb2pct
 bin/rgb2pct.py
-${PYSITELIB}/GDAL-${PKGVERSION}.dist-info/METADATA
-${PYSITELIB}/GDAL-${PKGVERSION}.dist-info/RECORD
-${PYSITELIB}/GDAL-${PKGVERSION}.dist-info/WHEEL
-${PYSITELIB}/GDAL-${PKGVERSION}.dist-info/top_level.txt
+${PYSITELIB}/${WHEEL_INFODIR}/METADATA
+${PYSITELIB}/${WHEEL_INFODIR}/RECORD
+${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
+${PYSITELIB}/${WHEEL_INFODIR}/entry_points.txt
+${PYSITELIB}/${WHEEL_INFODIR}/top_level.txt
 ${PYSITELIB}/osgeo/__init__.py
 ${PYSITELIB}/osgeo/__init__.pyc
 ${PYSITELIB}/osgeo/__init__.pyo
@@ -50,9 +70,6 @@ ${PYSITELIB}/osgeo/ogr.pyo
 ${PYSITELIB}/osgeo/osr.py
 ${PYSITELIB}/osgeo/osr.pyc
 ${PYSITELIB}/osgeo/osr.pyo
-${PYSITELIB}/osgeo/utils.py
-${PYSITELIB}/osgeo/utils.pyc
-${PYSITELIB}/osgeo/utils.pyo
 ${PYSITELIB}/osgeo_utils/__init__.py
 ${PYSITELIB}/osgeo_utils/__init__.pyc
 ${PYSITELIB}/osgeo_utils/__init__.pyo
@@ -140,6 +157,9 @@ ${PYSITELIB}/osgeo_utils/gdalcompare.pyo
 ${PYSITELIB}/osgeo_utils/gdalmove.py
 ${PYSITELIB}/osgeo_utils/gdalmove.pyc
 ${PYSITELIB}/osgeo_utils/gdalmove.pyo
+${PYSITELIB}/osgeo_utils/ogr_layer_algebra.py
+${PYSITELIB}/osgeo_utils/ogr_layer_algebra.pyc
+${PYSITELIB}/osgeo_utils/ogr_layer_algebra.pyo
 ${PYSITELIB}/osgeo_utils/ogrmerge.py
 ${PYSITELIB}/osgeo_utils/ogrmerge.pyc
 ${PYSITELIB}/osgeo_utils/ogrmerge.pyo
@@ -224,9 +244,9 @@ ${PYSITELIB}/osgeo_utils/samples/gdal_rm
 ${PYSITELIB}/osgeo_utils/samples/gdal_vrtmerge.py
 ${PYSITELIB}/osgeo_utils/samples/gdal_vrtmerge.pyc
 ${PYSITELIB}/osgeo_utils/samples/gdal_vrtmerge.pyo
-${PYSITELIB}/osgeo_utils/samples/gdal_zip.py
-${PYSITELIB}/osgeo_utils/samples/gdal_zip.pyc
-${PYSITELIB}/osgeo_utils/samples/gdal_zip.pyo
+${PYSITELIB}/osgeo_utils/samples/gdalbuildvrtofvrt.py
+${PYSITELIB}/osgeo_utils/samples/gdalbuildvrtofvrt.pyc
+${PYSITELIB}/osgeo_utils/samples/gdalbuildvrtofvrt.pyo
 ${PYSITELIB}/osgeo_utils/samples/gdalchksum.py
 ${PYSITELIB}/osgeo_utils/samples/gdalchksum.pyc
 ${PYSITELIB}/osgeo_utils/samples/gdalchksum.pyo
@@ -275,9 +295,6 @@ ${PYSITELIB}/osgeo_utils/samples/make_fu
 ${PYSITELIB}/osgeo_utils/samples/mkgraticule.py
 ${PYSITELIB}/osgeo_utils/samples/mkgraticule.pyc
 ${PYSITELIB}/osgeo_utils/samples/mkgraticule.pyo
-${PYSITELIB}/osgeo_utils/samples/ogr2ogr.py
-${PYSITELIB}/osgeo_utils/samples/ogr2ogr.pyc
-${PYSITELIB}/osgeo_utils/samples/ogr2ogr.pyo
 ${PYSITELIB}/osgeo_utils/samples/ogr2vrt.py
 ${PYSITELIB}/osgeo_utils/samples/ogr2vrt.pyc
 ${PYSITELIB}/osgeo_utils/samples/ogr2vrt.pyo
@@ -287,9 +304,6 @@ ${PYSITELIB}/osgeo_utils/samples/ogr_bui
 ${PYSITELIB}/osgeo_utils/samples/ogr_dispatch.py
 ${PYSITELIB}/osgeo_utils/samples/ogr_dispatch.pyc
 ${PYSITELIB}/osgeo_utils/samples/ogr_dispatch.pyo
-${PYSITELIB}/osgeo_utils/samples/ogr_layer_algebra.py
-${PYSITELIB}/osgeo_utils/samples/ogr_layer_algebra.pyc
-${PYSITELIB}/osgeo_utils/samples/ogr_layer_algebra.pyo
 ${PYSITELIB}/osgeo_utils/samples/ogrinfo.py
 ${PYSITELIB}/osgeo_utils/samples/ogrinfo.pyc
 ${PYSITELIB}/osgeo_utils/samples/ogrinfo.pyo
@@ -314,6 +328,9 @@ ${PYSITELIB}/osgeo_utils/samples/val_rep
 ${PYSITELIB}/osgeo_utils/samples/validate_cloud_optimized_geotiff.py
 ${PYSITELIB}/osgeo_utils/samples/validate_cloud_optimized_geotiff.pyc
 ${PYSITELIB}/osgeo_utils/samples/validate_cloud_optimized_geotiff.pyo
+${PYSITELIB}/osgeo_utils/samples/validate_geoparquet.py
+${PYSITELIB}/osgeo_utils/samples/validate_geoparquet.pyc
+${PYSITELIB}/osgeo_utils/samples/validate_geoparquet.pyo
 ${PYSITELIB}/osgeo_utils/samples/validate_gpkg.py
 ${PYSITELIB}/osgeo_utils/samples/validate_gpkg.pyc
 ${PYSITELIB}/osgeo_utils/samples/validate_gpkg.pyo