summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTanu Kaskinen <tanu.kaskinen@linux.intel.com>2015-07-09 13:43:15 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-16 15:09:15 +0100
commit167892676b4725b14d1cc5f061cc09c690789559 (patch)
treebb0624ffb07bbe797e4f17c714f4b89997054102
parent505e1af8f629c8fc868d4e8f048f492f34bee969 (diff)
downloadpoky-167892676b4725b14d1cc5f061cc09c690789559.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) (From OE-Core rev: baf9f414c3ed7903e7e7d9179196261bcfcf4659) Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch71
-rw-r--r--meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb5
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc2
3 files changed, 75 insertions, 3 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch
new file mode 100644
index 0000000000..e5199fb85a
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch
@@ -0,0 +1,71 @@
1From ca41e96a49a568128354f65f90a769debf5435f1 Mon Sep 17 00:00:00 2001
2From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
3Date: Thu, 9 Jul 2015 11:58:12 +0300
4Subject: [PATCH] include speexdsp_types.h, not speex_types.h
5
6Speexdsp was separated from speex in 1.2rc2. speex_types.h is not
7shipped by speexdsp, so alsa-plugins shouldn't use that file. speexdsp
8has speexdsp_types.h, which has the same contents as speex_types.h.
9
10speexdsp_types.h is a new file introduced in 1.2rc2, so this change
11bumps the minimum supported speexdsp version. The version check in
12configure.ac will actually break if speexdsp 1.2 ever gets released,
13because pkg-config thinks that "1.2" < "1.2rc2", but I think it's
14useful to fail if the installed speexdsp version is 1.2rc1 (which I
15believe is very common on current distributions). If a non-rc version
16of speexdsp will ever get released, I hope version number 1.2 will be
17skipped for this reason. (A non-rc version seems unlikely, since
181.2rc1 was released years ago, so it's pretty likely that the project
19is stuck on so called "release candidates" forever...)
20
21Upstream-Status: Submitted (http://thread.gmane.org/gmane.linux.alsa.devel/141149)
22
23Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
24---
25 configure.ac | 2 +-
26 pph/arch.h | 2 +-
27 pph/speex_resampler.h | 2 +-
28 3 files changed, 3 insertions(+), 3 deletions(-)
29
30diff --git a/configure.ac b/configure.ac
31index 902a6d7..c554d22 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -108,7 +108,7 @@ AC_SUBST(AVCODEC_CFLAGS)
35 AC_SUBST(AVCODEC_LIBS)
36 AC_SUBST(AVCODEC_HEADER)
37
38-PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""])
39+PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2rc2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""])
40 AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes")
41
42 AC_ARG_WITH([speex],
43diff --git a/pph/arch.h b/pph/arch.h
44index e2d731a..a07d0d9 100644
45--- a/pph/arch.h
46+++ b/pph/arch.h
47@@ -36,7 +36,7 @@
48 #define ARCH_H
49
50 #ifndef OUTSIDE_SPEEX
51-#include "speex/speex_types.h"
52+#include "speex/speexdsp_types.h"
53 #endif
54
55 #define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */
56diff --git a/pph/speex_resampler.h b/pph/speex_resampler.h
57index c44fbcd..aa85abb 100644
58--- a/pph/speex_resampler.h
59+++ b/pph/speex_resampler.h
60@@ -82,7 +82,7 @@
61
62 #else /* OUTSIDE_SPEEX */
63
64-#include "speex/speex_types.h"
65+#include "speex/speexdsp_types.h"
66
67 #endif /* OUTSIDE_SPEEX */
68
69--
701.9.3
71
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 = "\
19 19
20SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \ 20SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \
21 file://0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch \ 21 file://0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch \
22 file://0001-include-speexdsp_types.h-not-speex_types.h.patch \
22" 23"
23SRC_URI[md5sum] = "a66797b4471e3cbe96575207bfbe252c" 24SRC_URI[md5sum] = "a66797b4471e3cbe96575207bfbe252c"
24SRC_URI[sha256sum] = "325d85cac285f632b83e0191ae3f348bad03c1f007b937042f164abb81ea6532" 25SRC_URI[sha256sum] = "325d85cac285f632b83e0191ae3f348bad03c1f007b937042f164abb81ea6532"
@@ -29,7 +30,7 @@ inherit autotools pkgconfig
29 30
30PACKAGECONFIG ??= "\ 31PACKAGECONFIG ??= "\
31 samplerate \ 32 samplerate \
32 speex \ 33 speexdsp \
33 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 34 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
34" 35"
35PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav" 36PACKAGECONFIG[avcodec] = "--enable-avcodec,--disable-avcodec,libav"
@@ -38,7 +39,7 @@ PACKAGECONFIG[maemo-plugin] = "--enable-maemo-plugin,--disable-maemo-plugin"
38PACKAGECONFIG[maemo-resource-manager] = "--enable-maemo-resource-manager,--disable-maemo-resource-manager,dbus" 39PACKAGECONFIG[maemo-resource-manager] = "--enable-maemo-resource-manager,--disable-maemo-resource-manager,dbus"
39PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" 40PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio"
40PACKAGECONFIG[samplerate] = "--enable-samplerate,--disable-samplerate,libsamplerate0" 41PACKAGECONFIG[samplerate] = "--enable-samplerate,--disable-samplerate,libsamplerate0"
41PACKAGECONFIG[speex] = "--with-speex=lib,--with-speex=no,speex" 42PACKAGECONFIG[speexdsp] = "--with-speex=lib,--with-speex=no,speexdsp"
42 43
43PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'alsa-plugins-pulseaudio-conf', '', d)}" 44PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'alsa-plugins-pulseaudio-conf', '', d)}"
44 45
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 30fe221c93..b309d26079 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
10DEPENDS = "libatomics-ops liboil libsndfile1 libtool" 10DEPENDS = "libatomics-ops liboil libsndfile1 libtool"
11# optional 11# optional
12DEPENDS += "udev alsa-lib glib-2.0 dbus gconf" 12DEPENDS += "udev alsa-lib glib-2.0 dbus gconf"
13DEPENDS += "json-c gdbm speex libxml-parser-perl-native libcap" 13DEPENDS += "json-c gdbm speexdsp libxml-parser-perl-native libcap"
14 14
15inherit autotools pkgconfig useradd gettext perlnative bluetooth systemd 15inherit autotools pkgconfig useradd gettext perlnative bluetooth systemd
16 16