enjoy: switch from svn to newer git and update dependency from edbus2 to eldbus

* edbus2 was renamed to eldbus and is now included in efl source tree

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

2 files changed, 12 insertions, 14 deletions

diff --git a/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch b/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch
index 45f02b730..09624503b 100644
--- a/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch
+++ b/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch
@@ -1,4 +1,4 @@
-From ac4c8a57e8a042acd4b8ff803d3d3574b0e7a7fb Mon Sep 17 00:00:00 2001
+From 751505501e0db31cf766ec0ae95a6968b4d1eb93 Mon Sep 17 00:00:00 2001
 From: Alban Browaeys <prahal@yahoo.com>
 Date: Wed, 5 Sep 2012 02:58:26 +0000
 Subject: [PATCH] always use position as percent and define a 1 seconds
@@ -7,12 +7,12 @@ Subject: [PATCH] always use position as percent and define a 1 seconds
 Fix "reverb" effect: ie loop between setting the slider to match
 the position and handling slider to position (seek).
 ---
- data/themes/default.edc |    8 +++-----
- src/bin/win.c           |   28 ++++++++++++++++++++++------
+ data/themes/default.edc |  8 +++-----
+ src/bin/win.c           | 28 ++++++++++++++++++++++------
  2 files changed, 25 insertions(+), 11 deletions(-)
 
 diff --git a/data/themes/default.edc b/data/themes/default.edc
-index 65efddf..27bb9e4 100644
+index ebf8ba4..7a906b1 100644
 --- a/data/themes/default.edc
 +++ b/data/themes/default.edc
 @@ -186,7 +186,6 @@ collections {
@@ -42,7 +42,7 @@ index 65efddf..27bb9e4 100644
              } else if (type == MSG_INT && id == MSG_SHUFFLE) {
                 external_param_set_bool(PART:"buttons.shuffle", "state", getarg(2));
              } else if (type == MSG_INT && id == MSG_LOOP) {
-@@ -687,7 +685,7 @@ collections {
+@@ -689,7 +687,7 @@ collections {
              source: "progress.slider";
              signal: "changed";
              script {
@@ -52,7 +52,7 @@ index 65efddf..27bb9e4 100644
           }
           program {
 diff --git a/src/bin/win.c b/src/bin/win.c
-index 63951db..ad93ab5 100644
+index 2f65953..428e268 100644
 --- a/src/bin/win.c
 +++ b/src/bin/win.c
 @@ -194,8 +194,8 @@ _win_play_eval(Win *w)
@@ -129,5 +129,5 @@ index 63951db..ad93ab5 100644
  }
  
 -- 
-1.7.7
+1.8.5.2
 
diff --git a/meta-efl/recipes-efl/e17/enjoy_svn.bb b/meta-efl/recipes-efl/e17/enjoy_git.bb
index d1c3855e2..bc3168e6a 100644
--- a/meta-efl/recipes-efl/e17/enjoy_svn.bb
+++ b/meta-efl/recipes-efl/e17/enjoy_git.bb
@@ -1,10 +1,10 @@
 SUMMARY = "Enjoy music player"
 LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS = "evas ecore edje elementary emotion lightmediascanner edbus2 gst-plugins-good"
-SRCREV = "${EFL_SRCREV}"
-PV = "0.0+svnr${SRCPV}"
+DEPENDS = "evas ecore edje elementary emotion lightmediascanner eldbus gst-plugins-good"
 
+SRCREV = "aa8fec69e885eec048a849c2b34059ec58404e02"
+PV = "0.1.0+gitr${SRCPV}"
 
 #1st needed for all formats
 #2nd needed for mp3 playback
@@ -20,12 +20,10 @@ RDEPENDS_${PN} += "\
 
 inherit e gettext
 SRC_URI = " \
-    ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
+    git://git.enlightenment.org/apps/enjoy.git \
     file://0001-always-use-position-as-percent-and-define-a-1-second.patch \
 "
-S = "${WORKDIR}/${SRCNAME}"
-
-PR = "r1"
+S = "${WORKDIR}/git"
 
 FILES_${PN} += "${datadir}/icons/"