diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-03-06 11:55:01 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-07 11:09:34 +0000 |
| commit | 4287440721bc692e8039ee775e6ee272e1349b3e (patch) | |
| tree | 6154d329e00a1b0b4133124f5e083a6a1433ef57 /meta/recipes-multimedia/pulseaudio | |
| parent | 8783fcc23ccbd829ecb0dc59cf71ee44376094cc (diff) | |
| download | openembedded-core-contrib-4287440721bc692e8039ee775e6ee272e1349b3e.tar.gz | |
pulseaudio: rationalise existing configuration using PACKAGECONFIG
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/pulseaudio')
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index 2506e4141b3..37621e058a4 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc @@ -7,11 +7,9 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \ file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \ file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" -DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \ - ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}" +DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool" # optional -DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \ - ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4 sbc', '', d)}" +DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ file://gcc4-compile-fix.patch \ @@ -25,9 +23,7 @@ USE_NLS = "yes" EXTRA_OECONF = "\ --disable-lynx \ - ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \ --disable-polkit \ - ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-x11', '--disable-x11 --disable-gtk2', d)} \ --without-jack \ --with-glib \ --with-alsa \ @@ -44,6 +40,12 @@ EXTRA_OECONF = "\ ac_cv_header_valgrind_memcheck_h=no \ " +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk x11', '', d)}" +PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc" +PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+" +PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" + EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}" PARALLEL_MAKE = "" |