diff --git a/meson.build b/meson.build index e9040fe..961dfc9 100644 --- a/meson.build +++ b/meson.build @@ -233,7 +233,7 @@ if get_option('front-lvgl').enabled() 'src/uicomponents/imgs/white24.c', 'src/uicomponents/uirgblight.cpp', 'src/uicomponents/UILogBox.cpp', - 'src/uicomponents/uiapexcard.cpp', + # 'src/uicomponents/uiapexcard.cpp', 'src/uicomponents/UIComponents.cpp', 'src/front-lvgl.cpp', 'src/lv_conf.h', diff --git a/scripts/build-targets/Dockerfile.debian-experimental b/scripts/build-targets/Dockerfile.debian-experimental new file mode 100644 index 0000000..3003ce9 --- /dev/null +++ b/scripts/build-targets/Dockerfile.debian-experimental @@ -0,0 +1,15 @@ +FROM debian:experimental +RUN apt-get update +RUN apt-get -yy install \ + build-essential \ + git \ + cmake \ + ninja-build \ + nlohmann-json3-dev \ + pkg-config \ + libsdl2-dev \ + libssl-dev \ + python3-pip \ + xxd +RUN pip install --break-system-packages meson +RUN git config --global --add safe.directory '*' # this makes meson's vcs_tag() work diff --git a/scripts/build-targets/Makefile b/scripts/build-targets/Makefile index 38faef3..c051567 100644 --- a/scripts/build-targets/Makefile +++ b/scripts/build-targets/Makefile @@ -2,3 +2,6 @@ all: armel armel: docker build -f Dockerfile.armel -t voorkant-builder:armel . + +debian-experimental: + docker build -f Dockerfile.debian-experimental -t voorkant-builder:debian-experimental . diff --git a/scripts/build-targets/run b/scripts/build-targets/run index 9d755aa..2499a5d 100755 --- a/scripts/build-targets/run +++ b/scripts/build-targets/run @@ -1,4 +1,4 @@ #!/bin/sh TARGET=$1 shift -docker run -v $(pwd):$(pwd) -w $(pwd) --rm voorkant-builder:$TARGET "$@" +docker run -t -v $(pwd):$(pwd) -w $(pwd) --rm voorkant-builder:$TARGET "$@" diff --git a/src/front-lvgl.cpp b/src/front-lvgl.cpp index 8ac8b51..e40a5c2 100644 --- a/src/front-lvgl.cpp +++ b/src/front-lvgl.cpp @@ -308,12 +308,12 @@ void uithread(int _argc, char* _argv[]) g_log << Logger::Warning << "Card is of type button, but no entity found: " << card << std::endl; } } - else if (card["type"] == "custom:apexcharts-card") { + // else if (card["type"] == "custom:apexcharts-card") { - std::unique_ptr apex = std::make_unique(card, cont_row); - uielements.push_back(std::move(apex)); - g_log << Logger::Warning << "got apex card" << std::endl; - } + // std::unique_ptr apex = std::make_unique(card, cont_row); + // uielements.push_back(std::move(apex)); + // g_log << Logger::Warning << "got apex card" << std::endl; + // } else { if (card.contains(("entity"))) { g_log << Logger::Warning << "Card of type " << card["type"] << " found, but we have no matching UIEntity. Creating dummy for entity." << card["entity"] << std::endl;