diff options
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-plugins')
3 files changed, 35 insertions, 102 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch deleted file mode 100644 index c70c72cb7e..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d28c655be3ac4fcb8024555983884f832ee18787 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 29 May 2015 15:17:30 -0700 -Subject: [PATCH] arcam-av: Include sys/select.h for fd_set definition - -fixes build errors on non-glibc based systems - -arcam-av/arcam_av.c:389:2: error: unknown type name 'fd_set' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - arcam-av/arcam_av.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arcam-av/arcam_av.c b/arcam-av/arcam_av.c -index 0491fc6..fff96f9 100644 ---- a/arcam-av/arcam_av.c -+++ b/arcam-av/arcam_av.c -@@ -31,6 +31,7 @@ - #include <unistd.h> - - #include <sys/ipc.h> -+#include <sys/select.h> - #include <sys/shm.h> - #include <sys/stat.h> - #include <sys/stat.h> --- -2.1.4 - 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 deleted file mode 100644 index e5199fb85a..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-plugins/0001-include-speexdsp_types.h-not-speex_types.h.patch +++ /dev/null @@ -1,71 +0,0 @@ -From ca41e96a49a568128354f65f90a769debf5435f1 Mon Sep 17 00:00:00 2001 -From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> -Date: Thu, 9 Jul 2015 11:58:12 +0300 -Subject: [PATCH] include speexdsp_types.h, not speex_types.h - -Speexdsp was separated from speex in 1.2rc2. speex_types.h is not -shipped by speexdsp, so alsa-plugins shouldn't use that file. speexdsp -has speexdsp_types.h, which has the same contents as speex_types.h. - -speexdsp_types.h is a new file introduced in 1.2rc2, so this change -bumps the minimum supported speexdsp version. The version check in -configure.ac will actually break if speexdsp 1.2 ever gets released, -because pkg-config thinks that "1.2" < "1.2rc2", but I think it's -useful to fail if the installed speexdsp version is 1.2rc1 (which I -believe is very common on current distributions). If a non-rc version -of speexdsp will ever get released, I hope version number 1.2 will be -skipped for this reason. (A non-rc version seems unlikely, since -1.2rc1 was released years ago, so it's pretty likely that the project -is stuck on so called "release candidates" forever...) - -Upstream-Status: Submitted (http://thread.gmane.org/gmane.linux.alsa.devel/141149) - -Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com> ---- - configure.ac | 2 +- - pph/arch.h | 2 +- - pph/speex_resampler.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 902a6d7..c554d22 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -108,7 +108,7 @@ AC_SUBST(AVCODEC_CFLAGS) - AC_SUBST(AVCODEC_LIBS) - AC_SUBST(AVCODEC_HEADER) - --PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) -+PKG_CHECK_MODULES(speexdsp, [speexdsp >= 1.2rc2], [HAVE_SPEEXDSP="yes"], [HAVE_SPEEXDSP=""]) - AM_CONDITIONAL(HAVE_SPEEXDSP, test "$HAVE_SPEEXDSP" = "yes") - - AC_ARG_WITH([speex], -diff --git a/pph/arch.h b/pph/arch.h -index e2d731a..a07d0d9 100644 ---- a/pph/arch.h -+++ b/pph/arch.h -@@ -36,7 +36,7 @@ - #define ARCH_H - - #ifndef OUTSIDE_SPEEX --#include "speex/speex_types.h" -+#include "speex/speexdsp_types.h" - #endif - - #define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */ -diff --git a/pph/speex_resampler.h b/pph/speex_resampler.h -index c44fbcd..aa85abb 100644 ---- a/pph/speex_resampler.h -+++ b/pph/speex_resampler.h -@@ -82,7 +82,7 @@ - - #else /* OUTSIDE_SPEEX */ - --#include "speex/speex_types.h" -+#include "speex/speexdsp_types.h" - - #endif /* OUTSIDE_SPEEX */ - --- -1.9.3 - diff --git a/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch b/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch new file mode 100644 index 0000000000..8e5b6a2a21 --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-plugins/0001-pph-include-config.h-from-rate_speexrate.c.patch @@ -0,0 +1,35 @@ +From 4350314c941489833a8baa930e16512e55f72a13 Mon Sep 17 00:00:00 2001 +From: Tanu Kaskinen <tanuk@iki.fi> +Date: Wed, 27 Jan 2016 13:22:38 +0200 +Subject: [PATCH] pph: include config.h from rate_speexrate.c + +Fixes compilation against libspeexdsp 1.2rc3. + +rate_speexrate.c includes speex_resampler.h, which depends on config.h +by referencing the HAVE_SPEEX_SPEEXDSP_TYPES_H macro. AFAIK it's not +a good idea to include config.h from headers (I don't know/remember +why, though), which is why I include config.h from rate_speexrate.c +instead of speex_resampler.h. + +Upstream-Status: Accepted [expected in 1.1.1] + +Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> +--- + pph/rate_speexrate.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pph/rate_speexrate.c b/pph/rate_speexrate.c +index 0a1325c..8fc4cef 100644 +--- a/pph/rate_speexrate.c ++++ b/pph/rate_speexrate.c +@@ -28,6 +28,7 @@ + POSSIBILITY OF SUCH DAMAGE. + */ + ++#include "config.h" + #include <stdio.h> + #include <alsa/asoundlib.h> + #include <alsa/pcm_rate.h> +-- +2.7.0.rc3 + |