Patchwork libav: make X11 dependencies dependent on DISTRO_FEATURES

login
register
mail settings
Submitter Paul Eggleton
Date Sept. 23, 2013, 1:18 p.m.
Message ID <1379942283-19059-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/58555/
State Accepted
Commit a8971860598c87b29ca74238dd714d7096d0257a
Headers show

Comments

Paul Eggleton - Sept. 23, 2013, 1:18 p.m.
This enables building libav when x11 is not in DISTRO_FEATURES.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-multimedia/libav/libav.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
index eae190d..c33f7ed 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"