]> code.ossystems Code Review - openembedded-core.git/commitdiff
libav: make X11 dependencies dependent on DISTRO_FEATURES
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Mon, 23 Sep 2013 13:18:03 +0000 (13:18 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 24 Sep 2013 10:47:48 +0000 (11:47 +0100)
This enables building libav when x11 is not in DISTRO_FEATURES.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-multimedia/libav/libav.inc

index eae190d6ea868c3f5cafe69d98204fd6d1836f4c..c33f7edfe0fd141b35e5b3047431ef74554a7749 100644 (file)
@@ -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"