alsa: Upgrade to 1.0.20

Signed-off-by: Richard Purdie <richard@ted.(none)>

4 files changed, 2 insertions, 1 deletions

diff --git a/meta/packages/alsa/alsa-lib_1.0.15.bb b/meta/packages/alsa/alsa-lib_1.0.20.bb
index 60b44dbc8e..d4bf79eb5b 100644
--- a/meta/packages/alsa/alsa-lib_1.0.15.bb
+++ b/meta/packages/alsa/alsa-lib_1.0.20.bb
@@ -23,7 +23,7 @@ do_stage () {
         oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
         install -d ${STAGING_INCDIR}/alsa/sound
         install -m 0644 include/*.h ${STAGING_INCDIR}/alsa/
-        install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
+        #install -m 0644 include/sound/ainstr*.h ${STAGING_INCDIR}/alsa/sound/
         install -d ${STAGING_DATADIR}/aclocal
         install -m 0644 utils/alsa.m4 ${STAGING_DATADIR}/aclocal/
 }
diff --git a/meta/packages/alsa/alsa-oss_1.0.15.bb b/meta/packages/alsa/alsa-oss_1.0.17.bb
index b11947e86a..b11947e86a 100644
--- a/meta/packages/alsa/alsa-oss_1.0.15.bb
+++ b/meta/packages/alsa/alsa-oss_1.0.17.bb
diff --git a/meta/packages/alsa/alsa-tools_1.0.10.bb b/meta/packages/alsa/alsa-tools_1.0.20.bb
index eed86e5dba..eed86e5dba 100644
--- a/meta/packages/alsa/alsa-tools_1.0.10.bb
+++ b/meta/packages/alsa/alsa-tools_1.0.20.bb
diff --git a/meta/packages/alsa/alsa-utils_1.0.15.bb b/meta/packages/alsa/alsa-utils_1.0.20.bb
index 240b995e7b..d6cade20f7 100644
--- a/meta/packages/alsa/alsa-utils_1.0.15.bb
+++ b/meta/packages/alsa/alsa-utils_1.0.20.bb
@@ -10,6 +10,7 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
 # http://bugs.openembedded.org/show_bug.cgi?id=2348
 # please close bug and remove this comment when properly fixed
 #
+EXTRA_OECONF = "--disable-xmlto"
 EXTRA_OECONF_linux-uclibc = "--disable-nls"
 EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"