[oe-commits] Martin Jansa : libphoneui: update alsa control names for 2.6.31+

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: a0879cc7567cd7e21e5915c10fb7488ccab610ac
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a0879cc7567cd7e21e5915c10fb7488ccab610ac

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu May 27 23:32:47 2010 +0200

libphoneui: update alsa control names for 2.6.31+

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 ....conf-update-alsa-control-name-for-2.6.31.patch |   38 ++++++++++++++++++++
 recipes/shr/libphone-ui_git.bb                     |    4 ++-
 2 files changed, 41 insertions(+), 1 deletions(-)

diff --git a/recipes/shr/libphone-ui/0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch b/recipes/shr/libphone-ui/0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch
new file mode 100644
index 0000000..1f29c44
--- /dev/null
+++ b/recipes/shr/libphone-ui/0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch
@@ -0,0 +1,38 @@
+From 47df8a90652e3b22692d2ad7ee3b0219d7651f3a Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Tue, 25 May 2010 13:09:17 +0200
+Subject: [PATCH] libphoneui.conf: update alsa control name for 2.6.31+
+
+---
+ data/libphoneui.conf |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/data/libphoneui.conf b/data/libphoneui.conf
+index 980ef10..f8bfc3f 100644
+--- a/data/libphoneui.conf
++++ b/data/libphoneui.conf
+@@ -46,18 +46,18 @@ hardware_control_name = hw:0
+ [alsa_control_speaker]
+ speaker = Headphone Playback Volume
+ microphone = Mono Playback Volume
+-microphone_mute = Mono Mixer Sidetone Playback Sw
++microphone_mute = Mono Mixer Sidetone Playback Switch
+ 
+ [alsa_control_handset]
+ speaker = Speaker Playback Volume
+ speaker_min = 90
+ microphone = Mono Playback Volume
+-microphone_mute = Mono Mixer Sidetone Playback Sw
++microphone_mute = Mono Mixer Sidetone Playback Switch
+ 
+ [alsa_control_headset]
+ speaker = Headphone Playback Volume
+ microphone = Mono Playback Volume
+-microphone_mute = Mono Mixer Sidetone Playback Sw
++microphone_mute = Mono Mixer Sidetone Playback Switch
+ 
+ [alsa_control_bluetooth]
+ speaker = Speaker Playback Volume
+-- 
+1.7.1
+
diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb
index da87e72..36dd002 100644
--- a/recipes/shr/libphone-ui_git.bb
+++ b/recipes/shr/libphone-ui_git.bb
@@ -10,7 +10,9 @@ DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libfso-glib libfsoframework libph
 
 inherit pkgconfig autotools autotools_stage
 
-SRC_URI = "git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master"
+SRC_URI = "git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master \
+           file://0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch;patch=1"
+
 S="${WORKDIR}/git"
 
 CONFFILES_${PN} = "${sysconfdir}/libphoneui.conf"