diff options
| author |   Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2015-07-09 13:43:15 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-16 14:51:15 +0100 |
| commit | baf9f414c3ed7903e7e7d9179196261bcfcf4659 (patch) | |
| tree | f98f2a03b5eb4dda6d5bf27954cdce3d316ff80d /meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb | |
| parent | 53ca5eac8942ba1c882b31a51f344f92746f9b06 (diff) | |
| download | openembedded-core-contrib-baf9f414c3ed7903e7e7d9179196261bcfcf4659.tar.gz | |
alsa-plugins, pulseaudio: depend on speexdsp, not speex
Speexdsp was split off from speex, and alsa-plugins and pulseaudio
only depend on the speexdsp library.
alsa-plugins needs also a patch, because it has so far relied on
speex_types.h, which was renamed to speexdsp_types.h when speexdsp was
split off, to not collide with the file that is included in speex.
(From OE-Core rev: 4ee8f0dd4e9cb493d074c762bf6ff7169bcf3466)
Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb')
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb index 85df8bf353..c928618c8d 100644 --- a/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb +++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb @@ -19,6 +19,7 @@ LIC_FILES_CHKSUM = "\ SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \ file://0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch \ + file://0001-include-speexdsp_types.h-not-speex_types.h.patch \ " SRC_URI[md5sum] = "a66797b4471e3cbe96575207bfbe252c" SRC_URI[sha256sum] = "325d85cac285f632b83e0191ae3f348bad03c1f007b937042f164abb81ea6532" @@ -29,7 +30,7 @@ inherit autotools pkgconfig PACKAGECONFIG ??= "\ samplerate \ - speex \ + speexdsp \ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ " PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav" @@ -38,7 +39,7 @@ PACKAGECONFIG[maemo-plugin] = "--enable-maemo-plugin,--disable-maemo-plugin" PACKAGECONFIG[maemo-resource-manager] = "--enable-maemo-resource-manager,--disable-maemo-resource-manager,dbus" PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" PACKAGECONFIG[samplerate] = "--enable-samplerate,--disable-samplerate,libsamplerate0" -PACKAGECONFIG[speex] = "--with-speex=lib,--with-speex=no,speex" +PACKAGECONFIG[speexdsp] = "--with-speex=lib,--with-speex=no,speexdsp" PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'alsa-plugins-pulseaudio-conf', '', d)}" |