alsa: upgrade to 1.0.15

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3055 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 2 insertions, 5 deletions

diff --git a/meta/packages/alsa/alsa-lib_1.0.14.bb b/meta/packages/alsa/alsa-lib_1.0.15.bb
index ba46342ae..60b44dbc8 100644
--- a/meta/packages/alsa/alsa-lib_1.0.14.bb
+++ b/meta/packages/alsa/alsa-lib_1.0.15.bb
@@ -3,8 +3,6 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 
-PR = "r2"
-
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
 # (or replaced by a permitted #define).
@@ -12,15 +10,14 @@ PR = "r2"
 ARM_INSTRUCTION_SET = "arm"
 
 SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
-           file://fix-tstamp-declaration.patch;patch=1 \
-           file://unbreak_plugindir.patch;patch=1"
+           file://fix-tstamp-declaration.patch;patch=1"
 
 inherit autotools pkgconfig
 
 require alsa-fpu.inc
 EXTRA_OECONF += "${@get_alsa_fpu_setting(bb, d)} "
 
-EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes"
+EXTRA_OECONF = "--with-cards=pdaudiocf --with-oss=yes --disable-python"
 
 do_stage () {
 	oe_libinstall -so -C src libasound ${STAGING_LIBDIR}/
diff --git a/meta/packages/alsa/alsa-oss_1.0.14.bb b/meta/packages/alsa/alsa-oss_1.0.15.bb
index b11947e86..b11947e86 100644
--- a/meta/packages/alsa/alsa-oss_1.0.14.bb
+++ b/meta/packages/alsa/alsa-oss_1.0.15.bb
diff --git a/meta/packages/alsa/alsa-utils_1.0.14.bb b/meta/packages/alsa/alsa-utils_1.0.15.bb
index 240b995e7..240b995e7 100644
--- a/meta/packages/alsa/alsa-utils_1.0.14.bb
+++ b/meta/packages/alsa/alsa-utils_1.0.15.bb