Skip to content

jpegio, build_mp: build against LVGL 9.6 as well as 9.5 #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
bdbarnett wants to merge 5 commits into
base: main
Choose a base branch
from
+10 −5
Draft

jpegio, build_mp: build against LVGL 9.6 as well as 9.5 #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5e94a72
jpegio, build_mp: build against LVGL 9.6 as well as 9.5
bdbarnett Nov 11, 2026
294e488
lock: omnipython-lvgl on its LVGL 9.6 branch
bdbarnett Nov 11, 2026
3498a3b
lock: omnipython-lvgl at its argument-check change
bdbarnett Nov 11, 2026
eb3d69b
lock: omnipython-lvgl at its 9.6 branch head
bdbarnett Nov 11, 2026
f22c71c
lock: omnipython-lvgl at its 9.6 branch head
bdbarnett Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPENDENCIES.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ ulab https://github.com/v923z/micropython-ulab.git 1d3ddd8f52
# sibling checkout is linked there instead) and compiles the port for its
# interpreter. Move the commit here to move every LVGL build, MicroPython's and
# CircuitPython's.
omnipython-lvgl https://github.com/PyDevices/omnipython-lvgl.git c34fbeeb0440e71acb62c92ddee1c3c65d089622
omnipython-lvgl https://github.com/PyDevices/omnipython-lvgl.git 95eba2190660aeaafaf497bf1e10d7f9fda23448

# omnipython-lib is not a module either: it is the repository of our
# Python-only packages (pydevices, palettes, pdwidgets, audioinstruments,
Expand Down
6 changes: 4 additions & 2 deletions build_mp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,8 @@ def lvgl_checkout(ws):

Fetched shallow, sparse and blobless: the ports, generated/, python/ and
the root's files (lv_conf.h), and LVGL's src/ at the commit the repository
records, so it downloads tens of MB rather than LVGL's whole history."""
records (and its include/, from LVGL 9.6), so it downloads tens of MB
rather than LVGL's whole history."""
url, commit = pin(LVGL_REPO)[1:3]
dest = MODULES_DIR / f".{LVGL_REPO}"
if dest.is_symlink():
Expand Down Expand Up @@ -340,7 +341,8 @@ def sparse(repo, origin, sha, paths):
shutil.rmtree(part, ignore_errors=True)
die(f"{LVGL_REPO} {commit[:12]} records no lvgl submodule")
shutil.rmtree(part / "lvgl")
sparse(part / "lvgl", lvgl_url, lvgl_sha[0], ["src"])
# LVGL 9.6 keeps its public headers in include/, beside src/.
sparse(part / "lvgl", lvgl_url, lvgl_sha[0], ["include", "src"])
part.rename(dest)
return dest.resolve()

Expand Down
7 changes: 5 additions & 2 deletions modules/jpegio/src/lvgl_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,11 @@
// decoder instead of being claimed.

#include "lvgl/lvgl.h"
#include "lvgl/src/draw/lv_image_decoder_private.h" // lv_image_decoder_t.info_cb, lv_image_cache_data_t
#include "lvgl/src/core/lv_global.h" // LV_GLOBAL_DEFAULT()->image_cache_draw_buf_handlers
// lv_image_decoder_t.info_cb, lv_image_cache_data_t and
// LV_GLOBAL_DEFAULT()->image_cache_draw_buf_handlers. lvgl_private.h is where
// every LVGL release keeps them: 9.6 moved the decoder's header from src/draw/
// to src/image/.
#include "lvgl/src/lvgl_private.h"

#include <string.h>

Expand Down
Loading