Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From ca41e96a49a568128354f65f90a769debf5435f1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> |
| 3 | Date: Thu, 9 Jul 2015 11:58:12 +0300 |
| 4 | Subject: [PATCH] include speexdsp_types.h, not speex_types.h |
| 5 | |
| 6 | Speexdsp was separated from speex in 1.2rc2. speex_types.h is not |
| 7 | shipped by speexdsp, so alsa-plugins shouldn't use that file. speexdsp |
| 8 | has speexdsp_types.h, which has the same contents as speex_types.h. |
| 9 | |
| 10 | speexdsp_types.h is a new file introduced in 1.2rc2, so this change |
| 11 | bumps the minimum supported speexdsp version. The version check in |
| 12 | configure.ac will actually break if speexdsp 1.2 ever gets released, |
| 13 | because pkg-config thinks that "1.2" < "1.2rc2", but I think it's |
| 14 | useful to fail if the installed speexdsp version is 1.2rc1 (which I |
| 15 | believe is very common on current distributions). If a non-rc version |
| 16 | of speexdsp will ever get released, I hope version number 1.2 will be |
| 17 | skipped for this reason. (A non-rc version seems unlikely, since |
| 18 | 1.2rc1 was released years ago, so it's pretty likely that the project |
| 19 | is stuck on so called "release candidates" forever...) |
| 20 | |
| 21 | Upstream-Status: Submitted (http://thread.gmane.org/gmane.linux.alsa.devel/141149) |
| 22 | |
| 23 | Signed-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 | |
| 30 | diff --git a/configure.ac b/configure.ac |
| 31 | index 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], |
| 43 | diff --git a/pph/arch.h b/pph/arch.h |
| 44 | index 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. */ |
| 56 | diff --git a/pph/speex_resampler.h b/pph/speex_resampler.h |
| 57 | index 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 | -- |
| 70 | 1.9.3 |
| 71 | |