Skip to content

Commit 3cdf73b

Browse files
Merge pull request #27 from ciuncan/master
Bump `bindgen` to latest to improve `clang-sys` compatibility
2 parents 5dcfea0 + 6877c5e commit 3cdf73b

File tree

2 files changed

+86
-86
lines changed

2 files changed

+86
-86
lines changed

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "ffmpeg-sys-next"
3-
version = "4.4.0-next.1"
3+
version = "4.4.0-next.2"
44
build = "build.rs"
55
links = "ffmpeg"
66

@@ -22,7 +22,7 @@ libc = "0.2"
2222
num_cpus = "1.11"
2323
cc = "1.0"
2424
pkg-config = "0.3"
25-
bindgen = { version = "0.54", default-features = false, features = ["runtime"] }
25+
bindgen = { version = "0.59", default-features = false, features = ["runtime"] }
2626

2727
[target.'cfg(target_env = "msvc")'.build-dependencies]
2828
vcpkg = "0.2"

build.rs

Lines changed: 84 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,92 +1064,92 @@ fn main() {
10641064
.clang_args(clang_includes)
10651065
.ctypes_prefix("libc")
10661066
// https://github.com/rust-lang/rust-bindgen/issues/550
1067-
.blacklist_type("max_align_t")
1068-
.blacklist_function("_.*")
1069-
// Blacklist functions with u128 in signature.
1067+
.blocklist_type("max_align_t")
1068+
.blocklist_function("_.*")
1069+
// Blocklist functions with u128 in signature.
10701070
// https://github.com/zmwangx/rust-ffmpeg-sys/issues/1
10711071
// https://github.com/rust-lang/rust-bindgen/issues/1549
1072-
.blacklist_function("acoshl")
1073-
.blacklist_function("acosl")
1074-
.blacklist_function("asinhl")
1075-
.blacklist_function("asinl")
1076-
.blacklist_function("atan2l")
1077-
.blacklist_function("atanhl")
1078-
.blacklist_function("atanl")
1079-
.blacklist_function("cbrtl")
1080-
.blacklist_function("ceill")
1081-
.blacklist_function("copysignl")
1082-
.blacklist_function("coshl")
1083-
.blacklist_function("cosl")
1084-
.blacklist_function("dreml")
1085-
.blacklist_function("ecvt_r")
1086-
.blacklist_function("erfcl")
1087-
.blacklist_function("erfl")
1088-
.blacklist_function("exp2l")
1089-
.blacklist_function("expl")
1090-
.blacklist_function("expm1l")
1091-
.blacklist_function("fabsl")
1092-
.blacklist_function("fcvt_r")
1093-
.blacklist_function("fdiml")
1094-
.blacklist_function("finitel")
1095-
.blacklist_function("floorl")
1096-
.blacklist_function("fmal")
1097-
.blacklist_function("fmaxl")
1098-
.blacklist_function("fminl")
1099-
.blacklist_function("fmodl")
1100-
.blacklist_function("frexpl")
1101-
.blacklist_function("gammal")
1102-
.blacklist_function("hypotl")
1103-
.blacklist_function("ilogbl")
1104-
.blacklist_function("isinfl")
1105-
.blacklist_function("isnanl")
1106-
.blacklist_function("j0l")
1107-
.blacklist_function("j1l")
1108-
.blacklist_function("jnl")
1109-
.blacklist_function("ldexpl")
1110-
.blacklist_function("lgammal")
1111-
.blacklist_function("lgammal_r")
1112-
.blacklist_function("llrintl")
1113-
.blacklist_function("llroundl")
1114-
.blacklist_function("log10l")
1115-
.blacklist_function("log1pl")
1116-
.blacklist_function("log2l")
1117-
.blacklist_function("logbl")
1118-
.blacklist_function("logl")
1119-
.blacklist_function("lrintl")
1120-
.blacklist_function("lroundl")
1121-
.blacklist_function("modfl")
1122-
.blacklist_function("nanl")
1123-
.blacklist_function("nearbyintl")
1124-
.blacklist_function("nextafterl")
1125-
.blacklist_function("nexttoward")
1126-
.blacklist_function("nexttowardf")
1127-
.blacklist_function("nexttowardl")
1128-
.blacklist_function("powl")
1129-
.blacklist_function("qecvt")
1130-
.blacklist_function("qecvt_r")
1131-
.blacklist_function("qfcvt")
1132-
.blacklist_function("qfcvt_r")
1133-
.blacklist_function("qgcvt")
1134-
.blacklist_function("remainderl")
1135-
.blacklist_function("remquol")
1136-
.blacklist_function("rintl")
1137-
.blacklist_function("roundl")
1138-
.blacklist_function("scalbl")
1139-
.blacklist_function("scalblnl")
1140-
.blacklist_function("scalbnl")
1141-
.blacklist_function("significandl")
1142-
.blacklist_function("sinhl")
1143-
.blacklist_function("sinl")
1144-
.blacklist_function("sqrtl")
1145-
.blacklist_function("strtold")
1146-
.blacklist_function("tanhl")
1147-
.blacklist_function("tanl")
1148-
.blacklist_function("tgammal")
1149-
.blacklist_function("truncl")
1150-
.blacklist_function("y0l")
1151-
.blacklist_function("y1l")
1152-
.blacklist_function("ynl")
1072+
.blocklist_function("acoshl")
1073+
.blocklist_function("acosl")
1074+
.blocklist_function("asinhl")
1075+
.blocklist_function("asinl")
1076+
.blocklist_function("atan2l")
1077+
.blocklist_function("atanhl")
1078+
.blocklist_function("atanl")
1079+
.blocklist_function("cbrtl")
1080+
.blocklist_function("ceill")
1081+
.blocklist_function("copysignl")
1082+
.blocklist_function("coshl")
1083+
.blocklist_function("cosl")
1084+
.blocklist_function("dreml")
1085+
.blocklist_function("ecvt_r")
1086+
.blocklist_function("erfcl")
1087+
.blocklist_function("erfl")
1088+
.blocklist_function("exp2l")
1089+
.blocklist_function("expl")
1090+
.blocklist_function("expm1l")
1091+
.blocklist_function("fabsl")
1092+
.blocklist_function("fcvt_r")
1093+
.blocklist_function("fdiml")
1094+
.blocklist_function("finitel")
1095+
.blocklist_function("floorl")
1096+
.blocklist_function("fmal")
1097+
.blocklist_function("fmaxl")
1098+
.blocklist_function("fminl")
1099+
.blocklist_function("fmodl")
1100+
.blocklist_function("frexpl")
1101+
.blocklist_function("gammal")
1102+
.blocklist_function("hypotl")
1103+
.blocklist_function("ilogbl")
1104+
.blocklist_function("isinfl")
1105+
.blocklist_function("isnanl")
1106+
.blocklist_function("j0l")
1107+
.blocklist_function("j1l")
1108+
.blocklist_function("jnl")
1109+
.blocklist_function("ldexpl")
1110+
.blocklist_function("lgammal")
1111+
.blocklist_function("lgammal_r")
1112+
.blocklist_function("llrintl")
1113+
.blocklist_function("llroundl")
1114+
.blocklist_function("log10l")
1115+
.blocklist_function("log1pl")
1116+
.blocklist_function("log2l")
1117+
.blocklist_function("logbl")
1118+
.blocklist_function("logl")
1119+
.blocklist_function("lrintl")
1120+
.blocklist_function("lroundl")
1121+
.blocklist_function("modfl")
1122+
.blocklist_function("nanl")
1123+
.blocklist_function("nearbyintl")
1124+
.blocklist_function("nextafterl")
1125+
.blocklist_function("nexttoward")
1126+
.blocklist_function("nexttowardf")
1127+
.blocklist_function("nexttowardl")
1128+
.blocklist_function("powl")
1129+
.blocklist_function("qecvt")
1130+
.blocklist_function("qecvt_r")
1131+
.blocklist_function("qfcvt")
1132+
.blocklist_function("qfcvt_r")
1133+
.blocklist_function("qgcvt")
1134+
.blocklist_function("remainderl")
1135+
.blocklist_function("remquol")
1136+
.blocklist_function("rintl")
1137+
.blocklist_function("roundl")
1138+
.blocklist_function("scalbl")
1139+
.blocklist_function("scalblnl")
1140+
.blocklist_function("scalbnl")
1141+
.blocklist_function("significandl")
1142+
.blocklist_function("sinhl")
1143+
.blocklist_function("sinl")
1144+
.blocklist_function("sqrtl")
1145+
.blocklist_function("strtold")
1146+
.blocklist_function("tanhl")
1147+
.blocklist_function("tanl")
1148+
.blocklist_function("tgammal")
1149+
.blocklist_function("truncl")
1150+
.blocklist_function("y0l")
1151+
.blocklist_function("y1l")
1152+
.blocklist_function("ynl")
11531153
.rustified_enum("*")
11541154
.prepend_enum_name(false)
11551155
.derive_eq(true)

0 commit comments

Comments
 (0)