rafaelcaricio/lvgl-rs
1
0
Fork 0
Code Issues 12 Pull requests 2 Projects Releases 4 Wiki Activity

Upgrade LVGL vendored to v7.10.1 #44

Merged
rafaelcaricio merged 2 commits from upgrade-lvgl-v7.10.1 into master 2021-03-07 17:32:27 +00:00
Conversation 0 Commits 2 Files changed 8 +11 -11
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 294b84b490 - Show all commits

8
lvgl-codegen/Cargo.toml
View file

@ -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"]}

4
lvgl-sys/Cargo.toml
View file

@ -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"

2
lvgl-sys/vendor/lvgl vendored

@ -1 +1 @@
Subproject commit 1ca1934dbe8e826ef1ed1690005fb678fea3a1f3
Subproject commit 524709472757405ac0eef8d6d002632526430df3

6
lvgl/Cargo.toml
View file

@ -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" }

2
lvgl/src/ui.rs
View file

@ -43,7 +43,7 @@ where
C: PixelColor + From<Color>,
{
pub fn init() -> LvResult<Self> {
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();
}