From dec0ca839dc3ae30352c4d3a953ac4a89ec80624 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Mon, 26 Mar 2012 04:08:15 +0200
Subject: [PATCH] alsa-lib: add /run/asound.conf as a config location

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/audio/alsa-lib/install                     |  5 +++--
 .../alsa-lib-1.0.25-001-asound.conf_configdir.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 packages/audio/alsa-lib/patches/alsa-lib-1.0.25-001-asound.conf_configdir.patch

diff --git a/packages/audio/alsa-lib/install b/packages/audio/alsa-lib/install
index 2f28d4d947..bcf9a5f1c5 100755
--- a/packages/audio/alsa-lib/install
+++ b/packages/audio/alsa-lib/install
@@ -31,8 +31,9 @@ mkdir -p $INSTALL/usr/lib/alsa
   cp -PR $PKG_BUILD/modules/mixer/simple/.libs/*.so $INSTALL/usr/lib/alsa
 
 mkdir -p $INSTALL/usr/share/alsa
-  sed 's%~/\.asoundrc%/storage/\.config/asound.conf%' \
-    $PKG_BUILD/src/conf/alsa.conf > $INSTALL/usr/share/alsa/alsa.conf
+#  sed 's%~/\.asoundrc%/storage/\.config/asound.conf%' \
+#    $PKG_BUILD/src/conf/alsa.conf > $INSTALL/usr/share/alsa/alsa.conf
+  cp -P $PKG_BUILD/src/conf/alsa.conf $INSTALL/usr/share/alsa
   cp -P $PKG_BUILD/src/conf/smixer.conf $INSTALL/usr/share/alsa
   cp -P $PKG_BUILD/src/conf/*.alisp $INSTALL/usr/share/alsa
   cp -PR $PKG_BUILD/src/conf/cards $INSTALL/usr/share/alsa/
diff --git a/packages/audio/alsa-lib/patches/alsa-lib-1.0.25-001-asound.conf_configdir.patch b/packages/audio/alsa-lib/patches/alsa-lib-1.0.25-001-asound.conf_configdir.patch
new file mode 100644
index 0000000000..ed24c9a685
--- /dev/null
+++ b/packages/audio/alsa-lib/patches/alsa-lib-1.0.25-001-asound.conf_configdir.patch
@@ -0,0 +1,13 @@
+diff -Naur alsa-lib-1.0.25/src/conf/alsa.conf alsa-lib-1.0.25.patch/src/conf/alsa.conf
+--- alsa-lib-1.0.25/src/conf/alsa.conf	2012-01-25 08:56:56.000000000 +0100
++++ alsa-lib-1.0.25.patch/src/conf/alsa.conf	2012-03-26 01:05:47.913335895 +0200
+@@ -16,7 +16,8 @@
+ 				]
+ 			}
+ 			"/etc/asound.conf"
+-			"~/.asoundrc"
++			"/run/asound.conf"
++			"/storage/.config/asound.conf"
+ 		]
+ 		errors false
+ 	}