| Message ID | 20230222103917.2709112-1-marcus.folkesson@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v3] package/libcamera-apps: enable LIBAV only if libdrm and ffmpeg is present | expand |
On Wed, 22 Feb 2023 11:39:17 +0100 Marcus Folkesson <marcus.folkesson@gmail.com> wrote: > Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps > does enable LIBAV by default which depends on libdrm and ffpmeg. > > Fixes: > - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ > > /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory > 13 | #include <libdrm/drm_fourcc.h> > | ^~~~~~~~~~~~~~~~~~~~~ > > Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> > --- Applied to master, thanks. Thomas
diff --git a/package/libcamera-apps/libcamera-apps.mk b/package/libcamera-apps/libcamera-apps.mk index 290ee9a026..fe402ec3f4 100644 --- a/package/libcamera-apps/libcamera-apps.mk +++ b/package/libcamera-apps/libcamera-apps.mk @@ -29,6 +29,13 @@ else LIBCAMERA_APPS_CONF_OPTS += -DENABLE_DRM=0 endif +ifeq ($(BR2_PACKAGE_FFMPEG)$(BR2_PACKAGE_LIBDRM),yy) +LIBCAMERA_APPS_DEPENDENCIES += ffmpeg libdrm +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=1 +else +LIBCAMERA_APPS_CONF_OPTS += -DENABLE_LIBAV=0 +endif + ifeq ($(BR2_PACKAGE_XORG7),y) LIBCAMERA_APPS_DEPENDENCIES += \ $(if $(BR2_PACKAGE_LIBEPOXY),libepoxy) \
Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm and ffpmeg. Fixes: - http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/ /home/buildroot/autobuild/run/instance-1/output-1/build/libcamera-apps-1.1.1/encoder/libav_encoder.cpp:13:10: fatal error: libdrm/drm_fourcc.h: No such file or directory 13 | #include <libdrm/drm_fourcc.h> | ^~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Marcus Folkesson <marcus.folkesson@gmail.com> --- Notes: v3: - Only enable libav if both libdrm and ffmpeg is selected - Tested with these four combinations: - libcamera-apps enabled, ffmpeg disabled, libdrm disabled - libcamera-apps enabled, ffmpeg enabled, libdrm disabled - libcamera-apps enabled, ffmpeg disabled, libdrm enabled - libcamera-apps enabled, ffmpeg enabled, libdrm enabled v2: -Add dependency to ffmpeg package/libcamera-apps/libcamera-apps.mk | 7 +++++++ 1 file changed, 7 insertions(+)