Skip to content

fix(drm): eliminate use of non-existent lv_api_map.h and enable smoke tests#5694

Merged
kisvegabor merged 3 commits intolvgl:masterfrom
Johennes:feature/eliminate-use-of-lv-api-map
Feb 22, 2024
Merged

fix(drm): eliminate use of non-existent lv_api_map.h and enable smoke tests#5694
kisvegabor merged 3 commits intolvgl:masterfrom
Johennes:feature/eliminate-use-of-lv-api-map

Conversation

@Johennes
Copy link
Contributor

Description of the feature or fix

Compiling the DRM display driver currently fails because it uses a non-existent include.

FAILED: unl0kr.p/.._lvgl_src_drivers_display_drm_lv_linux_drm.c.o 
cc -Iunl0kr.p -I. -I.. -I../.. -I/usr/include/libdrm -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Wpedantic -O0 -g '-DUL_VERSION="2.0.2"' -DLV_USE_LINUX_DRM=1 -MD -MQ unl0kr.p/.._lvgl_src_drivers_display_drm_lv_linux_drm.c.o -MF unl0kr.p/.._lvgl_src_drivers_display_drm_lv_linux_drm.c.o.d -o unl0kr.p/.._lvgl_src_drivers_display_drm_lv_linux_drm.c.o -c ../../lvgl/src/drivers/display/drm/lv_linux_drm.c
../../lvgl/src/drivers/display/drm/lv_linux_drm.c:12:10: fatal error: ../../../lv_api_map.h: No such file or directory
   12 | #include "../../../lv_api_map.h"
      |          ^~~~~~~~~~~~~~~~~~~~~~~

This PR simply removes the include.

I also tried enabling compilation of both the DRM and FBDEV drivers on the CI in this PR.

Notes

@Johennes Johennes force-pushed the feature/eliminate-use-of-lv-api-map branch 3 times, most recently from c9d9a83 to c9693a8 Compare February 19, 2024 14:05
@Johennes Johennes force-pushed the feature/eliminate-use-of-lv-api-map branch 2 times, most recently from a72d611 to 1c0edbe Compare February 19, 2024 17:20
@Johennes Johennes marked this pull request as ready for review February 19, 2024 17:45
@XuNeo
Copy link
Collaborator

XuNeo commented Feb 20, 2024

Hi,
I resolved the conflict and check on mac. Now it's working. My changes are here. I can push to this PR if you allow me.

@Johennes Johennes force-pushed the feature/eliminate-use-of-lv-api-map branch from 1c0edbe to e4a5d77 Compare February 20, 2024 08:20
@Johennes
Copy link
Contributor Author

Hi, I resolved the conflict and check on mac. Now it's working. My changes are here. I can push to this PR if you allow me.

Thanks. I think I messed up because I couldn't get your branch to merge cleanly onto mine. But I've resolved the conflicts manually which hopefully should yield the same result.

Signed-off-by: Neo Xu <neo.xu1990@gmail.com>
@XuNeo
Copy link
Collaborator

XuNeo commented Feb 20, 2024

I added guard to macros overrides in cmake. Confirmed it compiles. :)

Signed-off-by: Neo Xu <neo.xu1990@gmail.com>
@Johennes
Copy link
Contributor Author

Great, thank you! 👍

Copy link
Member

@kisvegabor kisvegabor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's great that DRM is tested now at least by a build test.

@kisvegabor kisvegabor merged commit 1ea51ad into lvgl:master Feb 22, 2024
HongChao6 pushed a commit to HongChao6/lvgl that referenced this pull request Oct 18, 2024
… tests (lvgl#5694)

Signed-off-by: Neo Xu <neo.xu1990@gmail.com>
Co-authored-by: Neo Xu <neo.xu1990@gmail.com>
HongChao6 pushed a commit to HongChao6/lvgl that referenced this pull request Oct 18, 2024
… tests (lvgl#5694)

Signed-off-by: Neo Xu <neo.xu1990@gmail.com>
Co-authored-by: Neo Xu <neo.xu1990@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants