From e8fb6581ba6ee26f9f0f295fa596b69ca1420d10 Mon Sep 17 00:00:00 2001 From: Amir Gonnen Date: Fri, 26 Aug 2022 22:53:11 +0300 Subject: [PATCH] Update LVGL. Enable FFMPEG if available --- lib/lv_bindings | 2 +- ports/unix/Makefile | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/lv_bindings b/lib/lv_bindings index 84c751afd..a04f5372e 160000 --- a/lib/lv_bindings +++ b/lib/lv_bindings @@ -1 +1 @@ -Subproject commit 84c751afdb013f50da672dfcc55393c9277f23c5 +Subproject commit a04f5372ee760090978007ec4f67fdc2bd9e8b75 diff --git a/ports/unix/Makefile b/ports/unix/Makefile index 54db2e4ff..0c825dfa8 100644 --- a/ports/unix/Makefile +++ b/ports/unix/Makefile @@ -233,6 +233,14 @@ CFLAGS_MOD += $(FREETYPE_CFLAGS_MOD) -DMICROPY_FREETYPE=1 LDFLAGS_MOD += $(FREETYPE_LDFLAGS_MOD) endif +FFMPEG_LIBS := libavformat libavcodec libswscale +FFMPEG_CFLAGS_MOD := $(shell pkg-config --silence-errors --cflags $(FFMPEG_LIBS)) +FFMPEG_LDFLAGS_MOD := $(shell pkg-config --silence-errors --libs $(FFMPEG_LIBS)) +ifneq ($(FFMPEG_LDFLAGS_MOD),) +CFLAGS_MOD += $(FFMPEG_CFLAGS_MOD) -DMICROPY_FFMPEG=1 +LDFLAGS_MOD += $(FFMPEG_LDFLAGS_MOD) +endif + # source files SRC_C += \ main.c \