Skip to contentSkip to conversation

package/libcamera-apps: enable LIBAV only if libdrm and ffmpeg is present

PATCH Applied Marcus Folkesson 2 participants 2 messages Feb 22, 2023

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 package/libcamera-apps: enable LIBAV only if libdrm and ffmpeg is present

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>

      |          ^~~~~~~~~~~~~~~~~~~~~

---

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(+)
package/libcamera-apps/libcamera-apps.mk +7 -0
index 290ee9a026..fe402ec3f4 100644
@@ -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) \
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw
Quoted 6 lines · On Wed, 22 Feb 2023 11:39:17 +0100 Marcus Folkesson…

Since commit 35266e84043f880d7591e52b71a8c5b8d0e4717d, libcamera-apps does enable LIBAV by default which depends on libdrm and ffpmeg.

Fixes:
- http://autobuild.buildroot.net/results/548f2a3b353ce4693fb60d7fb1e06e02af22991c/

Quoted 6 lines

/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>

      |          ^~~~~~~~~~~~~~~~~~~~~

---

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot