Bug 1661045 - Update glslopt to fix build on OpenBSD. r=lsalzman

Differential Revision: https://phabricator.services.mozilla.com/D88254
This commit is contained in:
Jamie Nicol 2020-08-26 14:13:11 +00:00
Родитель 99654d61b3
Коммит 0211cf8e50
6 изменённых файлов: 9 добавлений и 9 удалений

4
Cargo.lock сгенерированный
Просмотреть файл

@ -2081,9 +2081,9 @@ dependencies = [
[[package]]
name = "glslopt"
version = "0.1.6"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5812f82ae612083dad826239289f681198449c6ae808c87caa3bfd47971b587f"
checksum = "8d225aa75dd999f71df957ded531f8a5df732d7f3fa5be13fe578ecd59e40df2"
dependencies = [
"cc",
]

6
gfx/wr/Cargo.lock сгенерированный
Просмотреть файл

@ -685,7 +685,7 @@ dependencies = [
[[package]]
name = "glslopt"
version = "0.1.6"
version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1809,7 +1809,7 @@ dependencies = [
"freetype 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glslopt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
"glslopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
"image 0.23.3 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
@ -2132,7 +2132,7 @@ dependencies = [
"checksum gleam 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdef5b9df6d3a261b80a5ac55e13bf93945725df2463c1b0a2e5a527dce0d37"
"checksum gleam 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "cae10d7c99d0e77b4766e850a60898a17c1abaf01075531f1066f03dc7dc5fc5"
"checksum glsl 4.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "766443890761b3c4edcce86cafaac97971b200662fbdd0446eb7c6b99b4401ea"
"checksum glslopt 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "5812f82ae612083dad826239289f681198449c6ae808c87caa3bfd47971b587f"
"checksum glslopt 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8d225aa75dd999f71df957ded531f8a5df732d7f3fa5be13fe578ecd59e40df2"
"checksum glutin 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5371b35b309dace06be1b81b5f6adb1c9de578b7dbe1e74bf7e4ef762cf6febd"
"checksum glutin_egl_sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "772edef3b28b8ad41e4ea202748e65eefe8e5ffd1f4535f1219793dbb20b3d4c"
"checksum glutin_emscripten_sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80de4146df76e8a6c32b03007bc764ff3249dcaeb4f675d68a06caf1bac363f1"

Просмотреть файл

@ -22,7 +22,7 @@ leak_checks = []
[build-dependencies]
build-parallel = "0.1.1"
glslopt = "0.1.6"
glslopt = "0.1.7"
webrender_build = { version = "0.0.1", path = "../webrender_build" }
[dependencies]

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

2
third_party/rust/glslopt/Cargo.toml поставляемый
Просмотреть файл

@ -13,7 +13,7 @@
[package]
edition = "2018"
name = "glslopt"
version = "0.1.6"
version = "0.1.7"
authors = ["Jamie Nicol <jnicol@mozilla.com>"]
description = "Optimizes GLSL shader code"
keywords = ["opengl", "gl", "gles", "glsl", "shader"]

2
third_party/rust/glslopt/build.rs поставляемый
Просмотреть файл

@ -8,7 +8,7 @@ fn configure(build: &mut cc::Build) -> &mut cc::Build {
build.define("_GNU_SOURCE", None);
build.define("HAVE_ENDIAN_H", None);
}
if cfg!(any(target_os = "freebsd", target_os = "dragonfly")) {
if cfg!(any(target_os = "freebsd", target_os = "dragonfly", target_os = "openbsd")) {
build.define("PTHREAD_SETAFFINITY_IN_NP_HEADER", None);
}
if cfg!(target_os = "windows") {