From 6a8b0fb2c3ed750448520f41bcc3cf28a4fac70f Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Sat, 27 Jul 2024 15:52:08 +0200 Subject: [PATCH 1/2] Fix compilation issue after #118 Signed-off-by: Pierre Fenoll --- src/framebuffer/core.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/framebuffer/core.rs b/src/framebuffer/core.rs index ac9bfd2..26da4fe 100644 --- a/src/framebuffer/core.rs +++ b/src/framebuffer/core.rs @@ -52,8 +52,8 @@ impl Framebuffer { Model::Gen1 => Framebuffer::device(device.get_framebuffer_path()), Model::Gen2 => { // Auto-select old method still if env LIBREMARKABLE_FB_DISFAVOR_INTERNAL_RM2FB is set affirmatively - match std::env::var("LIBREMARKABLE_FB_DISFAVOR_INTERNAL_RM2FB").ok() { - Some("1") => Framebuffer::device(device.get_framebuffer_path()), + match std::env::var("LIBREMARKABLE_FB_DISFAVOR_INTERNAL_RM2FB").as_deref() { + Ok("1") => Framebuffer::device(device.get_framebuffer_path()), _ => Framebuffer::rm2fb(device.get_framebuffer_path()), } } From 84e37dfa7996a72471855babbb3b2a0862316f11 Mon Sep 17 00:00:00 2001 From: Pierre Fenoll Date: Sat, 27 Jul 2024 16:23:16 +0200 Subject: [PATCH 2/2] Fix compilation of hlua by switching to a temporary fork Signed-off-by: Pierre Fenoll --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 59141d6..68f2153 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,7 +36,7 @@ fxhash = { version = "0.2.1", optional = true } aabb-quadtree = { version = "0.1.0", optional = true } # hlua -hlua = { version = "0.4.1", optional = true } +hlua = { git = "https://github.com/fenollp/hlua.git", rev = "f327e79", optional = true } # hlua = { version = "0.4.1", optional = true } TODO: https://github.com/tomaka/hlua/pull/223 # runtime benchmarking stopwatch = { version = "0.0.7", optional = true }