summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia/alsa
diff options
context:
space:
mode:
authorTanu Kaskinen <tanuk@iki.fi>2016-02-17 18:56:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-18 07:39:32 +0000
commitc52b8f6c9698e9f42472c9062eb809d853b5b764 (patch)
treecc5c12f6fca149484ca23251e70b3e5b9b0bf9f9 /meta/recipes-multimedia/alsa
parenta231a4e86a09c10a89871fb532f1b33000f8b001 (diff)
downloadpoky-c52b8f6c9698e9f42472c9062eb809d853b5b764.tar.gz
alsa-plugins: 1.0.29 -> 1.1.0
Changelog: http://alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0 The licensing of the libsamplerate plugin was relaxed a bit: if the licensee has a commercial license for libsamplerate, the plugin can be used under the terms of LGPL instead of GPL. Both old patches are included in the new release, so dropped them. Added a new patch to fix building against libspeexdsp 1.2rc3. (From OE-Core rev: 2106108f83001cadc0188612b3e51de0c678d3c0) Signed-off-by: Tanu Kaskinen <tanuk@iki.fi> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa')
-rw-r--r--meta/recipes-multimedia/alsa/alsa-plugins/0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch31
-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/0001-pph-include-config.h-from-rate_speexrate.c.patch35
-rw-r--r--meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb (renamed from meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb)16
4 files changed, 44 insertions, 109 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 @@
1From d28c655be3ac4fcb8024555983884f832ee18787 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 29 May 2015 15:17:30 -0700
4Subject: [PATCH] arcam-av: Include sys/select.h for fd_set definition
5
6fixes build errors on non-glibc based systems
7
8arcam-av/arcam_av.c:389:2: error: unknown type name 'fd_set'
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12Upstream-Status: Submitted
13
14 arcam-av/arcam_av.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/arcam-av/arcam_av.c b/arcam-av/arcam_av.c
18index 0491fc6..fff96f9 100644
19--- a/arcam-av/arcam_av.c
20+++ b/arcam-av/arcam_av.c
21@@ -31,6 +31,7 @@
22 #include <unistd.h>
23
24 #include <sys/ipc.h>
25+#include <sys/select.h>
26 #include <sys/shm.h>
27 #include <sys/stat.h>
28 #include <sys/stat.h>
29--
302.1.4
31
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 @@
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/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 @@
1From 4350314c941489833a8baa930e16512e55f72a13 Mon Sep 17 00:00:00 2001
2From: Tanu Kaskinen <tanuk@iki.fi>
3Date: Wed, 27 Jan 2016 13:22:38 +0200
4Subject: [PATCH] pph: include config.h from rate_speexrate.c
5
6Fixes compilation against libspeexdsp 1.2rc3.
7
8rate_speexrate.c includes speex_resampler.h, which depends on config.h
9by referencing the HAVE_SPEEX_SPEEXDSP_TYPES_H macro. AFAIK it's not
10a good idea to include config.h from headers (I don't know/remember
11why, though), which is why I include config.h from rate_speexrate.c
12instead of speex_resampler.h.
13
14Upstream-Status: Accepted [expected in 1.1.1]
15
16Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
17---
18 pph/rate_speexrate.c | 1 +
19 1 file changed, 1 insertion(+)
20
21diff --git a/pph/rate_speexrate.c b/pph/rate_speexrate.c
22index 0a1325c..8fc4cef 100644
23--- a/pph/rate_speexrate.c
24+++ b/pph/rate_speexrate.c
25@@ -28,6 +28,7 @@
26 POSSIBILITY OF SUCH DAMAGE.
27 */
28
29+#include "config.h"
30 #include <stdio.h>
31 #include <alsa/asoundlib.h>
32 #include <alsa/pcm_rate.h>
33--
342.7.0.rc3
35
diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb
index d7c42ce734..fec6575309 100644
--- a/meta/recipes-multimedia/alsa/alsa-plugins_1.0.29.bb
+++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.0.bb
@@ -8,21 +8,23 @@ SECTION = "multimedia"
8# build system, and doesn't affect the licensing of the build result. 8# build system, and doesn't affect the licensing of the build result.
9# 9#
10# The samplerate plugin source code is licensed under GPLv2+ to be consistent 10# The samplerate plugin source code is licensed under GPLv2+ to be consistent
11# with the libsamplerate license. 11# with the libsamplerate license. However, if the licensee has a commercial
12# license for libsamplerate, the samplerate plugin may be used under the terms
13# of LGPLv2.1 like the rest of the plugins.
12LICENSE = "LGPLv2.1 & GPLv2+" 14LICENSE = "LGPLv2.1 & GPLv2+"
13LIC_FILES_CHKSUM = "\ 15LIC_FILES_CHKSUM = "\
14 file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ 16 file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
15 file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ 17 file://COPYING.GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
16 file://m4/attributes.m4;endline=33;md5=b25958da44c02231e3641f1bccef53eb \ 18 file://m4/attributes.m4;endline=33;md5=b25958da44c02231e3641f1bccef53eb \
17 file://rate/rate_samplerate.c;endline=19;md5=f3d3ce0b189846a486517d97a854b276 \ 19 file://rate/rate_samplerate.c;endline=35;md5=fd77bce85f4a338c0e8ab18430b69fae \
18" 20"
19 21
20SRC_URI = "ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \ 22SRC_URI = "\
21 file://0001-arcam-av-Include-sys-select.h-for-fd_set-definition.patch \ 23 ftp://ftp.alsa-project.org/pub/plugins/${BP}.tar.bz2 \
22 file://0001-include-speexdsp_types.h-not-speex_types.h.patch \ 24 file://0001-pph-include-config.h-from-rate_speexrate.c.patch \
23" 25"
24SRC_URI[md5sum] = "a66797b4471e3cbe96575207bfbe252c" 26SRC_URI[md5sum] = "b123e42ed881b9adbc99e4040f257c39"
25SRC_URI[sha256sum] = "325d85cac285f632b83e0191ae3f348bad03c1f007b937042f164abb81ea6532" 27SRC_URI[sha256sum] = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee"
26 28
27DEPENDS += "alsa-lib" 29DEPENDS += "alsa-lib"
28 30