summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/pulseaudio
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-03-06 11:55:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-07 11:14:37 +0000
commite0e5763eb8e39c5c8f58e2b3e70ac12648b16de6 (patch)
tree8be94bb234c47c74a68af4109944ebb4a311f3b4 /meta/recipes-multimedia/pulseaudio
parent1e6d0da8d5456d04c2354d37900a59d292bcd898 (diff)
downloadpoky-e0e5763eb8e39c5c8f58e2b3e70ac12648b16de6.tar.gz
pulseaudio: rationalise existing configuration using PACKAGECONFIG
(From OE-Core rev: 4287440721bc692e8039ee775e6ee272e1349b3e) 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.inc14
1 files changed, 8 insertions, 6 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 2506e4141b..37621e058a 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 \
7 file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 7 file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
8 file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \ 8 file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \
9 file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95" 9 file://src/pulsecore/resampler.h;beginline=4;endline=23;md5=c3d539b93f8c82a1780bfa3cfa544a95"
10DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool \ 10DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
11 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxtst libice libsm libxcb gtk+', '', d)}"
12# optional 11# optional
13DEPENDS += "udev alsa-lib glib-2.0 dbus gconf \ 12DEPENDS += "udev alsa-lib glib-2.0 dbus gconf"
14 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4 sbc', '', d)}"
15 13
16SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \ 14SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz \
17 file://gcc4-compile-fix.patch \ 15 file://gcc4-compile-fix.patch \
@@ -25,9 +23,7 @@ USE_NLS = "yes"
25 23
26EXTRA_OECONF = "\ 24EXTRA_OECONF = "\
27 --disable-lynx \ 25 --disable-lynx \
28 ${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
29 --disable-polkit \ 26 --disable-polkit \
30 ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-x11', '--disable-x11 --disable-gtk2', d)} \
31 --without-jack \ 27 --without-jack \
32 --with-glib \ 28 --with-glib \
33 --with-alsa \ 29 --with-alsa \
@@ -44,6 +40,12 @@ EXTRA_OECONF = "\
44 ac_cv_header_valgrind_memcheck_h=no \ 40 ac_cv_header_valgrind_memcheck_h=no \
45" 41"
46 42
43PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
44 ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk x11', '', d)}"
45PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc"
46PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+"
47PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb"
48
47EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}" 49EXTRA_OECONF_append_arm += "${@bb.utils.contains("TUNE_FEATURES", "neon", "", "--enable-neon-opt=no", d)}"
48 50
49PARALLEL_MAKE = "" 51PARALLEL_MAKE = ""