From a8971860598c87b29ca74238dd714d7096d0257a Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 23 Sep 2013 13:18:03 +0000 Subject: [PATCH] libav: make X11 dependencies dependent on DISTRO_FEATURES This enables building libav when x11 is not in DISTRO_FEATURES. (From OE-Core rev: 9b7131e855293064e044cd79259eb350a14f319b) Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-multimedia/libav/libav.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc index eae190d6ea..c33f7edfe0 100644 --- a/meta/recipes-multimedia/libav/libav.inc +++ b/meta/recipes-multimedia/libav/libav.inc @@ -23,7 +23,7 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" EXTRA_FFCONF ?= "" -PACKAGECONFIG ??= "bzip2 x264 x11" +PACKAGECONFIG ??= "bzip2 x264 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2" PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger"