EFL, gpsd and midori upgrade

PATCH New Martin Jansa 1 participant 8 messages Dec 20, 2011

lore

Share & tools

lore

Martin Jansa

author

2011-12-20 14:06 UTC #0 lore raw

cover EFL, gpsd and midori upgrade

The following changes since commit 5b1dff8b4f52873060b75813eeba864d64a70083:

vlc: rework dependencies (2011-12-20 14:15:07 +0100)

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

Martin Jansa (7):
e-base: bump EFL_SRCREV remove EFL_SRCREV_1.* and applied patches
from libeflvala, elsa and python-elementary
edje: fix unpackaged multisense modules
e-base: bump EFL_SRCREV a bit more
e-tasks: add patch to fix changed callback name
gpsd: upgrade from 2.95 to 2.96, drop 2 patches applied upstream
navit: bump PR after gpsd upgrade (.so name change)
midori: upgrade from 0.4.2 to 0.4.3

 meta-efl/classes/e-base.bbclass                    |    9 +-
 ...ementary-temporary-fix-for-build-breakage.patch |   49 ------
 .../python/python-elementary_svn.bb                |    2 -
 .../e-tasks/0001-fix-changed-callback-name.patch   |   40 +++++
 meta-efl/recipes-efl/e17/e-tasks_svn.bb            |    5 +-
 meta-efl/recipes-efl/e17/expedite_svn.bb           |    2 +-
 meta-efl/recipes-efl/efl/ecore_svn.bb              |    2 +-
 meta-efl/recipes-efl/efl/edbus_svn.bb              |    2 +-
 meta-efl/recipes-efl/efl/edje.inc                  |    6 +-
 meta-efl/recipes-efl/efl/edje_svn.bb               |    2 +-
 meta-efl/recipes-efl/efl/eet_svn.bb                |    2 +-
 meta-efl/recipes-efl/efl/eeze_svn.bb               |    2 +-
 meta-efl/recipes-efl/efl/efreet_svn.bb             |    2 +-
 meta-efl/recipes-efl/efl/eina_svn.bb               |    2 +-
 ...-build-really-without-PAM-support-if-PAM-.patch |  179 --------------------
 meta-efl/recipes-efl/efl/elsa_svn.bb               |    1 -
 meta-efl/recipes-efl/efl/embryo_svn.bb             |    2 +-
 meta-efl/recipes-efl/efl/evas_svn.bb               |    2 +-
 ...a-update-genlist-gengrid-callbacks-s-labe.patch |   97 -----------
 meta-efl/recipes-efl/efl/libeflvala_svn.bb         |    1 -
 .../midori/{midori_0.4.2.bb => midori_0.4.3.bb}    |    9 +-
 .../gpsd/gpsd-2.95/fix-build-with-python2.7.patch  |   15 --
 .../gpsd/gpsd-2.95/libtool.patch                   |   16 --
 .../gpsd/{gpsd-2.95 => gpsd-2.96}/60-gpsd.rules    |    0
 .../gpsd/{gpsd-2.95 => gpsd-2.96}/gpsd             |    0
 .../gpsd/{gpsd-2.95 => gpsd-2.96}/gpsd-default     |    0
 .../gpsd/{gpsd_2.95.bb => gpsd_2.96.bb}            |   10 +-
 meta-oe/recipes-navigation/navit/navit_svn.bb      |    2 +-
 28 files changed, 65 insertions(+), 396 deletions(-)
 delete mode 100644 meta-efl/recipes-devtools/python/python-elementary/0001-python-elementary-temporary-fix-for-build-breakage.patch
 create mode 100644 meta-efl/recipes-efl/e17/e-tasks/0001-fix-changed-callback-name.patch
 delete mode 100644 meta-efl/recipes-efl/efl/elsa/0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch
 delete mode 100644 meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch
 rename meta-oe/recipes-connectivity/midori/{midori_0.4.2.bb => midori_0.4.3.bb} (54%)
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-2.95/libtool.patch
 rename meta-oe/recipes-navigation/gpsd/{gpsd-2.95 => gpsd-2.96}/60-gpsd.rules (100%)
 rename meta-oe/recipes-navigation/gpsd/{gpsd-2.95 => gpsd-2.96}/gpsd (100%)
 rename meta-oe/recipes-navigation/gpsd/{gpsd-2.95 => gpsd-2.96}/gpsd-default (100%)
 rename meta-oe/recipes-navigation/gpsd/{gpsd_2.95.bb => gpsd_2.96.bb} (90%)

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-20 14:08 UTC #1 lore raw

PATCH 1/7 e-base: bump EFL_SRCREV remove EFL_SRCREV_1.* and applied patches from libeflvala, elsa and python-elementary

* elementary (Evas_GL) and e-wm (backlight) depends on trunk again..

10:06:36 < JaMa> shouldn't elementary and e17 depend only on efl-1.1? | ./Elementary.h:372:21: fatal error: Evas_GL.h: No such file or directory and e/src/bin/e_backlight.c:43: undefined reference to
`ecore_x_randr_output_backlight_available'
10:07:32 < JaMa> but I'll recheck my configs
10:08:20 < moa> hum, that evas_gl.h would be a problem indeed
10:08:36 < moa> for e, i don't know
10:08:57 <@raster> elm requires svn evas
10:09:02 <@raster> thats unfortunately how it is
10:09:12 <@raster> requires evas_gl
10:09:35 < JaMa> maybe this is missing in 1.1 branch for e17? r65838
10:09:42 <@raster> yes
10:09:46 <@raster> its missing
10:09:50 <@raster> as its in trunk
10:09:53 <@raster> its a "new feature"
10:09:58 <@raster> not in stable
10:10:15 <@raster> uy'd have to patch out the support to make elm from svn build
10:10:42 < JaMa> raster: ok then I just didn't understand the dependency on "only" efl-1.1 right.. I'll update the rest of efl to same rev (instead of keeping them on 1.1 release)

Signed-off-by Martin Jansa <[email protected]>

---
 meta-efl/classes/e-base.bbclass                    |    9 +-
 ...ementary-temporary-fix-for-build-breakage.patch |   49 ------
 .../python/python-elementary_svn.bb                |    2 -
 meta-efl/recipes-efl/e17/expedite_svn.bb           |    2 +-
 meta-efl/recipes-efl/efl/ecore_svn.bb              |    2 +-
 meta-efl/recipes-efl/efl/edbus_svn.bb              |    2 +-
 meta-efl/recipes-efl/efl/edje_svn.bb               |    2 +-
 meta-efl/recipes-efl/efl/eet_svn.bb                |    2 +-
 meta-efl/recipes-efl/efl/eeze_svn.bb               |    2 +-
 meta-efl/recipes-efl/efl/efreet_svn.bb             |    2 +-
 meta-efl/recipes-efl/efl/eina_svn.bb               |    2 +-
 ...-build-really-without-PAM-support-if-PAM-.patch |  179 --------------------
 meta-efl/recipes-efl/efl/elsa_svn.bb               |    1 -
 meta-efl/recipes-efl/efl/embryo_svn.bb             |    2 +-
 meta-efl/recipes-efl/efl/evas_svn.bb               |    2 +-
 ...a-update-genlist-gengrid-callbacks-s-labe.patch |   97 -----------
 meta-efl/recipes-efl/efl/libeflvala_svn.bb         |    1 -
 17 files changed, 11 insertions(+), 347 deletions(-)
 delete mode 100644 meta-efl/recipes-devtools/python/python-elementary/0001-python-elementary-temporary-fix-for-build-breakage.patch
 delete mode 100644 meta-efl/recipes-efl/efl/elsa/0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch
 delete mode 100644 meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch

meta-efl/classes/e-base.bbclass +1 -8

index 79104ec..8b21675 100644
@@ -1,13 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-# usually tracks svn trunk HEAD
-EFL_SRCREV ?= "65808"
-# revision when 1.1.0 (eet is actually 1.5.0) was released, 
-# so we can lock some release libs to this revision 
-# and use EFL_SRCREV to track e17 and elementary
-EFL_SRCREV_1.1.0 ?= "65800"
-# revision when 1.0.0 was released, for recipes which don't need rebuild so often
-EFL_SRCREV_1.0.0 ?= "56356"
+EFL_SRCREV ?= "66164"
 
 ARM_INSTRUCTION_SET = "arm"

meta-efl/recipes-devtools/python/python-elementary/0001-python-elementary-temporary-fix-for-build-breakage.patch deleted +0 ~~-49~~

49 lines not on this page · raw message

meta-efl/recipes-devtools/python/python-elementary_svn.bb +0 -2

index 37a8ffa..6d8b0b8 100644
@@ -5,5 +5,3 @@ PR = "${INC_PR}.2"
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "elementary python-evas"
 RDEPENDS_${PN} += "python-evas python-ecore python-edje" 
-
-SRC_URI += " file://0001-python-elementary-temporary-fix-for-build-breakage.patch"

meta-efl/recipes-efl/e17/expedite_svn.bb +1 -1

index dfcbcde..e6dc051 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas"
 DEPENDS = "eet evas"
 LICENSE = "MIT BSD"
 
-SRCREV = "${EFL_SRCREV_1.1.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.1.0+svnr${SRCPV}"
 PR = "r1"

meta-efl/recipes-efl/efl/ecore_svn.bb +1 -1

index 5cad73d..1d3706f 100644
@@ -1,6 +1,6 @@
 require ecore.inc
 
-SRCREV = "${EFL_SRCREV_1.1.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"

meta-efl/recipes-efl/efl/edbus_svn.bb +1 -1

index 5d79c02..ebe4312 100644
@@ -1,6 +1,6 @@
 require edbus.inc
 
-SRCREV = "${EFL_SRCREV_1.1.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"

meta-efl/recipes-efl/efl/edje_svn.bb +1 -1

index c3e1a95..1fedfbc 100644
@@ -1,6 +1,6 @@
 require edje.inc
 
-SRCREV = "${EFL_SRCREV_1.1.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"

meta-efl/recipes-efl/efl/eet_svn.bb +1 -1

index aad311b..42439cb 100644
@@ -1,6 +1,6 @@
 require eet.inc
 
-SRCREV = "${EFL_SRCREV_1.1.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.5.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"

meta-efl/recipes-efl/efl/eeze_svn.bb +1 -1

index b7986e1..9016348 100644
@@ -1,6 +1,6 @@
 require eeze.inc
 
-SRCREV = "${EFL_SRCREV_1.1.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"

meta-efl/recipes-efl/efl/efreet_svn.bb +1 -1

index 6c7661c..a711770 100644
@@ -1,6 +1,6 @@
 require efreet.inc
 
-SRCREV = "${EFL_SRCREV_1.1.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"

meta-efl/recipes-efl/efl/eina_svn.bb +1 -1

index b510449..8256387 100644
@@ -1,6 +1,6 @@
 require eina.inc
 
-SRCREV = "${EFL_SRCREV_1.1.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"

meta-efl/recipes-efl/efl/elsa/0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch deleted +0 ~~-179~~

179 lines not on this page · raw message

meta-efl/recipes-efl/efl/elsa_svn.bb +0 -1

index c21c2e5..949c7e1 100644
@@ -7,7 +7,6 @@ SECTION = "e/apps"
 inherit e gettext
 SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};proto=http;scmdata=keep \
   file://0001-pam-use-common-auth-instead-of-system-auth.patch \
-  file://0001-elsa-fix-to-build-really-without-PAM-support-if-PAM-.patch \
   file://xserver-nodm.service \
 "
 S = "${WORKDIR}/${SRCNAME}"

meta-efl/recipes-efl/efl/embryo_svn.bb +1 -1

index 7c185e7..ad1bb10 100644
@@ -1,6 +1,6 @@
 require embryo.inc
 
-SRCREV = "${EFL_SRCREV_1.1.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"

meta-efl/recipes-efl/efl/evas_svn.bb +1 -1

index 284891e..a2641b9 100644
@@ -1,6 +1,6 @@
 require evas.inc
 
-SRCREV = "${EFL_SRCREV_1.1.0}"
+SRCREV = "${EFL_SRCREV}"
 PV = "1.1.0+svnr${SRCPV}"
 PR = "${INC_PR}.0"
 DEFAULT_PREFERENCE = "-1"

meta-efl/recipes-efl/efl/libeflvala/0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch deleted +0 ~~-97~~

97 lines not on this page · raw message

meta-efl/recipes-efl/efl/libeflvala_svn.bb +0 -1

index e2450aa..c18c8c9 100644
@@ -13,7 +13,6 @@ SRCNAME = "vala"
 inherit e-base autotools pkgconfig vala
 
 SRC_URI = "${E_SVN}/trunk/BINDINGS;module=${SRCNAME};proto=http \
-  file://0001-BINDINS-vala-update-genlist-gengrid-callbacks-s-labe.patch \
 "
 S = "${WORKDIR}/${SRCNAME}"

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-20 14:08 UTC #2 lore raw

PATCH 2/7 edje: fix unpackaged multisense modules

Signed-off-by Martin Jansa <[email protected]>

---
 meta-efl/recipes-efl/efl/edje.inc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

meta-efl/recipes-efl/efl/edje.inc +5 -1

index 7c415d2..9a62156 100644
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c18cc221a14a84b033db27794dc36df8"
 inherit efl
 
 BBCLASSEXTEND = "native nativesdk"
-INC_PR = "r1"
+INC_PR = "r2"
 
 do_configure_prepend_virtclass-native() {
 	sed -i 's:EMBRYO_PREFIX"/bin:"${STAGING_BINDIR}:' ${S}/src/bin/edje_cc_out.c

@@ -56,3 +56,7 @@ FILES_${PN}-utils = "\
   ${libdir}/edje/utils/epp \
   ${datadir}/edje/include/edje.inc \
 "
+
+FILES_${PN} += "${libdir}/${PN}/modules/*/*/module.${SOLIBS}"
+FILES_${PN}-dev += "${libdir}/${PN}/modules/*/*/module.la"
+FILES_${PN}-dbg += "${libdir}/${PN}/modules/*/*/.debug"

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-20 14:08 UTC #3 lore raw

PATCH 3/7 e-base: bump EFL_SRCREV a bit more

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta-efl/classes/e-base.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-efl/classes/e-base.bbclass +1 -1

index 8b21675..5e3e513 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "66164"
+EFL_SRCREV ?= "66238"
 
 ARM_INSTRUCTION_SET = "arm"

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-20 14:08 UTC #4 lore raw

PATCH 4/7 e-tasks: add patch to fix changed callback name

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../e-tasks/0001-fix-changed-callback-name.patch   |   40 ++++++++++++++++++++
 meta-efl/recipes-efl/e17/e-tasks_svn.bb            |    5 +-
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 meta-efl/recipes-efl/e17/e-tasks/0001-fix-changed-callback-name.patch

meta-efl/recipes-efl/e17/e-tasks/0001-fix-changed-callback-name.patch new file +40 -0

new file mode 100644
index 0000000..cf51deb
@@ -0,0 +1,40 @@
+From d6d24a1776594e71ee66db78cc234f38f97f6825 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Sat, 17 Dec 2011 03:12:29 +0100
+Subject: [PATCH] fix changed callback name
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ src/gui.c  |    2 +-
+ src/main.c |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/gui.c b/src/gui.c
+index 5c8003c..b032ee5 100644
+--- a/src/gui.c
++++ b/src/gui.c
+@@ -1230,7 +1230,7 @@ void edit_cat(void)
+ 
+ 	cat_win = elm_win_add(NULL, "cat", ELM_WIN_BASIC);
+ 	elm_win_title_set(cat_win, "Edit Categories");
+-	evas_object_smart_callback_add(cat_win, "delete-request", cat_win_del, cat_win);
++	evas_object_smart_callback_add(cat_win, "delete,request", cat_win_del, cat_win);
+ 	
+ 	//add background
+ 	bg = elm_bg_add(cat_win);
+diff --git a/src/main.c b/src/main.c
+index 12072f5..116b84c 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -64,7 +64,7 @@ elm_main(int argc, char **argv)
+ 	//set up win
+ 	win = elm_win_add(NULL, "tasks", ELM_WIN_BASIC);
+ 	elm_win_title_set(win, "Tasks");
+-	evas_object_smart_callback_add(win, "delete-request", my_win_del, NULL);
++	evas_object_smart_callback_add(win, "delete,request", my_win_del, NULL);
+ 
+ 	//open database 
+ 	open_database();
+-- 
+1.7.8
+

meta-efl/recipes-efl/e17/e-tasks_svn.bb +3 -2

index b07959b..f4a25f8 100644
@@ -10,12 +10,13 @@ inherit autotools
 
 SRCREV = "25"
 PV = "0.0.1+svnr${SRCPV}"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "svn://e-tasks.googlecode.com/svn;module=trunk;proto=http \
            file://genlist_item_insert_before.api.patch \
            file://0001-adapt-to-newer-elm-API.patch \
-           file://depends.eina.patch"
+           file://depends.eina.patch \
+           file://0001-fix-changed-callback-name.patch"
 S = "${WORKDIR}/trunk"
 
 do_install_append() {

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-20 14:08 UTC #5 lore raw

PATCH 5/7 gpsd: upgrade from 2.95 to 2.96, drop 2 patches applied upstream

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../gpsd/gpsd-2.95/fix-build-with-python2.7.patch  |   15 ---------------
 .../gpsd/gpsd-2.95/libtool.patch                   |   16 ----------------
 .../gpsd/{gpsd-2.95 => gpsd-2.96}/60-gpsd.rules    |    0
 .../gpsd/{gpsd-2.95 => gpsd-2.96}/gpsd             |    0
 .../gpsd/{gpsd-2.95 => gpsd-2.96}/gpsd-default     |    0
 .../gpsd/{gpsd_2.95.bb => gpsd_2.96.bb}            |   10 +++-------
 6 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch
 delete mode 100644 meta-oe/recipes-navigation/gpsd/gpsd-2.95/libtool.patch
 rename meta-oe/recipes-navigation/gpsd/{gpsd-2.95 => gpsd-2.96}/60-gpsd.rules (100%)
 rename meta-oe/recipes-navigation/gpsd/{gpsd-2.95 => gpsd-2.96}/gpsd (100%)
 rename meta-oe/recipes-navigation/gpsd/{gpsd-2.95 => gpsd-2.96}/gpsd-default (100%)
 rename meta-oe/recipes-navigation/gpsd/{gpsd_2.95.bb => gpsd_2.96.bb} (90%)

meta-oe/recipes-navigation/gpsd/gpsd-2.95/fix-build-with-python2.7.patch deleted +0 ~~-15~~

deleted file mode 100644
index 6bba2b8..0000000
@@ -1,15 +0,0 @@
-Without this patch python2.6 from host could be preferred over python from native sysroot.
-
-Upstream-Status: Pending
-diff -uNr gpsd-2.95.orig/configure.ac gpsd-2.95/configure.ac
---- gpsd-2.95.orig/configure.ac	2011-10-31 18:26:08.860719033 +0100
-+++ gpsd-2.95/configure.ac	2011-10-31 18:27:47.718716963 +0100
-@@ -31,7 +31,7 @@
- dnl AM_PATH_PYTHON provided with automake can be too old.  Look
- dnl for newer python first, and include 2.6 on the list.
- m4_define([_AM_PYTHON_INTERPRETER_LIST],
--	    [python2.6 python2.5 python2.4 python])
-+	    [python2.7 python2.6 python2.5 python2.4 python])
- AM_PATH_PYTHON([2.4])
- ac_python=yes
- if test "x$PYTHON" = "x"; then

meta-oe/recipes-navigation/gpsd/gpsd-2.95/libtool.patch deleted +0 ~~-16~~

deleted file mode 100644
index 7b78a72..0000000
@@ -1,16 +0,0 @@
-Index: gpsd-2.95/Makefile.am
-===================================================================
---- gpsd-2.95.orig/Makefile.am	2010-08-26 15:31:38.804330723 +0200
-+++ gpsd-2.95/Makefile.am	2010-08-26 15:31:57.170020341 +0200
-@@ -253,9 +253,9 @@
- # Warning: This overrides autoconf's normal link-line generation process
- if LIBGPSMM_ENABLE
- libgps_la_SOURCES += libgpsmm.cpp
--libgps_la_LINK = /bin/sh ./libtool --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
-+libgps_la_LINK = $(LIBTOOL) --tag=CXX --mode=link g++ $(libgps_la_LDFLAGS) -o $@
- else
--libgps_la_LINK = /bin/sh ./libtool --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
-+libgps_la_LINK = $(LIBTOOL) --tag=CC --mode=link gcc $(libgps_la_LDFLAGS) -o $@
- endif
- 
- nodist_libgpsd_la_SOURCES = packet_names.h ais_json.i

meta-oe/recipes-navigation/gpsd/gpsd-2.96/60-gpsd.rules renamed from meta-oe/recipes-navigation/gpsd/gpsd-2.95/60-gpsd.rules +0 -0

similarity index 100%
rename from meta-oe/recipes-navigation/gpsd/gpsd-2.95/60-gpsd.rules
rename to meta-oe/recipes-navigation/gpsd/gpsd-2.96/60-gpsd.rules

meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd renamed from meta-oe/recipes-navigation/gpsd/gpsd-2.95/gpsd +0 -0

similarity index 100%
rename from meta-oe/recipes-navigation/gpsd/gpsd-2.95/gpsd
rename to meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd

meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd-default renamed from meta-oe/recipes-navigation/gpsd/gpsd-2.95/gpsd-default +0 -0

similarity index 100%
rename from meta-oe/recipes-navigation/gpsd/gpsd-2.95/gpsd-default
rename to meta-oe/recipes-navigation/gpsd/gpsd-2.96/gpsd-default

meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb renamed from meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb +3 -7

similarity index 90%
rename from meta-oe/recipes-navigation/gpsd/gpsd_2.95.bb
rename to meta-oe/recipes-navigation/gpsd/gpsd_2.96.bb
index cdcb77c..0dc06a1 100644
@@ -5,22 +5,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d217a23f408e91c94359447735bc1800"
 DEPENDS = "dbus-glib ncurses python libusb1"
 PROVIDES = "virtual/gpsd"
 
-PR = "r2"
-
 EXTRA_OECONF = "--x-includes=${STAGING_INCDIR}/X11 \
                 --x-libraries=${STAGING_LIBDIR} \
                 --enable-dbus \
                 --disable-libQgpsmm \
 "
 
-SRC_URI = "http://download.berlios.de/${PN}/${P}.tar.gz;name=gpsd \
-           file://libtool.patch \
-           file://fix-build-with-python2.7.patch \
+SRC_URI = "http://download.berlios.de/${PN}/${P}bis.tar.gz;name=gpsd \
            file://gpsd-default \
            file://gpsd \
            file://60-gpsd.rules"
-SRC_URI[gpsd.md5sum] = "12535a9ed9fecf9ea2c5bdc9840da5ae"
-SRC_URI[gpsd.sha256sum] = "832343a53921a8371efa540ba57c91dadedda445e571c1beb97c06539ef450ae"
+SRC_URI[gpsd.md5sum] = "52b00cab0fb34bbf1923ae35c7ced6c4"
+SRC_URI[gpsd.sha256sum] = "c6d72565bc06b802c749e69808eb7c6ee165962dc17383971c9001b5e1763690"
 
 inherit autotools update-rc.d python-dir

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-20 14:09 UTC #6 lore raw

PATCH 6/7 navit: bump PR after gpsd upgrade (.so name change)

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta-oe/recipes-navigation/navit/navit_svn.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-oe/recipes-navigation/navit/navit_svn.bb +1 -1

index 67da7a9..1aee3c7 100644
@@ -2,7 +2,7 @@ require navit.inc
 
 SRCREV = "4841"
 PV = "0.2.0+svnr${SRCPV}"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 S = "${WORKDIR}/${PN}"
 SRC_URI += "svn://[email protected]/svnroot/navit/trunk;module=navit;proto=http "

Signature · 1 line

1.7.8

Martin Jansa

author

2011-12-20 14:09 UTC #7 lore raw

PATCH 7/7 midori: upgrade from 0.4.2 to 0.4.3

In reply to Martin Jansa

* only build tested, it does segfault in runtime but it's the same with previous 0.4.2 version and probably not caused by midori itself

Signed-off-by Martin Jansa <[email protected]>

---
 .../midori/{midori_0.4.2.bb => midori_0.4.3.bb}    |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
 rename meta-oe/recipes-connectivity/midori/{midori_0.4.2.bb => midori_0.4.3.bb} (54%)

meta-oe/recipes-connectivity/midori/midori_0.4.3.bb renamed from meta-oe/recipes-connectivity/midori/midori_0.4.2.bb +2 -7

similarity index 54%
rename from meta-oe/recipes-connectivity/midori/midori_0.4.2.bb
rename to meta-oe/recipes-connectivity/midori/midori_0.4.3.bb
index 10109e6..2be8274 100644
@@ -1,16 +1,11 @@
 require midori.inc
 
-PR = "r2"
-
 SRC_URI = "http://archive.xfce.org/src/apps/midori/0.4/midori-${PV}.tar.bz2;name=midori \
            file://waf \
           "
+SRC_URI[midori.md5sum] = "900037557b82818d79d2dd1c5a7d7fd2"
+SRC_URI[midori.sha256sum] = "fca4a0eab03358f20d7700069dbf2faaf8fa5c11aaad97f4208aea608f4bed9f"
 
 do_configure_prepend() {
   cp -f ${WORKDIR}/waf ${S}/
 }
-
-SRC_URI[midori.md5sum] = "4ec9c3daa332ebe865cba6aa8256ef63"
-SRC_URI[midori.sha256sum] = "2e3f104254fb9a28c77e8acf1cc8ae6dd529499711d558b29146ab0fa915f0a7"
-
-

Signature · 1 line

1.7.8