diff options
| author | Saul Wold <sgw@linux.intel.com> | 2013-08-22 12:44:42 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-08-26 11:47:18 +0100 |
| commit | 2526a172bde60b2fa55e2d23a5169e44a5661e8d (patch) | |
| tree | 479e187433be2563fe50709c45b90f6fa39793af | |
| parent | 764784c9355ca696a92221ffa935fba61eff195d (diff) | |
| download | poky-2526a172bde60b2fa55e2d23a5169e44a5661e8d.tar.gz | |
pulseaudio: Fix up configure options and use gtk+3
(From OE-Core rev: b51bfbc304eba448b9913d36444d70a643564c64)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index f1b346ca3e..49705f3d8c 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
| @@ -20,14 +20,7 @@ inherit autotools pkgconfig useradd gettext perlnative | |||
| 20 | USE_NLS = "yes" | 20 | USE_NLS = "yes" |
| 21 | 21 | ||
| 22 | EXTRA_OECONF = "\ | 22 | EXTRA_OECONF = "\ |
| 23 | --disable-lynx \ | 23 | --disable-hal-compat \ |
| 24 | --disable-polkit \ | ||
| 25 | --without-jack \ | ||
| 26 | --with-glib \ | ||
| 27 | --with-alsa \ | ||
| 28 | --with-oss \ | ||
| 29 | --without-hal \ | ||
| 30 | --disable-hal \ | ||
| 31 | --disable-orc \ | 24 | --disable-orc \ |
| 32 | --enable-tcpwrap=no \ | 25 | --enable-tcpwrap=no \ |
| 33 | --with-access-group=audio \ | 26 | --with-access-group=audio \ |
| @@ -44,7 +37,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', | |||
| 44 | ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ | 37 | ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ |
| 45 | ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk x11', '', d)}" | 38 | ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk x11', '', d)}" |
| 46 | PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc" | 39 | PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez4 sbc" |
| 47 | PACKAGECONFIG[gtk] = "--enable-gtk2,--disable-gtk2,gtk+" | 40 | PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" |
| 48 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" | 41 | PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd" |
| 49 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" | 42 | PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb" |
| 50 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" | 43 | PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" |
