diff options
| -rwxr-xr-x | meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb (renamed from meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb) | 5 |
4 files changed, 4 insertions, 40 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch index 9fd69f301d..bb2f82b1f5 100755 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch +++ b/meta/recipes-multimedia/alsa/alsa-lib/0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch @@ -9,7 +9,7 @@ which cause the avail_update()'s result wrong. This patch move the snd_pcm_mmap_appl_forward() to the place when snd_pcm_mmap_commit() is successfully returned. -Upstream-Status: Submitted [https://patchwork.kernel.org/patch/8760881/] +Upstream-Status: Accepted [expected in 1.1.2] Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> diff --git a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch b/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch deleted file mode 100644 index 0ead0cdafe..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-lib/0001-topology-Add-missing-include-sys-stat.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3f1dba9a821b53b42001605f9a126a958804884f Mon Sep 17 00:00:00 2001 -From: Takashi Iwai <tiwai@suse.de> -Date: Mon, 9 Nov 2015 13:37:26 +0100 -Subject: [PATCH] topology: Add missing include sys/stat.h - -Necessary for proper definitions of S_IRUSR & co. Otherwise it -results in compile errors with old glibc and uclibc: - parser.c: In function 'snd_tplg_build_file': - parser.c:262: error: 'S_IRUSR' undeclared (first use in this function) - parser.c:262: error: (Each undeclared identifier is reported only once - parser.c:262: error: for each function it appears in.) - -Upstream-Status: Backport - -Signed-off-by: Takashi Iwai <tiwai@suse.de> -Signed-off-by: Maxin B. John <maxin.john@intel.com> ---- - src/topology/parser.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/topology/parser.c b/src/topology/parser.c -index 80a0ae0..18bb9c7 100644 ---- a/src/topology/parser.c -+++ b/src/topology/parser.c -@@ -16,6 +16,7 @@ - Liam Girdwood <liam.r.girdwood@linux.intel.com> - */ - -+#include <sys/stat.h> - #include "list.h" - #include "tplg_local.h" - --- -2.4.0 - diff --git a/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch index 161619b279..b8b1cb6546 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch +++ b/meta/recipes-multimedia/alsa/alsa-lib/avoid-including-sys-poll.h-directly.patch @@ -73,7 +73,7 @@ index b429f5d..e05898f 100644 +#include <poll.h> #include <sys/types.h> #include <errno.h> - #include <linux/types.h> + #if defined(__linux__) diff --git a/src/control/control.c b/src/control/control.c index 4a28cf6..071c5db 100644 --- a/src/control/control.c diff --git a/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb b/meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb index cff3d01cf7..4fb7ccabc9 100644 --- a/meta/recipes-multimedia/alsa/alsa-lib_1.1.0.bb +++ b/meta/recipes-multimedia/alsa/alsa-lib_1.1.1.bb @@ -17,11 +17,10 @@ ARM_INSTRUCTION_SET = "arm" SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/${BP}.tar.bz2 \ file://Check-if-wordexp-function-is-supported.patch \ file://avoid-including-sys-poll.h-directly.patch \ - file://0001-topology-Add-missing-include-sys-stat.h.patch \ file://0001-pcm_plugin-fix-appl-pointer-not-correct-when-mmap_co.patch \ " -SRC_URI[md5sum] = "69515ca73c3c4a212ef45160dea846c1" -SRC_URI[sha256sum] = "dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15" +SRC_URI[md5sum] = "881060d2c568f7f49db82c58df2f9ddc" +SRC_URI[sha256sum] = "8ac76c3144ed2ed49da7622ab65ac5415205913ccbedde877972383cbc234269" inherit autotools pkgconfig |