[oe-commits] Paul Eggleton : libav: make X11 dependencies dependent on DISTRO_FEATURES

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 9b7131e855293064e044cd79259eb350a14f319b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9b7131e855293064e044cd79259eb350a14f319b

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Mon Sep 23 13:18:03 2013 +0000

libav: make X11 dependencies dependent on DISTRO_FEATURES

This enables building libav when x11 is not in DISTRO_FEATURES.

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-multimedia/libav/libav.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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"