From 294b84b4901939df99fb368ac4f326465bb2bd94 Mon Sep 17 00:00:00 2001 From: Rafael Caricio Date: Sun, 7 Mar 2021 18:25:05 +0100 Subject: [PATCH] Upgrade LVGL vendored to v7.10.1 --- lvgl-codegen/Cargo.toml | 8 ++++---- lvgl-sys/Cargo.toml | 4 ++-- lvgl-sys/vendor/lvgl | 2 +- lvgl/Cargo.toml | 6 +++--- lvgl/src/ui.rs | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lvgl-codegen/Cargo.toml b/lvgl-codegen/Cargo.toml index d36b716..de9ecfe 100644 --- a/lvgl-codegen/Cargo.toml +++ b/lvgl-codegen/Cargo.toml @@ -9,10 +9,10 @@ license = "MIT" repository = "https://github.com/rafaelcaricio/lvgl-rs" [dependencies] -regex = "1.3.9" -quote = "1.0.7" +regex = "1.4.3" +quote = "1.0.9" lazy_static = "1.4.0" -proc-macro2 = "1.0.18" +proc-macro2 = "1.0.24" Inflector = "0.11.4" -syn = { version = "1.0.31", features = ["full"]} +syn = { version = "1.0.62", features = ["full"]} diff --git a/lvgl-sys/Cargo.toml b/lvgl-sys/Cargo.toml index 0bb6ddc..cc7b74f 100644 --- a/lvgl-sys/Cargo.toml +++ b/lvgl-sys/Cargo.toml @@ -20,5 +20,5 @@ name = "lvgl_sys" cty = "0.2.1" [build-dependencies] -cc = "1.0.50" -bindgen = "0.54.0" +cc = "1.0.67" +bindgen = "0.57.0" diff --git a/lvgl-sys/vendor/lvgl b/lvgl-sys/vendor/lvgl index 1ca1934..5247094 160000 --- a/lvgl-sys/vendor/lvgl +++ b/lvgl-sys/vendor/lvgl @@ -1 +1 @@ -Subproject commit 1ca1934dbe8e826ef1ed1690005fb678fea3a1f3 +Subproject commit 524709472757405ac0eef8d6d002632526430df3 diff --git a/lvgl/Cargo.toml b/lvgl/Cargo.toml index 7847012..e460295 100644 --- a/lvgl/Cargo.toml +++ b/lvgl/Cargo.toml @@ -15,12 +15,12 @@ build = "build.rs" lvgl-sys = { version = "0.5.2", path = "../lvgl-sys" } cty = "0.2.1" embedded-graphics = "0.6.2" -cstr_core = "0.2.0" +cstr_core = "0.2.3" bitflags = "1.2.1" [build-dependencies] -quote = "1.0.7" -proc-macro2 = "1.0.18" +quote = "1.0.9" +proc-macro2 = "1.0.24" lvgl-codegen = { version = "0.5.2", path = "../lvgl-codegen" } lvgl-sys = { version = "0.5.2", path = "../lvgl-sys" } diff --git a/lvgl/src/ui.rs b/lvgl/src/ui.rs index 686103b..699741c 100644 --- a/lvgl/src/ui.rs +++ b/lvgl/src/ui.rs @@ -43,7 +43,7 @@ where C: PixelColor + From, { pub fn init() -> LvResult { - if !LVGL_IN_USE.compare_exchange(false, true, Ordering::SeqCst, Ordering::Relaxed) { + if !LVGL_IN_USE.compare_and_swap(false, true, Ordering::SeqCst) { unsafe { lvgl_sys::lv_init(); }