diff options
| author | Ross Burton <ross.burton@intel.com> | 2013-03-06 11:55:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-07 11:14:38 +0000 |
| commit | 45452bc0c3575e44fe2167a07ee9e4e829fd4b5b (patch) | |
| tree | dbb7ced87071145659864f77a5805fa142252e23 /meta | |
| parent | e0e5763eb8e39c5c8f58e2b3e70ac12648b16de6 (diff) | |
| download | poky-45452bc0c3575e44fe2167a07ee9e4e829fd4b5b.tar.gz | |
pulseaudio: respect the systemd DISTRO_FEATURE
(From OE-Core rev: 7376f4685899708fced56f212467e78325c99095)
Signed-off-by: Ross Burton <ross.burton@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/pulseaudio/pulseaudio.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 37621e058a..349b643be6 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
| @@ -41,9 +41,11 @@ EXTRA_OECONF = "\ | |||
| 41 | " | 41 | " |
| 42 | 42 | ||
| 43 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ | 43 | PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ |
| 44 | ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ | ||
| 44 | ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk x11', '', d)}" | 45 | ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk x11', '', d)}" |
| 45 | PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc" | 46 | PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc" |
| 46 | PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+" | 47 | PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+" |
| 48 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" | ||
| 47 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" | 49 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" |
| 48 | 50 | ||
| 49 | EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}" | 51 | EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}" |
