Skip to content

Commit

Permalink
update libproj to 8.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelkirk committed Feb 23, 2022
1 parent bf48c9d commit e9eab38
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
2 changes: 2 additions & 0 deletions proj-sys/CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Unreleased

- Update to PROJ 8.2.0

# 0.22.0

- Only require tiff for source builds when network feature is enabled
Expand Down
2 changes: 1 addition & 1 deletion proj-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "proj-sys"
description = "Rust bindings for PROJ v8.1.x"
description = "Rust bindings for PROJ v8.2.x"
repository = "https://github.com/georust/proj"
version = "0.22.0"
readme = "README.md"
Expand Down
Binary file removed proj-sys/PROJSRC/proj-8.1.0.tar.gz
Binary file not shown.
Binary file added proj-sys/PROJSRC/proj-8.2.0.tar.gz
Binary file not shown.
4 changes: 2 additions & 2 deletions proj-sys/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Low-level bindings for PROJ v8.1.0
# Low-level bindings for PROJ v8.2.x

**This is a
[`*-sys`](https://doc.rust-lang.org/cargo/reference/build-scripts.html#-sys-packages)
Expand All @@ -8,7 +8,7 @@ crate; you shouldn't use its API directly.** See the
A guide to PROJ functions can be found here:
https://proj.org/development/reference/functions.html.

By default, the crate will search for an existing `libproj` (via `PROJ v8.1.1`)
By default, the crate will search for an acceptable existing `libproj`
installation on your system using
[pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/).

Expand Down
6 changes: 3 additions & 3 deletions proj-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::fs::File;
use std::path::PathBuf;
use tar::Archive;

const MINIMUM_PROJ_VERSION: &str = "8.1.0";
const MINIMUM_PROJ_VERSION: &str = "8.2.0";

#[cfg(feature = "nobuild")]
fn main() {} // Skip the build script on docs.rs
Expand Down Expand Up @@ -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-8.1.0.tar.gz";
let path = "PROJSRC/proj-8.2.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-8.1.0");
let mut config = cmake::Config::new("PROJSRC/proj/proj-8.2.0");
config.define("BUILD_SHARED_LIBS", "OFF");
config.define("BUILD_TESTING", "OFF");
config.define("BUILD_CCT", "OFF");
Expand Down
4 changes: 2 additions & 2 deletions proj-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]
#![doc(html_logo_url = "https://raw.githubusercontent.com/georust/meta/master/logo/logo.png")]
//! # Low-level bindings for PROJ v8.1.x
//! # Low-level bindings for PROJ v8.2.x
//!
//! **This is a
//! [`*-sys`](https://doc.rust-lang.org/cargo/reference/build-scripts.html#-sys-packages)
Expand All @@ -12,7 +12,7 @@
//! A guide to the functions can be found here:
//! <https://proj.org/development/reference/functions.html>.
//!
//! By default, the crate will search for an existing `libproj` (via `PROJ v8.1.x`)
//! By default, the crate will search for an acceptable existing `libproj`
//! installation on your system using
//! [pkg-config](https://www.freedesktop.org/wiki/Software/pkg-config/).
//!
Expand Down

0 comments on commit e9eab38

Please sign in to comment.