diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-multimedia/pulseaudio/pulseaudio.inc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc index ad059404f8..48759bca62 100644 --- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc +++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc | |||
@@ -80,6 +80,7 @@ EXTRA_OECONF = "\ | |||
80 | --disable-tests \ | 80 | --disable-tests \ |
81 | --disable-running-from-build-tree \ | 81 | --disable-running-from-build-tree \ |
82 | --disable-esound \ | 82 | --disable-esound \ |
83 | --disable-gconf \ | ||
83 | " | 84 | " |
84 | 85 | ||
85 | # soxr (the SoX Resampler library) doesn't seem to be currently packaged in | 86 | # soxr (the SoX Resampler library) doesn't seem to be currently packaged in |
@@ -108,7 +109,6 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5' | |||
108 | 109 | ||
109 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" | 110 | PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,dbus" |
110 | PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" | 111 | PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" |
111 | PACKAGECONFIG[gconf] = "--enable-gconf,--disable-gconf,gconf" | ||
112 | PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0" | 112 | PACKAGECONFIG[gsettings] = "--enable-gsettings,--disable-gsettings,glib-2.0-native glib-2.0" |
113 | PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono" | 113 | PACKAGECONFIG[ofono] = "--enable-bluez5-ofono-headset,--disable-bluez5-ofono-headset,ofono" |
114 | PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" | 114 | PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" |
@@ -265,7 +265,6 @@ RDEPENDS_pulseaudio-module-console-kit =+ "${@bb.utils.contains('DISTRO_FEATURES | |||
265 | RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" | 265 | RDEPENDS_pulseaudio-misc += "pulseaudio-module-cli-protocol-unix" |
266 | 266 | ||
267 | FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" | 267 | FILES_${PN}-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" |
268 | FILES_${PN}-module-gconf += "${libexecdir}/pulse/gconf-helper" | ||
269 | 268 | ||
270 | GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}" | 269 | GSETTINGS_PACKAGE = "${@bb.utils.contains('PACKAGECONFIG', 'gsettings', '${PN}-module-gsettings', '', d)}" |
271 | FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas" | 270 | FILES_${PN}-module-gsettings += "${libexecdir}/pulse/gsettings-helper ${datadir}/GConf/gsettings ${datadir}/glib-2.0/schemas" |