summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-20 09:52:41 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-20 09:52:41 +0000
commit7b40874c56b4d2080db8e5933c44b9d8d51925e3 (patch)
tree7e9691387fe511bc3e2f395021c83f39587767a5
parent363d68a1f8b3a087330a7e420273b5af1e53a125 (diff)
downloadpoky-7b40874c56b4d2080db8e5933c44b9d8d51925e3.tar.gz
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
-rw-r--r--meta/packages/alsa/alsa-lib/unbreak_plugindir.patch12
-rw-r--r--meta/packages/alsa/alsa-lib_1.0.14.bb5
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 @@
1diff -Nur alsa-lib-1.0.14.orig/configure.in alsa-lib-1.0.14/configure.in
2--- alsa-lib-1.0.14.orig/configure.in 2007-05-31 03:05:13.000000000 -0500
3+++ alsa-lib-1.0.14/configure.in 2007-08-18 13:05:49.000000000 -0500
4@@ -93,7 +93,7 @@
5 esac
6 plugindir="$dir/$PACKAGE"
7 fi
8-AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "plugindir", [directory containing ALSA add-on modules])
9+AC_DEFINE_UNQUOTED(ALSA_PLUGIN_DIR, "${plugindir}", [directory containing ALSA add-on modules])
10 ALSA_PLUGIN_DIR="$plugindir"
11 AC_SUBST(ALSA_PLUGIN_DIR)
12
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"
3SECTION = "libs/multimedia" 3SECTION = "libs/multimedia"
4LICENSE = "GPL" 4LICENSE = "GPL"
5 5
6PR = "r1"
7
6# configure.in sets -D__arm__ on the command line for any arm system 8# configure.in sets -D__arm__ on the command line for any arm system
7# (not just those with the ARM instruction set), this should be removed, 9# (not just those with the ARM instruction set), this should be removed,
8# (or replaced by a permitted #define). 10# (or replaced by a permitted #define).
@@ -10,7 +12,8 @@ LICENSE = "GPL"
10ARM_INSTRUCTION_SET = "arm" 12ARM_INSTRUCTION_SET = "arm"
11 13
12SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \ 14SRC_URI = "ftp://ftp.alsa-project.org/pub/lib/alsa-lib-${PV}.tar.bz2 \
13 file://fix-tstamp-declaration.patch;patch=1" 15 file://fix-tstamp-declaration.patch;patch=1 \
16 file://unbreak_plugindir.patch;patch=1"
14 17
15inherit autotools pkgconfig 18inherit autotools pkgconfig
16 19