[meta-oe][meta-efl][PATCH 0/5] Smaller fixes

[meta-oe][meta-efl][PATCH 0/5] Smaller fixes

[Martin Jansa]

The following changes since commit eb82b4f0e40e6ef54320d1e7a8278a918ca7d15e:

  pixman: drop patches, merged to oe-core (2012-09-10 15:37:16 +0200)

are available in the git repository at:

  git://git.openembedded.org/meta-openembedded-contrib jansa/pull
  http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Denis 'GNUtoo' Carikli (1):
  meta-efl: enjoy: fix scrolling

Martin Jansa (4):
  evas: move EVAS_CPU_TWEAKS to target EXTRA_OECONF
  libwmf: fix DEPENDS_virtclass-native
  sip-native: inherit qmake2 instead of qt4x11
  mcnavi: add also target edje to DEPENDS

 ...position-as-percent-and-define-a-1-second.patch | 133 +++++++++++++++++++++
 meta-efl/recipes-efl/e17/enjoy_svn.bb              |   7 +-
 meta-efl/recipes-efl/efl/evas.inc                  |   4 +-
 meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb  |   4 +-
 meta-oe/recipes-extended/sip/sip-native_4.13.3.bb  |   3 +-
 meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb  |   2 +-
 6 files changed, 146 insertions(+), 7 deletions(-)
 create mode 100644 meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch

-- 
1.7.12

[meta-oe][meta-efl][PATCH 1/5] evas: move EVAS_CPU_TWEAKS to target EXTRA_OECONF

[Martin Jansa]

* it was causing different sstate checksum for evas-native
  $ bitbake-diffsigs
    stamps.1347348593/nokia900/x86_64-linux/evas-native-2_1.7.0-r0.0.do_configure.sigdata.cc8b80e938b87ad1bb8d6ded52ef941f
    stamps.1347348593/om-gta02/x86_64-linux/evas-native-2_1.7.0-r0.0.do_configure.sigdata.e6143417eb7ea0ebd0ab299ce5a024ea
      basehash changed from f453b3bdd276ffd49445d1c81e2962e8 to 3a244a9f14657439d5b4a8c7d609b087
      Variable EVAS_CPU_TWEAKS value changed from --disable-cpu-neon to

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-efl/recipes-efl/efl/evas.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-efl/recipes-efl/efl/evas.inc b/meta-efl/recipes-efl/efl/evas.inc
index 89ae1a4..b0ec0cf 100644
--- a/meta-efl/recipes-efl/efl/evas.inc
+++ b/meta-efl/recipes-efl/efl/evas.inc
@@ -8,7 +8,7 @@ DEPENDS_virtclass-native = "freetype-native libxext-native libpng-native jpeg-na
 inherit efl
 
 BBCLASSEXTEND = "native"
-INC_PR = "r0"
+INC_PR = "r1"
 FILESPATHPKG =. "${BPN}-${PV}:${BPN}:"
 
 python populate_packages_prepend () {
@@ -112,7 +112,6 @@ EVAS_OECONF = " \
                 --enable-convert-16-rgb-rot-90 \
                 --disable-convert-16-rgb-rot-180 \
                 --enable-convert-16-rgb-rot-270 \
-                ${EVAS_CPU_TWEAKS} \
 "
 
 # either sgx or 6410 atm
@@ -124,6 +123,7 @@ GLES ?= "sgx"
 # If the above sentence confuse you: everything is built and configured as before if you don't have the SDK
 
 EXTRA_OECONF = "${EVAS_OECONF} \
+                ${EVAS_CPU_TWEAKS} \
                 --enable-pthreads \
                 --enable-async-events \
                 --enable-async-preload \
-- 
1.7.12

[meta-oe][meta-efl][PATCH 2/5] libwmf: fix DEPENDS_virtclass-native

[Martin Jansa]

* libpng and jpeg are not expaned to native variants, causing different
  sstate checksums when libwmf-native is build with MACHINEs with
  e.g. different PACKAGE_ARCH
* maybe it's fault in handling DEPENDS_virtclass-native and it should
  expand it, but this patch fixes it too
  http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/029394.html

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
index fed33a4..cedfd3b 100644
--- a/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
+++ b/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb
@@ -5,9 +5,9 @@ SECTION = "libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r1"
+PR = "r2"
 
-DEPENDS_virtclass-native = "libpng jpeg"
+DEPENDS_virtclass-native = "libpng-native jpeg-native"
 DEPENDS = "libpng jpeg expat gtk+"
 
 BBCLASSEXTEND = "native"
-- 
1.7.12

[meta-oe][meta-efl][PATCH 3/5] sip-native: inherit qmake2 instead of qt4x11

[Martin Jansa]

* it seems enough
* inherit qt4x11 adds dependency on target qt4-x11-free, which is bad,
  because we don't need it and it's causing different sstate checksum:
  $ bitbake-diffsigs
    stamps.1347348593/nokia900/x86_64-linux/sip-native-4.13.3-r0.do_configure.sigdata.6e44871660ef91eab5ee4d56e55b6728
    stamps.1347348593/om-gta02/x86_64-linux/sip-native-4.13.3-r0.do_configure.sigdata.cdaf666b98c2c6ccfb710743dcdbd988
      Hash for dependent task qt4-x11-free_4.8.1.bb.do_populate_sysroot changed from 79234aca07686c1d97782e21fc098071 to 7e9ba3de3ba9f709a5d9ef5abadb2d9e

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-extended/sip/sip-native_4.13.3.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb b/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
index 2ef10bf..c20683f 100644
--- a/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
+++ b/meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
@@ -9,8 +9,9 @@ SRC_URI = "http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-${PV}.t
 SRC_URI[md5sum] = "76192829cc42ec558db46e4f9e1d8ba9"
 SRC_URI[sha256sum] = "ec295f71ef339c5b98db5650865f2c6c1200c4085b7a3f33f284111e1f534ac1"
 S = "${WORKDIR}/sip-${PV}/sipgen"
+PR = "r1"
 
-inherit qt4x11 native python-dir
+inherit qmake2 native python-dir
 
 EXTRA_QMAKEVARS_POST += "DESTDIR=${S} CONFIG=console"
 
-- 
1.7.12

[meta-oe][meta-efl][PATCH 4/5] meta-efl: enjoy: fix scrolling

[Martin Jansa]

From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>

* [SHR bug #2058] http://www.shr-project.org/trac/ticket/2058
* [EFL bug #1477] http://trac.enlightenment.org/e/ticket/1477

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...position-as-percent-and-define-a-1-second.patch | 133 +++++++++++++++++++++
 meta-efl/recipes-efl/e17/enjoy_svn.bb              |   7 +-
 2 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch

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
new file mode 100644
index 0000000..45f02b7
--- /dev/null
+++ b/meta-efl/recipes-efl/e17/enjoy/0001-always-use-position-as-percent-and-define-a-1-second.patch
@@ -0,0 +1,133 @@
+From ac4c8a57e8a042acd4b8ff803d3d3574b0e7a7fb 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
+ tolerance.
+
+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 ++++++++++++++++++++++------
+ 2 files changed, 25 insertions(+), 11 deletions(-)
+
+diff --git a/data/themes/default.edc b/data/themes/default.edc
+index 65efddf..27bb9e4 100644
+--- a/data/themes/default.edc
++++ b/data/themes/default.edc
+@@ -186,7 +186,6 @@ collections {
+    group {
+       name: "nowplaying";
+       script {
+-         public cur_length;
+          public mute;
+ 
+          public get_time_str(Float:time, time_str[6])
+@@ -201,16 +200,15 @@ collections {
+                new Float:position = getfarg(2);
+                new Float:length = getfarg(3);
+                if (length > 0)
+-                  external_param_set_float(PART:"progress.slider", "value", position / length * 100);
++                  external_param_set_float(PART:"progress.slider", "value", position * 100);
+                else
+                   external_param_set_float(PART:"progress.slider", "value", 0);
+ 
+                new time_str[6];
+-               get_time_str(position, time_str);
++               get_time_str(position * length, time_str);
+                set_text(PART:"ejy.text.current_time", time_str);
+                get_time_str(length, time_str);
+                set_text(PART:"ejy.text.total_time", time_str);
+-               set_float(cur_length, length);
+             } 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 {
+             source: "progress.slider";
+             signal: "changed";
+             script {
+-               send_message(MSG_FLOAT, MSG_POSITION, (external_param_get_float(PART:"progress.slider", "value") * get_float(cur_length) / 100));
++               send_message(MSG_FLOAT, MSG_POSITION, (external_param_get_float(PART:"progress.slider", "value") / 100));
+             }
+          }
+          program {
+diff --git a/src/bin/win.c b/src/bin/win.c
+index 63951db..ad93ab5 100644
+--- a/src/bin/win.c
++++ b/src/bin/win.c
+@@ -194,8 +194,8 @@ _win_play_eval(Win *w)
+ {
+    Edje_Message_Float_Set *mf;
+ 
+-   w->play.position = emotion_object_position_get(w->emotion);
+    w->play.length = emotion_object_play_length_get(w->emotion);
++   w->play.position = emotion_object_position_get(w->emotion) / w->play.length;
+ 
+    if ((w->song) && (w->song->length != (int)w->play.length))
+       db_song_length_set(w->db, w->song, w->play.length);
+@@ -542,8 +542,14 @@ _win_edje_msg(void *data, Evas_Object *o __UNUSED__, Edje_Message_Type type, int
+          else
+            {
+               Edje_Message_Float *m = msg;
++
++              if ((((m->val - w->play.position) * w->play.length) < 1.0)
++                  && (((w->play.position - m->val) * w->play.length) < 1.0))
++                  return;
++
+               w->play.position = m->val;
+-              emotion_object_position_set(w->emotion, w->play.position);
++              emotion_object_position_set(w->emotion, w->play.position
++                                                            * w->play.length);
+               ecore_event_add(ENJOY_EVENT_POSITION_CHANGE, NULL, NULL, NULL);
+            }
+         break;
+@@ -617,16 +623,21 @@ enjoy_control_seek(uint64_t position)
+ {
+    Win *w = &_win;
+    double seek_to;
++   double new_pos = w->play.length / ((double)position / 1e6);
+ 
+    if (!w->db) return;
+-   seek_to = w->play.position + w->play.length / ((double)position / 1e6);
++
++   if ((((new_pos - w->play.position) * w->play.length) < 1.0)
++       && (((w->play.position - new_pos) * w->play.length) < 1.0)) return;
++
++   seek_to = w->play.position + new_pos;
+    if (seek_to <= 0.0)
+      seek_to = 0.0;
+    else if (seek_to >= 1.0)
+      seek_to = 1.0;
+ 
+    w->play.position = seek_to;
+-   emotion_object_position_set(w->emotion, w->play.position);
++   emotion_object_position_set(w->emotion, w->play.position * w->play.length);
+    ecore_event_add(ENJOY_EVENT_POSITION_CHANGE, NULL, NULL, NULL);
+ }
+ 
+@@ -692,15 +703,20 @@ EAPI void
+ enjoy_position_set(int32_t position)
+ {
+    Win *w = &_win;
++   double new_pos = w->play.length / ((double)position / 1e6);
+ 
+    if (!w->db) return;
+-   w->play.position = w->play.length / ((double)position / 1e6);
++
++   if ((((new_pos - w->play.position) * w->play.length) < 1.0)
++       && (((w->play.position - new_pos) * w->play.length) < 1.0)) return;
++
++   w->play.position = new_pos;
+    if (w->play.position < 0.0)
+      w->play.position = 0.0;
+    else if (w->play.position > 1.0)
+      w->play.position = 1.0;
+ 
+-   emotion_object_position_set(w->emotion, w->play.position);
++   emotion_object_position_set(w->emotion, w->play.position * w->play.length);
+    ecore_event_add(ENJOY_EVENT_POSITION_CHANGE, NULL, NULL, NULL);
+ }
+ 
+-- 
+1.7.7
+
diff --git a/meta-efl/recipes-efl/e17/enjoy_svn.bb b/meta-efl/recipes-efl/e17/enjoy_svn.bb
index 06998cf..cfeb001 100644
--- a/meta-efl/recipes-efl/e17/enjoy_svn.bb
+++ b/meta-efl/recipes-efl/e17/enjoy_svn.bb
@@ -21,9 +21,14 @@ RDEPENDS += "\
        "
 
 inherit e gettext
-SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep"
+SRC_URI = " \
+  ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
+  file://0001-always-use-position-as-percent-and-define-a-1-second.patch \
+"
 S = "${WORKDIR}/${SRCNAME}"
 
+PR = "r1"
+
 FILES_${PN} += "${datadir}/icons/"
 
 EXTRA_OECONF = "\
-- 
1.7.12

[meta-oe][meta-efl][PATCH 5/5] mcnavi: add also target edje to DEPENDS

[Martin Jansa]

* configure checks for that
  | configure:17465: error: Package requirements (ecore ecore-evas evas edje imlib2 libgps) were not met:
  |
  | No package 'edje' found

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb b/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
index 9c7f3f2..f4d594f 100644
--- a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
+++ b/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Free GPS navigation for car and outdoor with OpenStreetMap maps"
 HOMEPAGE = "http://www.gps-routes.info/index.php?name=Content&pa=showpage&pid=1"
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
-DEPENDS = "ecore evas imlib2 gpsd edje-native mysql5"
+DEPENDS = "ecore evas imlib2 gpsd edje edje-native mysql5"
 
 SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz"
 SRC_URI[md5sum] = "acc07debcdb3ef448b95e6a6cfcf53d8"
-- 
1.7.12

[meta-oe][meta-efl][PATCH 6/6] mcnavi: fix do_configure_prepend to be reentrant

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb b/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
index f4d594f..35c304c 100644
--- a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
+++ b/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
@@ -4,6 +4,8 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
 DEPENDS = "ecore evas imlib2 gpsd edje edje-native mysql5"
 
+PR = "r1"
+
 SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz"
 SRC_URI[md5sum] = "acc07debcdb3ef448b95e6a6cfcf53d8"
 SRC_URI[sha256sum] = "d3ce1f5901f13985d877b2b6ad06b64094ba43a4e13cbfe06c7cb2f1abdda309"
@@ -12,7 +14,7 @@ S = "${WORKDIR}/${PN}"
 
 do_configure_prepend() {
   # for some reason our mysql_config returns just sysroot/include_dir while mysql.h is in include_dir/mysql
-  sed -i 's#`mysql_config --include`#`mysql_config --include`/mysql#g' ${S}/configure.ac
+  sed -i 's#`mysql_config --include`$#`mysql_config --include`/mysql#g' ${S}/configure.ac
 }
 
 inherit autotools
-- 
1.7.12

[PATCH] mcnavi: fix do_configure_prepend to be reentrant

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb b/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
index f4d594f..35c304c 100644
--- a/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
+++ b/meta-oe/recipes-navigation/mcnavi/mcnavi_0.3.3.bb
@@ -4,6 +4,8 @@ LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8f0e2cd40e05189ec81232da84bd6e1a"
 DEPENDS = "ecore evas imlib2 gpsd edje edje-native mysql5"
 
+PR = "r1"
+
 SRC_URI = "http://www.gps-routes.info/debian/pool/main/m/mcnavi/mcnavi_${PV}.tar.gz"
 SRC_URI[md5sum] = "acc07debcdb3ef448b95e6a6cfcf53d8"
 SRC_URI[sha256sum] = "d3ce1f5901f13985d877b2b6ad06b64094ba43a4e13cbfe06c7cb2f1abdda309"
@@ -12,7 +14,7 @@ S = "${WORKDIR}/${PN}"
 
 do_configure_prepend() {
   # for some reason our mysql_config returns just sysroot/include_dir while mysql.h is in include_dir/mysql
-  sed -i 's#`mysql_config --include`#`mysql_config --include`/mysql#g' ${S}/configure.ac
+  sed -i 's#`mysql_config --include`$#`mysql_config --include`/mysql#g' ${S}/configure.ac
 }
 
 inherit autotools
-- 
1.7.12