Skip to content

Commit 5fabdc5

Browse files
gibixlu-zero
authored andcommitted
Update dependencies
* Update to the current bindgen * workaround broken max_align_t codegen See rust-lang/rust-bindgen#550
1 parent 99d7c97 commit 5fabdc5

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

aom-sys/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ repository = "https://github.com/rust-av/aom-rs"
88

99
build = "build.rs"
1010

11+
[package.metadata.pkg-config]
12+
aom = "0.1.0"
13+
1114
[features]
1215
build = ["cmake"]
1316

1417
[build-dependencies]
15-
bindgen = "0.30"
16-
metadeps = "1.1"
17-
cmake = { version = "0.1.29", optional = true }
18-
19-
[package.metadata.pkg-config]
20-
aom = "0.1.0"
18+
bindgen = "0.38.0"
19+
metadeps = "1.1.2"
20+
cmake = { version = "0.1.33", optional = true }
2121

2222
[dependencies]

aom-sys/build.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ fn main() {
6767
let headers = libs.get("aom").unwrap().include_paths.clone();
6868
// let buildver = libs.get("vpx").unwrap().version.split(".").nth(1).unwrap();
6969

70-
let mut builder = common_builder().header("data/aom.h");
70+
let mut builder = common_builder()
71+
.header("data/aom.h")
72+
.blacklist_type("max_align_t"); // https://github.com/rust-lang-nursery/rust-bindgen/issues/550
7173

7274
for header in headers {
7375
builder = builder.clang_arg("-I").clang_arg(header.to_str().unwrap());

aom-sys/src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ mod tests {
2626
let mut raw = unsafe { mem::uninitialized() };
2727
let mut ctx = unsafe { mem::uninitialized() };
2828

29-
let ret = unsafe { aom_img_alloc(&mut raw, aom_img_fmt::AOM_IMG_FMT_I420, w, h, align) };
29+
let ret = unsafe { aom_img_alloc(&mut raw, aom_img_fmt_AOM_IMG_FMT_I420, w, h, align) };
3030
if ret.is_null() {
3131
panic!("Image allocation failed");
3232
}
@@ -36,7 +36,7 @@ mod tests {
3636
let mut cfg = unsafe { mem::uninitialized() };
3737
let mut ret = unsafe { aom_codec_enc_config_default(aom_codec_av1_cx(), &mut cfg, 0) };
3838

39-
if ret != aom_codec_err_t::AOM_CODEC_OK {
39+
if ret != aom_codec_err_t_AOM_CODEC_OK {
4040
panic!("Default Configuration failed");
4141
}
4242

@@ -56,7 +56,7 @@ mod tests {
5656
)
5757
};
5858

59-
if ret != aom_codec_err_t::AOM_CODEC_OK {
59+
if ret != aom_codec_err_t_AOM_CODEC_OK {
6060
panic!("Codec Init failed");
6161
}
6262

@@ -74,7 +74,7 @@ mod tests {
7474
1,
7575
flags as i64,
7676
);
77-
if ret != aom_codec_err_t::AOM_CODEC_OK {
77+
if ret != aom_codec_err_t_AOM_CODEC_OK {
7878
panic!("Encode failed {:?}", ret);
7979
}
8080

0 commit comments

Comments
 (0)