Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gdal: 3.6.0.1 -> 3.6.1 #206272

Merged
merged 1 commit into from Dec 18, 2022
Merged

gdal: 3.6.0.1 -> 3.6.1 #206272

merged 1 commit into from Dec 18, 2022

Conversation

imincik
Copy link
Contributor

@imincik imincik commented Dec 15, 2022

Description of changes

Update gdal to the latest bug fix version. This PR is dropping patch which was applied in upstream.

List of changes: https://github.com/OSGeo/gdal/blob/v3.6.1/NEWS.md

Notable change:

"""
GDAL 3.6.1 is a bugfix release. It officially retracts GDAL 3.6.0 which could cause corruption of the spatial index of GeoPackage files it created (in tables with 100 000 features or more): cf qgis/QGIS#51188 and #6911. GDAL 3.6.1 fixes that issue. Setting OGR_GPKG_ALLOW_THREADED_RTREE=NO environment variable (at generation time) also works around the issue with GDAL 3.6.0. Users who have generated corrupted GeoPackage files with 3.6.0 can regnerate them with 3.6.1 with, for example, "ogr2ogr out_ok.gpkg in_corrupted.gpkg" (assuming a GeoPackage file with vector content only)
"""

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.05 Release Notes (or backporting 22.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@imincik
Copy link
Contributor Author

imincik commented Dec 15, 2022

Manually tested by running following commands from built binary:

  • Get list of supported raster formats
./result/bin/gdalinfo --formats
Supported Formats:
  VRT -raster,multidimensional raster- (rw+v): Virtual Raster
  DERIVED -raster- (ro): Derived datasets using VRT pixel functions
  GTiff -raster- (rw+vs): GeoTIFF
  COG -raster- (wv): Cloud optimized GeoTIFF generator
  NITF -raster- (rw+vs): National Imagery Transmission Format
  RPFTOC -raster- (rovs): Raster Product Format TOC format
  ECRGTOC -raster- (rovs): ECRG TOC format
  HFA -raster- (rw+v): Erdas Imagine Images (.img)
  SAR_CEOS -raster- (rov): CEOS SAR Image

...
  • Get list of supported vector formats
./result/bin/ogrinfo --formats
Supported Formats:
  FITS -raster,vector- (rw+): Flexible Image Transport System
  PCIDSK -raster,vector- (rw+v): PCIDSK Database File
  netCDF -raster,multidimensional raster,vector- (rw+vs): Network Common Data Format
  PDS4 -raster,vector- (rw+vs): NASA Planetary Data System 4
  VICAR -raster,vector- (rw+v): MIPL VICAR file
  JP2OpenJPEG -raster,vector- (rwv): JPEG-2000 driver based on OpenJPEG library
  PDF -raster,vector- (rw+vs): Geospatial PDF
  MBTiles -raster,vector- (rw+v): MBTiles
  BAG -raster,multidimensional raster,vector- (rw+v): Bathymetry Attributed Grid
  EEDA -vector- (ro): Earth Engine Data API
  OGCAPI -raster,vector- (rov): OGCAPI

...
  • Convert some QGIS test data
./result/bin/ogr2ogr -f GeoJSON /vsistdout/  ../../../osgeo/qgis/code/tests/testdata/points.shp
{
"type": "FeatureCollection",
"name": "points",
"crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
"features": [
{ "type": "Feature", "properties": { "Class": "Jet", "Heading": 90, "Importance": 3.0, "Pilots": 2, "Cabin Crew": 0, "Staff": 2 }, "geometry": { "type": "Point", "coordinates": [ -117.232574189095814, 37.218771566597894 ] } },
{ "type": "Feature", "properties": { "Class": "Biplane", "Heading": 0, "Importance": 1.0, "Pilots": 3, "Cabin Crew": 3, "Staff": 6 }, "geometry": { "type": "Point", "coordinates": [ -83.333333333333158, 33.888888888889113 ] } },
{ "type": "Feature", "properties": { "Class": "Jet", "Heading": 85, "Importance": 3.0, "Pilots": 1, "Cabin Crew": 1, "Staff": 2 }, "geometry": { "type": "Point", "coordinates": [ -109.613526570048194, 35.719461697722799 ] } },
{ "type": "Feature", "properties": { "Class": "Jet", "Heading": 95, "Importance": 3.0, "Pilots": 1, "Cabin Crew": 1, "Staff": 2 }, "geometry": { "type": "Point", "coordinates": [ -97.798481711525056, 34.83609385783322 ] } },
{ "type": "Feature", "properties": { "Class": "Jet", "Heading": 90, "Importance": 3.0, "Pilots": 1, "Cabin Crew": 0, "Staff": 1 }, "geometry": { "type": "Point", "coordinates": [ -88.30227743271206, 33.731884057971243 ] } },
{ "type": "Feature", "properties": { "Class": "Biplane", "Heading": 340, "Importance": 1.0, "Pilots": 3, "Cabin Crew": 3, "Staff": 6 }, "geometry": { "type": "Point", "coordinates": [ -85.652173913043328, 38.921670117322527 ] } },

...

@dotlambda
Copy link
Member

backport release-22.11

Why?

@imincik
Copy link
Contributor Author

imincik commented Dec 15, 2022

backport release-22.11

Why?

It is a bug fix release to version 3.6 (3.6.0.1) which we currently have in 22.11.

Copy link
Contributor

@risicle risicle left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nixpkgs-review reveals no new failures, macos 10.15 & nixos x86_64

@markuskowa markuskowa merged commit 4eb3edf into NixOS:master Dec 18, 2022
@github-actions
Copy link
Contributor

Successfully created backport PR #206755 for release-22.11.

@imincik imincik deleted the gdal-3.6.1 branch December 18, 2022 20:41
@imincik
Copy link
Contributor Author

imincik commented Dec 18, 2022

Thanks everybody.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants