From: Saul Wold <sgw@linux.intel.com>
Date: Thu, 22 Aug 2013 19:44:42 +0000 (-0700)
Subject: pulseaudio: Fix up configure options and use gtk+3
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~36236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b51bfbc304eba448b9913d36444d70a643564c64;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

pulseaudio: Fix up configure options and use gtk+3

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---

diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index f1b346ca3e3..49705f3d8cd 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
 USE_NLS = "yes"
 
 EXTRA_OECONF = "\
-		--disable-lynx \
-		--disable-polkit \
-		--without-jack \
-		--with-glib \
-		--with-alsa \
-		--with-oss \
-		--without-hal \
-		--disable-hal \
+		--disable-hal-compat \
 		--disable-orc \
 		--enable-tcpwrap=no \
 		--with-access-group=audio \
@@ -44,7 +37,7 @@ PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '',
                    ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', 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[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
 PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd"
 PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxtst libice libsm libxcb"
 PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"