Bump gdal-src to 3.10.0

.github/workflows/ci.yml

@@ -25,6 +25,7 @@ jobs:
     strategy:
       matrix:
         version:
+          - 3.10.0
           - 3.9.3
           - 3.8.5
           - 3.7.3

CHANGES.md

@@ -6,6 +6,7 @@
 
   - Drop support for GDAL <3.4 ([#578](https://github.com/georust/gdal/pull/578))
   - Regenerate the pre-built bindings with `std::ffi` instead of `libc` for C types ([#573](https://github.com/georust/gdal/pull/573))
+  - Emit `FILE`, `tm` and `VSIStatBuf` as opaque types ([#573](https://github.com/georust/gdal/pull/573))
   - Upgrade `ndarray` dependency to 0.16 ([#569](https://github.com/georust/gdal/pull/569))
   - Upgrade `thiserror` dependency to 2.0 ([#586](https://github.com/georust/gdal/pull/586))
 

gdal-src/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gdal-src"
-version = "0.1.0"
+version = "0.1.0+3.10.0"
 edition = "2021"
 links = "gdal_src"
 description ="Build script for compiling GDAL from source."
@@ -129,6 +129,7 @@ internal_drivers = [
     "driver_coasp",
     "driver_cosar",
     "driver_ctg",
+    "driver_derived",
     "driver_dimap",
     "driver_dted",
     "driver_elas",
@@ -231,6 +232,7 @@ driver_ceos = []
 driver_coasp = []
 driver_cosar = []
 driver_ctg = []
+driver_derived = []
 driver_dimap = []
 driver_dted = []
 driver_elas = []

gdal-src/build.rs

@@ -132,6 +132,7 @@ fn main() {
     handle_gdal_driver!(config, "driver_coasp");
     handle_gdal_driver!(config, "driver_cosar");
     handle_gdal_driver!(config, "driver_ctg");
+    handle_gdal_driver!(config, "driver_derived");
     handle_gdal_driver!(config, "driver_dimap");
     handle_gdal_driver!(config, "driver_dted");
     handle_gdal_driver!(config, "driver_elas");

gdal-sys/Cargo.toml

@@ -11,7 +11,7 @@ rust-version = "1.58"
 links = "gdal"
 
 [dependencies]
-gdal-src = { path = "../gdal-src/", optional = true }
+gdal-src = { version = "0.1.0", path = "../gdal-src/", optional = true }
 
 [build-dependencies]
 bindgen = { version = "0.70", optional = true }

gdal-sys/README.md

@@ -47,8 +47,15 @@ example (the hash will differ in your build):
     $ cargo build --features bindgen
     $ cp target/debug/build/gdal-sys-db833e3088b78e57/out/bindings.rs gdal-sys/prebuilt-bindings/gdal_3_6.rs
 
-If your're not on a rolling distro, the following command might help:
+If your're not on a rolling distro, the following commands might help:
 
 ```
-$ podman run --rm -it -v $PWD:$PWD:z -w $PWD ghcr.io/osgeo/gdal:ubuntu-full-3.9.3 bash -c "curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable; . ~/.cargo/env && apt update && apt install -y pkg-config gcc libclang-dev && cargo clean && cargo test --features bindgen && shopt -s globstar && mv target/**/bindings.rs gdal-sys/prebuilt-bindings/gdal_3_9.rs"
+podman run --rm -it -v $PWD:$PWD:z -w $PWD ghcr.io/osgeo/gdal:ubuntu-full-3.10.0 bash -c "curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable; . ~/.cargo/env && apt update && apt install -y pkg-config gcc libclang-dev && cargo clean && cargo test --features bindgen && shopt -s globstar && mv target/**/bindings.rs gdal-sys/prebuilt-bindings/gdal_3_10.rs"
+podman run --rm -it -v $PWD:$PWD:z -w $PWD ghcr.io/osgeo/gdal:ubuntu-full-3.9.3 bash -c "curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable; . ~/.cargo/env && apt update && apt install -y pkg-config gcc libclang-dev && cargo clean && cargo test --features bindgen && shopt -s globstar && mv target/**/bindings.rs gdal-sys/prebuilt-bindings/gdal_3_9.rs"
+podman run --rm -it -v $PWD:$PWD:z -w $PWD ghcr.io/osgeo/gdal:ubuntu-full-3.8.5 bash -c "curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable; . ~/.cargo/env && apt update && apt install -y pkg-config gcc libclang-dev && cargo clean && cargo test --features bindgen && shopt -s globstar && mv target/**/bindings.rs gdal-sys/prebuilt-bindings/gdal_3_8.rs"
+podman run --rm -it -v $PWD:$PWD:z -w $PWD ghcr.io/osgeo/gdal:ubuntu-full-3.7.3 bash -c "curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable; . ~/.cargo/env && apt update && apt install -y pkg-config gcc libclang-dev && cargo clean && cargo test --features bindgen && shopt -s globstar && mv target/**/bindings.rs gdal-sys/prebuilt-bindings/gdal_3_7.rs"
+podman run --rm -it -v $PWD:$PWD:z -w $PWD ghcr.io/osgeo/gdal:ubuntu-full-3.6.4 bash -c "curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable; . ~/.cargo/env && apt update && apt install -y pkg-config gcc libclang-dev && cargo clean && cargo test --features bindgen && shopt -s globstar && mv target/**/bindings.rs gdal-sys/prebuilt-bindings/gdal_3_6.rs"
+podman run --rm -it -v $PWD:$PWD:z -w $PWD ghcr.io/osgeo/gdal:ubuntu-full-3.5.3 bash -c "curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable; . ~/.cargo/env && apt update && apt install -y pkg-config gcc libclang-dev && cargo clean && cargo test --features bindgen && shopt -s globstar && mv target/**/bindings.rs gdal-sys/prebuilt-bindings/gdal_3_5.rs"
+podman run --rm -it -v $PWD:$PWD:z -w $PWD ghcr.io/osgeo/gdal:ubuntu-full-3.4.3 bash -c "curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain stable; . ~/.cargo/env && apt update && apt install -y pkg-config gcc libclang-dev && cargo clean && cargo test --features bindgen && shopt -s globstar && mv target/**/bindings.rs gdal-sys/prebuilt-bindings/gdal_3_4.rs"
+rustfmt gdal-sys/prebuilt-bindings/*.rs
 ```

gdal-sys/build.rs

@@ -23,7 +23,10 @@ pub fn write_bindings(include_paths: Vec<String>, out_path: &Path) {
         .allowlist_function("OGR.*")
         .allowlist_function("OSR.*")
         .allowlist_function("OCT.*")
-        .allowlist_function("VSI.*");
+        .allowlist_function("VSI.*")
+        .opaque_type("FILE")
+        .opaque_type("tm")
+        .opaque_type("VSIStatBuf");
 
     for path in include_paths {
         builder = builder