Skip to contentSkip to conversation

PR bumps and DEPENDS fixes after tiff upgrade

PATCH New Martin Jansa 1 participant 8 messages Mar 8, 2012

lore
Share & tools
lore
#0 lore raw

cover PR bumps and DEPENDS fixes after tiff upgrade

The following changes since commit 5b3974ed483418b206678acca7414b81bcf749a7:

udev: consolekit package requires x11 (2012-03-07 15:17:13 +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
poppler: add tiff to DEPENDS to make builds more deterministic
elementary: add poppler to DEPENDS
epdf: another PR bump for libtiff3->libtiff5
python-elementary: another PR bump for libtiff3->libtiff5
lcms: add tiff to DEPENDS
eve: another PR bump for libtiff3->libtiff5

 meta-efl/classes/e-base.bbclass                    |    2 +-
 .../python/python-elementary_svn.bb                |    2 +-
 ...ume-Remove-the-popup.-It-s-not-needed-now.patch |  135 --------------------
 meta-efl/recipes-efl/e17/e-wm_svn.bb               |    1 -
 meta-efl/recipes-efl/e17/eve_svn.bb                |    2 +-
 meta-efl/recipes-efl/efl/elementary_svn.bb         |    4 +-
 meta-efl/recipes-efl/efl/epdf_svn.bb               |    2 +-
 meta-oe/recipes-support/lcms/lcms_1.17.bb          |    3 +-
 meta-oe/recipes-support/poppler/poppler.inc        |    2 +-
 meta-oe/recipes-support/poppler/poppler_0.18.0.bb  |    2 +-
 10 files changed, 10 insertions(+), 145 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/e-wm/0001-Revert-Illume-Remove-the-popup.-It-s-not-needed-now.patch
Signature · 1 line
1.7.8.5
#1 lore raw

PATCH 1/7 e-base: bump EFL_SRCREV

* remove e-wm patch from 974d2fe857c82826606959ea909bc6e75567e4e4, it's not needed now.

---
 meta-efl/classes/e-base.bbclass                    |    2 +-
 ...ume-Remove-the-popup.-It-s-not-needed-now.patch |  135 --------------------
 meta-efl/recipes-efl/e17/e-wm_svn.bb               |    1 -
 3 files changed, 1 insertions(+), 137 deletions(-)
 delete mode 100644 meta-efl/recipes-efl/e17/e-wm/0001-Revert-Illume-Remove-the-popup.-It-s-not-needed-now.patch
meta-efl/classes/e-base.bbclass +1 -1
index e53d5c0..b337530 100644
@@ -1,6 +1,6 @@
 HOMEPAGE = "http://www.enlightenment.org"
 SRCNAME ?= "${BPN}"
 
-EFL_SRCREV ?= "67883"
+EFL_SRCREV ?= "68387"
 
 ARM_INSTRUCTION_SET = "arm"
meta-efl/recipes-efl/e17/e-wm/0001-Revert-Illume-Remove-the-popup.-It-s-not-needed-now.patch deleted +0 -135

135 lines not on this page · raw message

meta-efl/recipes-efl/e17/e-wm_svn.bb +0 -1
index 25aa865..ec921af 100644
@@ -12,7 +12,6 @@ S = "${WORKDIR}/${SRCNAME}"
 
 SRC_URI = "\
   ${E_SVN}/trunk;module=${SRCNAME};proto=http \
-  file://0001-Revert-Illume-Remove-the-popup.-It-s-not-needed-now.patch \
   file://enlightenment_start.oe \
   file://applications.menu \
 "
Signature · 1 line
1.7.8.5
#2 lore raw

PATCH 2/7 poppler: add tiff to DEPENDS to make builds more deterministic

* it's autodetected

---
 meta-oe/recipes-support/poppler/poppler.inc       |    2 +-
 meta-oe/recipes-support/poppler/poppler_0.18.0.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-support/poppler/poppler.inc +1 -1
index 85c3983..a624c1b 100644
@@ -1,5 +1,5 @@
 DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-DEPENDS = "fontconfig jpeg zlib gtk+ cairo"
+DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
meta-oe/recipes-support/poppler/poppler_0.18.0.bb +1 -1
index 69d2926..6f1a022 100644
@@ -1,6 +1,6 @@
 require poppler.inc
 
-PR = "r2"
+PR = "r3"
 
 DEPENDS += "lcms"
 
Signature · 1 line
1.7.8.5
#3 lore raw

PATCH 3/7 elementary: add poppler to DEPENDS

In reply to Martin Jansa

* poppler is autodetected and then transitive deps are not working as expected (it will remove tiff from sysroot to replace it with newer version while building something else against elementary)

  | /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/libexec/x86_64-oe-linux/gcc/x86_64-oe-linux/4.6.3/ld: warning: libtiff.so.3, needed by /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libelementary.so, not found (try using -rpath or -rpath-link)
  | /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libpoppler.so: undefined reference to `TIFFSetField'
  | /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libpoppler.so: undefined reference to `TIFFClose'
  | /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libpoppler.so: undefined reference to `TIFFDefaultStripSize'
  | /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libpoppler.so: undefined reference to `TIFFFdOpen'
  | /OE/shr-core/tmp-eglibc/sysroots/qemux86-64/usr/lib/libpoppler.so: undefined reference to `TIFFWriteScanline'
---
 meta-efl/recipes-efl/efl/elementary_svn.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta-efl/recipes-efl/efl/elementary_svn.bb +2 -2
index a0673ae..32f706f 100644
@@ -1,9 +1,9 @@
 DESCRIPTION = "EFL based widget set for mobile devices"
 LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=10a051c72424b80bc784a3903651b43b"
-DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb"
+DEPENDS = "eet-native efreet evas ecore edje eet edbus ethumb poppler"
 PV = "0.8.0+svnr${SRCPV}"
-PR = "r1"
+PR = "r2"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl gettext
Signature · 1 line
1.7.8.5
#4 lore raw

PATCH 4/7 epdf: another PR bump for libtiff3->libtiff5

In reply to Martin Jansa
---
 meta-efl/recipes-efl/efl/epdf_svn.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-efl/recipes-efl/efl/epdf_svn.bb +1 -1
index 7e6e5ca..73c3e30 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler"
 
 DEPENDS = "poppler evas ecore"
 PV = "0.1.0+svnr${SRCPV}"
-PR = "r7"
+PR = "r8"
 SRCREV = "${EFL_SRCREV}"
 
 inherit efl
Signature · 1 line
1.7.8.5
#5 lore raw

PATCH 5/7 python-elementary: another PR bump for libtiff3->libtiff5

In reply to Martin Jansa
---
 .../python/python-elementary_svn.bb                |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-efl/recipes-devtools/python/python-elementary_svn.bb +1 -1
index daaf119..dfe194b 100644
@@ -1,7 +1,7 @@
 require python-efl.inc
 LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-PR = "${INC_PR}.4"
+PR = "${INC_PR}.5"
 SRCREV = "${EFL_SRCREV}"
 DEPENDS += "elementary python-evas"
 RDEPENDS_${PN} += "python-evas python-ecore python-edje" 
Signature · 1 line
1.7.8.5
#6 lore raw

PATCH 6/7 lcms: add tiff to DEPENDS

In reply to Martin Jansa
---
 meta-oe/recipes-support/lcms/lcms_1.17.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta-oe/recipes-support/lcms/lcms_1.17.bb +2 -1
index efa6402..156bc31 100644
@@ -3,8 +3,9 @@ SECTION = "libs"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=156745cad721a8783cb847e82b79f586"
 SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms-${PV}.tar.gz"
+DEPENDS = "tiff"
 
-PR = "r3"
+PR = "r4"
 
 BBCLASSEXTEND = "native"
 
Signature · 1 line
1.7.8.5
#7 lore raw

PATCH 7/7 eve: another PR bump for libtiff3->libtiff5

In reply to Martin Jansa
---
 meta-efl/recipes-efl/e17/eve_svn.bb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta-efl/recipes-efl/e17/eve_svn.bb +1 -1
index 7836c8b..1111553 100644
@@ -3,7 +3,7 @@ LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
 DEPENDS = "evas ecore edje elementary webkit-efl"
 PV = "0.3.0.0+svnr${SRCPV}"
-PR = "r2"
+PR = "r3"
 SRCREV = "${EFL_SRCREV}"
 
 inherit e gettext
Signature · 1 line
1.7.8.5