diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2016-11-02 17:39:09 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:36 +0000 |
commit | 681d81177666314d7742654ac9537b34b39cd5b6 (patch) | |
tree | 09d6b11b3de05c5eb596b14e6dac1f2c3cb60e10 /meta/recipes-multimedia/libsamplerate/libsamplerate0 | |
parent | 1a2ebec99a11b8ee758924e832c2fa99103cda8c (diff) | |
download | poky-681d81177666314d7742654ac9537b34b39cd5b6.tar.gz |
libsamplerate0: clean up dependencies
The flac dependency was completely bogus. Flac isn't used at all.
FFTW is only used by tests, so we don't need to provide a packageconfig
for that.
ALSA is only used by example code that isn't part of the packaged files,
so even if ALSA is enabled, it doesn't affect the build result.
Nevertheless, I prefer to disable it explicitly to be extra sure.
--disable-alsa resulted in a warning about an unsupported configure
option, although by some magic it seemed to actually work as expected.
A patch is added to get rid of that warning.
(From OE-Core rev: c7cb0ce17dc2ec3999f26d594e755c8fb9609cee)
Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/libsamplerate/libsamplerate0')
-rw-r--r-- | meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch b/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch new file mode 100644 index 0000000000..d19b514e6b --- /dev/null +++ b/meta/recipes-multimedia/libsamplerate/libsamplerate0/0001-configure.ac-improve-alsa-handling.patch | |||
@@ -0,0 +1,62 @@ | |||
1 | From 957ebce3837588f71016e37ffaf9aad0a9d41cec Mon Sep 17 00:00:00 2001 | ||
2 | From: Tanu Kaskinen <tanuk@iki.fi> | ||
3 | Date: Fri, 23 Sep 2016 12:02:06 +0300 | ||
4 | Subject: [PATCH] configure.ac: improve alsa handling | ||
5 | |||
6 | Three improvements: | ||
7 | |||
8 | 1) "--enable-alsa" or "--disable-alsa" caused a warning about an | ||
9 | unsupported configure option, because AC_ARG_ENABLE was not used. | ||
10 | |||
11 | 2) If alsa was disabled, the "Have ALSA" item in the summary would print | ||
12 | an empty string instead of "no". | ||
13 | |||
14 | 3) If "--enable-alsa" was passed to configure, but the headers were not | ||
15 | found, configure would still succeed (with alsa disabled). It's better | ||
16 | to fail and abort configure if a feature that was explicitly requested | ||
17 | can't be enabled. | ||
18 | |||
19 | Upstream-Status: Submitted [sent to src@mega-nerd.com] | ||
20 | |||
21 | Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> | ||
22 | --- | ||
23 | configure.ac | 9 ++++++++- | ||
24 | 1 file changed, 8 insertions(+), 1 deletion(-) | ||
25 | |||
26 | diff --git a/configure.ac b/configure.ac | ||
27 | index 474c6ab..bad597e 100644 | ||
28 | --- a/configure.ac | ||
29 | +++ b/configure.ac | ||
30 | @@ -101,6 +101,9 @@ AC_ARG_ENABLE(cpu-clip, | ||
31 | AC_HELP_STRING([--disable-cpu-clip], [disable tricky cpu specific clipper]), | ||
32 | ac_arg_cpu_clip="N", ac_arg_cpu_clip="Y") | ||
33 | |||
34 | +AC_ARG_ENABLE(alsa, | ||
35 | + AC_HELP_STRING([--disable-alsa], [disable ALSA support in the varispeed-play example program])) | ||
36 | + | ||
37 | #==================================================================================== | ||
38 | # Check types and their sizes. | ||
39 | |||
40 | @@ -194,6 +197,10 @@ if test x$enable_alsa != xno ; then | ||
41 | if test x$ac_cv_header_alsa_asoundlib_h = xyes ; then | ||
42 | ALSA_LIBS="-lasound" | ||
43 | enable_alsa=yes | ||
44 | + elif test x$enable_alsa = xyes ; then | ||
45 | + AC_MSG_ERROR(["ALSA headers not found"]) | ||
46 | + else | ||
47 | + enable_alsa=no | ||
48 | fi | ||
49 | fi | ||
50 | |||
51 | @@ -340,7 +347,7 @@ AC_MSG_RESULT([ | ||
52 | Have FFTW : ................... ${ac_cv_fftw3}]) | ||
53 | |||
54 | AC_MSG_RESULT([ Have libsndfile : ............. ${ac_cv_sndfile}]) | ||
55 | -AC_MSG_RESULT([ Have ALSA : ................... ${ac_cv_header_alsa_asoundlib_h} | ||
56 | +AC_MSG_RESULT([ Have ALSA : ................... ${enable_alsa} | ||
57 | ]) | ||
58 | |||
59 | AC_MSG_RESULT([ Installation directories : | ||
60 | -- | ||
61 | 2.9.3 | ||
62 | |||