diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-09-23 13:18:03 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-24 17:24:12 +0100 |
| commit | a8971860598c87b29ca74238dd714d7096d0257a (patch) | |
| tree | 5b93e7cb5c4b1ba67247db26cef3fd8ae27f92f5 /meta | |
| parent | 95455bc3e2598a8b9045f76381c6091586ce683b (diff) | |
| download | poky-a8971860598c87b29ca74238dd714d7096d0257a.tar.gz | |
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | 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 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}" | |||
| 23 | EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" | 23 | EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" |
| 24 | EXTRA_FFCONF ?= "" | 24 | EXTRA_FFCONF ?= "" |
| 25 | 25 | ||
| 26 | PACKAGECONFIG ??= "bzip2 x264 x11" | 26 | PACKAGECONFIG ??= "bzip2 x264 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" |
| 27 | PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" | 27 | PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" |
| 28 | PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2" | 28 | PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2" |
| 29 | PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger" | 29 | PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger" |