EFL and sip/pyqt upgrade

PATCH In review Martin Jansa 1 participant 8 messages Jan 2, 2013

lore

Share & tools

lore

Martin Jansa

author

2013-01-02 14:29 UTC #0 lore raw

cover EFL and sip/pyqt upgrade

The following changes since commit 1de21e56eeefdcfe4972900cf9f651ba1d8c9f0b:

imagemagick: disable opencl (2012-12-27 16:14:23 +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 (6):
sip-native: upgrade to 4.14.2
python-sip: upgrade to 4.14.2
python-pyqt: upgrade to 4.9.6
e-base: bump EFL_SRCREV
edbus2: update SRC_URI
edbus2: fix segfaults in eve/enjoy

 meta-efl/classes/e-base.bbclass                                    | 2 +-
 meta-efl/recipes-efl/efl/edbus2.inc                                | 2 +-
 meta-efl/recipes-efl/efl/edbus2_svn.bb                             | 6 ++++--
 .../{python-pyqt-4.9.5 => python-pyqt-4.9.6}/pyqt-generated.patch  | 0
 .../qreal_float_support.diff                                       | 0
 .../python/{python-pyqt_4.9.5.bb => python-pyqt_4.9.6.bb}          | 4 ++--
 meta-oe/recipes-devtools/python/python-sip_4.13.3.bb               | 3 ---
 .../python/{python-sip.inc => python-sip_4.14.2.bb}                | 4 +++-
 .../sip/{sip-native_4.13.3.bb => sip-native_4.14.2.bb}             | 7 +++----
 9 files changed, 14 insertions(+), 14 deletions(-)
 rename meta-oe/recipes-devtools/python/{python-pyqt-4.9.5 => python-pyqt-4.9.6}/pyqt-generated.patch (100%)
 rename meta-oe/recipes-devtools/python/{python-pyqt-4.9.5 => python-pyqt-4.9.6}/qreal_float_support.diff (100%)
 rename meta-oe/recipes-devtools/python/{python-pyqt_4.9.5.bb => python-pyqt_4.9.6.bb} (96%)
 delete mode 100644 meta-oe/recipes-devtools/python/python-sip_4.13.3.bb
 rename meta-oe/recipes-devtools/python/{python-sip.inc => python-sip_4.14.2.bb} (87%)
 rename meta-oe/recipes-extended/sip/{sip-native_4.13.3.bb => sip-native_4.14.2.bb} (82%)

Signature · 1 line

1.8.0.2

Martin Jansa

author

2013-01-02 14:29 UTC #1 lore raw

PATCH 1/6 sip-native: upgrade to 4.14.2

* only copyright year updated in LIC_FILES_CHKSUM

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

---
 .../sip/{sip-native_4.13.3.bb => sip-native_4.14.2.bb}             | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta-oe/recipes-extended/sip/{sip-native_4.13.3.bb => sip-native_4.14.2.bb} (82%)

meta-oe/recipes-extended/sip/sip-native_4.14.2.bb renamed from meta-oe/recipes-extended/sip/sip-native_4.13.3.bb +3 -4

similarity index 82%
rename from meta-oe/recipes-extended/sip/sip-native_4.13.3.bb
rename to meta-oe/recipes-extended/sip/sip-native_4.14.2.bb
index ddd132a..32579c0 100644
@@ -3,15 +3,14 @@ AUTHOR = "Phil Thompson"
 HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
 SECTION = "devel"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://sipgen.sbf;endline=15;md5=88e887a386c18a01240d8d055da4e441"
+LIC_FILES_CHKSUM = "file://sipgen.sbf;endline=15;md5=61b2ce7ddd624968411804d2fa9d776c"
 
 # riverbankcomputing is upstream, but keeps only latest version, sf usually have few older
 #SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz"
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz"
-SRC_URI[md5sum] = "76192829cc42ec558db46e4f9e1d8ba9"
-SRC_URI[sha256sum] = "ec295f71ef339c5b98db5650865f2c6c1200c4085b7a3f33f284111e1f534ac1"
+SRC_URI[md5sum] = "b93442e745b3be2fad89de0686a76ce9"
+SRC_URI[sha256sum] = "1a9d3bf26c821f369c175f8e68946b79bc994da4f96e8f5ecff06e6ee7ac0528"
 S = "${WORKDIR}/sip-${PV}/sipgen"
-PR = "r1"
 
 inherit qmake2 native python-dir

Signature · 1 line

1.8.0.2

Martin Jansa

author

2013-01-02 14:29 UTC #2 lore raw

PATCH 2/6 python-sip: upgrade to 4.14.2

In reply to Martin Jansa

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

---
 meta-oe/recipes-devtools/python/python-sip_4.13.3.bb                  | 3 ---
 .../recipes-devtools/python/{python-sip.inc => python-sip_4.14.2.bb}  | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/python/python-sip_4.13.3.bb
 rename meta-oe/recipes-devtools/python/{python-sip.inc => python-sip_4.14.2.bb} (87%)

meta-oe/recipes-devtools/python/python-sip_4.13.3.bb deleted +0 -3

deleted file mode 100644
index aed799d..0000000
@@ -1,3 +0,0 @@
-require python-sip.inc
-SRC_URI[md5sum] = "76192829cc42ec558db46e4f9e1d8ba9"
-SRC_URI[sha256sum] = "ec295f71ef339c5b98db5650865f2c6c1200c4085b7a3f33f284111e1f534ac1"

meta-oe/recipes-devtools/python/python-sip_4.14.2.bb renamed from meta-oe/recipes-devtools/python/python-sip.inc +3 -1

similarity index 87%
rename from meta-oe/recipes-devtools/python/python-sip.inc
rename to meta-oe/recipes-devtools/python/python-sip_4.14.2.bb
index d42414b..1159a2a 100644
@@ -3,13 +3,15 @@ SECTION = "devel/python"
 HOMEPAGE = "http://www.riverbankcomputing.co.uk/sip"
 AUTHOR = "Phil Thompson"
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://siplib.sbf.in;endline=15;md5=e0e7b5d0c4656666df09826ea1d2071c"
+LIC_FILES_CHKSUM = "file://siplib.sbf.in;endline=15;md5=3d462bd8cb43db3e4be998fe155ae9cf"
 DEPENDS = "python"
 RDEPENDS_${PN} = "python-core"
 
 # riverbankcomputing is upstream, but keeps only latest version, sf usually have few older
 #SRC_URI = "http://www.riverbankcomputing.com/static/Downloads/sip4/sip-${PV}.tar.gz"
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/pyqt/sip/sip-${PV}/sip-${PV}.tar.gz"
+SRC_URI[md5sum] = "b93442e745b3be2fad89de0686a76ce9"
+SRC_URI[sha256sum] = "1a9d3bf26c821f369c175f8e68946b79bc994da4f96e8f5ecff06e6ee7ac0528"
 
 S = "${WORKDIR}/sip-${PV}/siplib"

Signature · 1 line

1.8.0.2

Martin Jansa

author

2013-01-02 14:29 UTC #3 lore raw

PATCH 3/6 python-pyqt: upgrade to 4.9.6

In reply to Martin Jansa

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

---
 .../{python-pyqt-4.9.5 => python-pyqt-4.9.6}/pyqt-generated.patch     | 0
 .../{python-pyqt-4.9.5 => python-pyqt-4.9.6}/qreal_float_support.diff | 0
 .../python/{python-pyqt_4.9.5.bb => python-pyqt_4.9.6.bb}             | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta-oe/recipes-devtools/python/{python-pyqt-4.9.5 => python-pyqt-4.9.6}/pyqt-generated.patch (100%)
 rename meta-oe/recipes-devtools/python/{python-pyqt-4.9.5 => python-pyqt-4.9.6}/qreal_float_support.diff (100%)
 rename meta-oe/recipes-devtools/python/{python-pyqt_4.9.5.bb => python-pyqt_4.9.6.bb} (96%)

meta-oe/recipes-devtools/python/python-pyqt-4.9.6/pyqt-generated.patch renamed from meta-oe/recipes-devtools/python/python-pyqt-4.9.5/pyqt-generated.patch +0 -0

similarity index 100%
rename from meta-oe/recipes-devtools/python/python-pyqt-4.9.5/pyqt-generated.patch
rename to meta-oe/recipes-devtools/python/python-pyqt-4.9.6/pyqt-generated.patch

meta-oe/recipes-devtools/python/python-pyqt-4.9.6/qreal_float_support.diff renamed from meta-oe/recipes-devtools/python/python-pyqt-4.9.5/qreal_float_support.diff +0 -0

similarity index 100%
rename from meta-oe/recipes-devtools/python/python-pyqt-4.9.5/qreal_float_support.diff
rename to meta-oe/recipes-devtools/python/python-pyqt-4.9.6/qreal_float_support.diff

meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb renamed from meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb +2 -2

similarity index 96%
rename from meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb
rename to meta-oe/recipes-devtools/python/python-pyqt_4.9.6.bb
index e248fbb..340796a 100644
@@ -21,8 +21,8 @@ SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/pyqt/PyQt-x11-gpl-${PV}.tar.gz \
   file://pyqt-generated.patch;apply=no \
 "
-SRC_URI[md5sum] = "e4cdd6619c63655f7510efb4df8462fb"
-SRC_URI[sha256sum] = "75ff0a3a088ae22c4d6e8adb242f7e593104af93933cbdd9900bc7b06f46191e"
+SRC_URI[md5sum] = "514e1f9597771dc732ba75ba9fa5c6b6"
+SRC_URI[sha256sum] = "a350f9e5c6d8062671c0f29bf1a70824719b18175ce8372c29bf7c1eda44b18d"
 S = "${WORKDIR}/PyQt-x11-gpl-${PV}"
 
 # arm and mips machines need some extra patches

Signature · 1 line

1.8.0.2

Martin Jansa

author

2013-01-02 14:29 UTC #4 lore raw

PATCH 4/6 e-base: bump EFL_SRCREV

In reply to Martin Jansa

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

---
 meta-efl/classes/e-base.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

index 1eb0eab..4c58d92 100644
@@ -2,7 +2,7 @@ HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 SRCVER ?= "${PV}"
 
-EFL_SRCREV ?= "81627"
+EFL_SRCREV ?= "81973"
 
 ARM_INSTRUCTION_SET = "arm"

Signature · 1 line

1.8.0.2

Martin Jansa

author

2013-01-02 14:29 UTC #5 lore raw

PATCH 5/6 edbus2: update SRC_URI

In reply to Martin Jansa

* edbus2 was merged in efl tree and moved to IN-EFL in r81826 there is important fix also in IN-EFL/edbus2

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

---
 meta-efl/recipes-efl/efl/edbus2_svn.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

index 15e7002..1461d46 100644
@@ -6,7 +6,7 @@ PR = "${INC_PR}.1"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "\
-  ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \
+  ${E_SVN}/trunk/IN-EFL;module=${SRCNAME};protocol=http;scmdata=keep \
 "
 S = "${WORKDIR}/${SRCNAME}"

Signature · 1 line

1.8.0.2

Martin Jansa

author

2013-01-02 14:29 UTC #6 lore raw

PATCH 6/6 edbus2: fix segfaults in eve/enjoy

In reply to Martin Jansa

* edbus2 is using AC_TRY_RUN in edbus/m4/ac_valist.m4, it does not work for us cross-compiling, so let's define it directly
* without this change eve/enjoy segfaults:
http://sourceforge.net/mailarchive/message.php?msg_id=30297875
* remove HAL from DESCRIPTION, it's from e_dbus

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

---
 meta-efl/recipes-efl/efl/edbus2.inc    | 2 +-
 meta-efl/recipes-efl/efl/edbus2_svn.bb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

meta-efl/recipes-efl/efl/edbus2.inc +1 -1

index 00e2a28..9b41d8b 100644
@@ -1,4 +1,4 @@
-DESCRIPTION = "DBus and HAL convenience wrappers for EFL"
+DESCRIPTION = "DBus convenience wrappers for EFL"
 DEPENDS = "dbus ecore eina"
 LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=4ed65f801204783f71fedafc082038d9"

meta-efl/recipes-efl/efl/edbus2_svn.bb +3 -1

index 1461d46..7d58326 100644
@@ -2,9 +2,11 @@ require ${BPN}.inc
 
 SRCREV = "${EFL_SRCREV}"
 PV = "1.7.99+svnr${SRCPV}"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 DEFAULT_PREFERENCE = "-1"
 
+CACHED_CONFIGUREVARS += "ac_cv_valistasarray=yes"
+
 SRC_URI = "\
   ${E_SVN}/trunk/IN-EFL;module=${SRCNAME};protocol=http;scmdata=keep \
 "

Signature · 1 line

1.8.0.2

Martin Jansa

author

2013-01-02 14:56 UTC #7 lore raw

Re: [meta-oe][meta-efl][PATCH 6/6] edbus2: fix segfaults in eve/enjoy

Quoted 7 lines · Martin Jansa

* edbus2 is using AC_TRY_RUN in edbus/m4/ac_valist.m4, it does not work for us cross-compiling, so let's define it directly
* without this change eve/enjoy segfaults:
http://sourceforge.net/mailarchive/message.php?msg_id=30297875
* remove HAL from DESCRIPTION, it's from e_dbus
Signed-off-by Martin Jansa <[email protected]>

ignore this one, it fixes segfault on x86_64 but fails on arm..

Cheers,

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]