Update proj-sys to use libproj 9.4.0 (#196)

Author: urschrei

.github/workflows/test.yml

@@ -51,9 +51,9 @@ jobs:
       matrix:
         container_image:
           # Minimum supported rust (MSRV)
-          - "georust/proj-ci:proj-9.3.1-rust-1.70"
+          - "georust/proj-ci:proj-9.4.0-rust-1.70"
           # Latest stable rust
-          - "georust/proj-ci:proj-9.3.1-rust-1.75"
+          - "georust/proj-ci:proj-9.4.0-rust-1.75"
         features:
           - ""
           - "--features network"
@@ -98,34 +98,34 @@ jobs:
         include:
           # Minimum supported rust (MSRV)
           - container:
-              image: georust/proj-ci:proj-9.3.1-rust-1.70
+              image: georust/proj-ci:proj-9.4.0-rust-1.70
               env:
                 _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
             features: ""
           - container:
-              image: georust/proj-ci:proj-9.3.1-rust-1.70
+              image: georust/proj-ci:proj-9.4.0-rust-1.70
               env:
                 _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
             features: "--features bundled_proj"
           - container:
-              image: georust/proj-ci-without-system-proj:proj-9.3.1-rust-1.70
+              image: georust/proj-ci-without-system-proj:proj-9.4.0-rust-1.70
               env:
                 _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
             features: ""
 
           # Latest stable rust
           - container:
-              image: georust/proj-ci:proj-9.3.1-rust-1.75
+              image: georust/proj-ci:proj-9.4.0-rust-1.75
               env:
                 _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
             features: ""
           - container:
-              image: georust/proj-ci:proj-9.3.1-rust-1.75
+              image: georust/proj-ci:proj-9.4.0-rust-1.75
               env:
                 _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
             features: "--features bundled_proj"
           - container:
-              image: georust/proj-ci-without-system-proj:proj-9.3.1-rust-1.75
+              image: georust/proj-ci-without-system-proj:proj-9.4.0-rust-1.75
               env:
                 _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
             features: ""
@@ -141,6 +141,7 @@ jobs:
     runs-on: macos-latest
     env:
       _PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
+      HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: TRUE
     defaults:
       run:
         working-directory: proj-sys
@@ -155,6 +156,7 @@ jobs:
       #
       # but it seems like it hasn't been deployed yet. At some point we should
       # be able to delete this step if CI passes.
+      - run: brew update
       - run: brew install pkg-config
       - run: brew install proj
       - run: cargo test

CHANGES.md

@@ -1,7 +1,7 @@
 # Changes
 
 ## Unreleased
-
+- Update to proj-sys 0.24.0 (libproj 9.4.0)
 - Bump MSRV to 1.65
 
 ## 0.27.2

Cargo.toml

@@ -14,7 +14,7 @@ edition = "2018"
 rust-version = "1.70"
 
 [dependencies]
-proj-sys = { version = "0.23.1", path = "proj-sys" }
+proj-sys = { version = "0.24.0", path = "proj-sys" }
 geo-types = { version = "0.7.10", optional = true }
 libc = "0.2.119"
 num-traits = "0.2.14"

README.md

@@ -2,7 +2,7 @@
 
 # PROJ
 
-Coordinate transformation via bindings to the [PROJ](https://proj.org) v9.2 API.
+Coordinate transformation via bindings to the [PROJ](https://proj.org) v9.4 API.
 
 Two coordinate transformation operations are currently provided: _projection_ (and inverse
 projection) and _conversion_.
@@ -12,7 +12,7 @@ vice versa (inverse projection), while _conversion_ is intended for transformati
 projected coordinate systems. The PROJ [documentation](https://proj.org/operations/index.html)
 explains the distinction between these operations in more detail.
 
-This crate depends on [`libproj v9.2.x`](https://proj.org), accessed via the
+This crate depends on [`libproj v9.4.x`](https://proj.org), accessed via the
 [`proj-sys`](https://docs.rs/proj-sys) crate. By default, `proj-sys` will try to find a
 pre-existing installation of libproj on your system. If an appropriate version of libproj
 cannot be found, the build script will attempt to build libproj from source. You may specify a

proj-sys/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "proj-sys"
-description = "Rust bindings for PROJ v9.2.x"
+description = "Rust bindings for PROJ v9.4.x"
 repository = "https://github.com/georust/proj"
-version = "0.23.2"
+version = "0.24.0"
 readme = "README.md"
 authors = ["The Georust developers <mods@georust.org>"]
 keywords = ["proj", "projection", "osgeo", "geo", "geospatial"]

proj-sys/PROJSRC/proj-9.3.1.tar.gz

@@ -1,4 +1,4 @@
-# Low-level bindings for PROJ v9.1.x
+# Low-level bindings for PROJ v9.4.x
 
 **This is a
 [`*-sys`](https://doc.rust-lang.org/cargo/reference/build-scripts.html#-sys-packages)

proj-sys/PROJSRC/proj-9.4.0.tar.gz

@@ -4,7 +4,7 @@ use std::fs::File;
 use std::path::PathBuf;
 use tar::Archive;
 
-const MINIMUM_PROJ_VERSION: &str = "9.3.0";
+const MINIMUM_PROJ_VERSION: &str = "9.4.0";
 
 #[cfg(feature = "nobuild")]
 fn main() {} // Skip the build script on docs.rs
@@ -81,13 +81,13 @@ fn build_from_source() -> Result<std::path::PathBuf, Box<dyn std::error::Error>>
     }
 
     // NOTE: The PROJ build expects Sqlite3 to be present on the system.
-    let path = "PROJSRC/proj-9.3.1.tar.gz";
+    let path = "PROJSRC/proj-9.4.0.tar.gz";
     let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
     let tar_gz = File::open(path)?;
     let tar = GzDecoder::new(tar_gz);
     let mut archive = Archive::new(tar);
     archive.unpack("PROJSRC/proj")?;
-    let mut config = cmake::Config::new("PROJSRC/proj/proj-9.3.1");
+    let mut config = cmake::Config::new("PROJSRC/proj/proj-9.4.0");
     config.define("BUILD_SHARED_LIBS", "OFF");
     config.define("BUILD_TESTING", "OFF");
     config.define("BUILD_CCT", "OFF");