Skip to content

Commit 46133ec

Browse files
committed
Update proj-sys to use libproj 9.4.0
1 parent ae91aba commit 46133ec

File tree

8 files changed

+1476
-17
lines changed

8 files changed

+1476
-17
lines changed

.github/workflows/test.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ jobs:
5151
matrix:
5252
container_image:
5353
# Minimum supported rust (MSRV)
54-
- "georust/proj-ci:proj-9.3.1-rust-1.70"
54+
- "georust/proj-ci:proj-9.4.0-rust-1.70"
5555
# Latest stable rust
56-
- "georust/proj-ci:proj-9.3.1-rust-1.75"
56+
- "georust/proj-ci:proj-9.4.0-rust-1.75"
5757
features:
5858
- ""
5959
- "--features network"
@@ -98,34 +98,34 @@ jobs:
9898
include:
9999
# Minimum supported rust (MSRV)
100100
- container:
101-
image: georust/proj-ci:proj-9.3.1-rust-1.70
101+
image: georust/proj-ci:proj-9.4.0-rust-1.70
102102
env:
103103
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
104104
features: ""
105105
- container:
106-
image: georust/proj-ci:proj-9.3.1-rust-1.70
106+
image: georust/proj-ci:proj-9.4.0-rust-1.70
107107
env:
108108
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
109109
features: "--features bundled_proj"
110110
- container:
111-
image: georust/proj-ci-without-system-proj:proj-9.3.1-rust-1.70
111+
image: georust/proj-ci-without-system-proj:proj-9.4.0-rust-1.70
112112
env:
113113
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
114114
features: ""
115115

116116
# Latest stable rust
117117
- container:
118-
image: georust/proj-ci:proj-9.3.1-rust-1.75
118+
image: georust/proj-ci:proj-9.4.0-rust-1.75
119119
env:
120120
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 0
121121
features: ""
122122
- container:
123-
image: georust/proj-ci:proj-9.3.1-rust-1.75
123+
image: georust/proj-ci:proj-9.4.0-rust-1.75
124124
env:
125125
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
126126
features: "--features bundled_proj"
127127
- container:
128-
image: georust/proj-ci-without-system-proj:proj-9.3.1-rust-1.75
128+
image: georust/proj-ci-without-system-proj:proj-9.4.0-rust-1.75
129129
env:
130130
_PROJ_SYS_TEST_EXPECT_BUILD_FROM_SRC: 1
131131
features: ""

proj-sys/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "proj-sys"
3-
description = "Rust bindings for PROJ v9.2.x"
3+
description = "Rust bindings for PROJ v9.4.x"
44
repository = "https://github.com/georust/proj"
5-
version = "0.23.2"
5+
version = "0.24.0"
66
readme = "README.md"
77
authors = ["The Georust developers <mods@georust.org>"]
88
keywords = ["proj", "projection", "osgeo", "geo", "geospatial"]

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

-5.35 MB
Binary file not shown.

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

5.39 MB
Binary file not shown.

proj-sys/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Low-level bindings for PROJ v9.1.x
1+
# Low-level bindings for PROJ v9.4.x
22

33
**This is a
44
[`*-sys`](https://doc.rust-lang.org/cargo/reference/build-scripts.html#-sys-packages)

proj-sys/build.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::fs::File;
44
use std::path::PathBuf;
55
use tar::Archive;
66

7-
const MINIMUM_PROJ_VERSION: &str = "9.3.0";
7+
const MINIMUM_PROJ_VERSION: &str = "9.4.0";
88

99
#[cfg(feature = "nobuild")]
1010
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>>
8181
}
8282

8383
// NOTE: The PROJ build expects Sqlite3 to be present on the system.
84-
let path = "PROJSRC/proj-9.3.1.tar.gz";
84+
let path = "PROJSRC/proj-9.4.0.tar.gz";
8585
let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
8686
let tar_gz = File::open(path)?;
8787
let tar = GzDecoder::new(tar_gz);
8888
let mut archive = Archive::new(tar);
8989
archive.unpack("PROJSRC/proj")?;
90-
let mut config = cmake::Config::new("PROJSRC/proj/proj-9.3.1");
90+
let mut config = cmake::Config::new("PROJSRC/proj/proj-9.4.0");
9191
config.define("BUILD_SHARED_LIBS", "OFF");
9292
config.define("BUILD_TESTING", "OFF");
9393
config.define("BUILD_CCT", "OFF");

0 commit comments

Comments
 (0)