libphone-ui: bump SRCREV, remove applied patch

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

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
deleted file mode 100644 (file)
index 1f29c44..0000000
--- a/recipes/shr/libphone-ui/0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 47df8a90652e3b22692d2ad7ee3b0219d7651f3a Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@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 ab785e9..327524a 100644 (file)
--- a/recipes/shr/libphone-ui_git.bb
+++ b/recipes/shr/libphone-ui_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A generic framework for phone ui"
 HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "libs"
-SRCREV = "2a87a548f004d7e7c7a45cdca5816b552e2b1796"
+SRCREV = "cac36ceb360c457b8dce993f6363cf8688ab428a"
 PV = "0.0.0+gitr${SRCPV}"
 PR = "r0"
 
@@ -10,8 +10,7 @@ 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 \
-           file://0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch"
+SRC_URI = "git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master"
 
 S="${WORKDIR}/git"