alsa-lib: Unbreak plugin loading in ALSA by fixing plugindir shell variable (patch from Matt Hoosier #469)

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

2 files changed, 16 insertions, 1 deletions

diff --git a/meta/packages/alsa/alsa-lib/unbreak_plugindir.patch b/meta/packages/alsa/alsa-lib/unbreak_plugindir.patch
new file mode 100644
index 0000000000..7d13166809
--- /dev/null
+++ b/meta/packages/alsa/alsa-lib/unbreak_plugindir.patch
@@ -0,0 +1,12 @@
+diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in
+--- alsa-lib-1.0.14.orig/configure.in   2007-05-31 03:05:13.000000000 -0500
++++ alsa-lib-1.0.14/configure.in        2007-08-18 13:05:49.000000000 -0500
+@@ -93,7 +93,7 @@
+     esac
+     plugindir="$dir/$PACKAGE"
+ fi
+-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
++AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules])
+ ALSA_PLUGIN_DIR="$plugindir"
+ AC_SUBST(ALSA_PLUGIN_DIR)
+ 
diff --git a/meta/packages/alsa/alsa-lib_1.0.14.bb b/meta/packages/alsa/alsa-lib_1.0.14.bb
index 4d77e7a654..de805b9a4b 100644
--- a/meta/packages/alsa/alsa-lib_1.0.14.bb
+++ b/meta/packages/alsa/alsa-lib_1.0.14.bb
@@ -3,6 +3,8 @@ HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
 
+PR = "r1"
+
 # 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).
@@ -10,7 +12,8 @@ LICENSE = "GPL"
 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://fix-tstamp-declaration.patch;patch=1 \
+           file://unbreak_plugindir.patch;patch=1"
 
 inherit autotools pkgconfig