Patchwork [v2] qt4.inc: depend on tiff

login
register
mail settings
Submitter Andreas Oberritter
Date Feb. 28, 2012, 1:02 a.m.
Message ID <4F4C279E.8020801@opendreambox.org>
Download mbox | patch
Permalink /patch/22195/
State Accepted
Commit d0853052228128ccca2b744dae9c4dceae23067a
Headers show

Comments

Andreas Oberritter - Feb. 28, 2012, 1:02 a.m.
On 27.02.2012 18:24, Paul Eggleton wrote:
> On Monday 27 February 2012 14:20:15 Otavio Salvador wrote:
>> On Mon, Feb 27, 2012 at 14:10, Andreas Oberritter <obi@opendreambox.org> 
> wrote:
>>> * Fixes the following error with qt4-embedded-4.8.0 and possibly others:
>>> | ../../../gui/image/qtiffhandler.cpp:48:20: fatal error: tiffio.h: No
>>> | such file or directory
>> Please bump INC_PR.
> 
> FYI, there's no INC_PR in qt4.inc but you can bump INC_PR in qt4-embedded.inc 
> and qt4-x11-free.inc since those are the only places that include qt4.inc.

In this case, bumping PR just wastes everybody's CPU cycles for no gain.
Anyway, here's an updated patch:

From fdececee9146f4d23494361d29a34877d67b879b Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Mon, 27 Feb 2012 18:03:22 +0100
Subject: [PATCH] qt4.inc: depend on tiff

* Fixes the following error with qt4-embedded-4.8.0 and possibly others:

| ../../../gui/image/qtiffhandler.cpp:48:20: fatal error: tiffio.h: No such file or directory

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
Otavio Salvador - Feb. 28, 2012, 1:46 a.m.
On Mon, Feb 27, 2012 at 22:02, Andreas Oberritter <obi@opendreambox.org> wrote:
> In this case, bumping PR just wastes everybody's CPU cycles for no gain.
> Anyway, here's an updated patch:

Not really; let's say if you had done a typo on the depends list it
would be unnoticed in autobuilders and commited onto master.
Martin Jansa - Feb. 28, 2012, 6:50 a.m.
On Tue, Feb 28, 2012 at 2:46 AM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> On Mon, Feb 27, 2012 at 22:02, Andreas Oberritter <obi@opendreambox.org> wrote:
>> In this case, bumping PR just wastes everybody's CPU cycles for no gain.
>> Anyway, here's an updated patch:
>
> Not really; let's say if you had done a typo on the depends list it
> would be unnoticed in autobuilders and commited onto master.

I see your point, but OEBasicHash will notice new dependency and then
it will be rebuild
at least by poky autobuilders (if they are building qt4).
Otavio Salvador - Feb. 28, 2012, 12:16 p.m.
On Tue, Feb 28, 2012 at 03:50, Martin Jansa <martin.jansa@gmail.com> wrote:
>> Not really; let's say if you had done a typo on the depends list it
>> would be unnoticed in autobuilders and commited onto master.
>
> I see your point, but OEBasicHash will notice new dependency and then
> it will be rebuild
> at least by poky autobuilders (if they are building qt4).

We're not using auto PR yet so let's keep the regular flow for now.
Martin Jansa - Feb. 28, 2012, 12:25 p.m.
On Tue, Feb 28, 2012 at 09:16:51AM -0300, Otavio Salvador wrote:
> On Tue, Feb 28, 2012 at 03:50, Martin Jansa <martin.jansa@gmail.com> wrote:
> >> Not really; let's say if you had done a typo on the depends list it
> >> would be unnoticed in autobuilders and commited onto master.
> >
> > I see your point, but OEBasicHash will notice new dependency and then
> > it will be rebuild
> > at least by poky autobuilders (if they are building qt4).
> 
> We're not using auto PR yet so let's keep the regular flow for now.

I'm not agains PR bump I'm just saying it would be rebuilt with
OEBasicHash even without PR bump.. and without PRSERV
Saul Wold - Feb. 28, 2012, 6:55 p.m.
On 02/27/2012 05:02 PM, Andreas Oberritter wrote:
>  From fdececee9146f4d23494361d29a34877d67b879b Mon Sep 17 00:00:00 2001
> From: Andreas Oberritter<obi@opendreambox.org>
> Date: Mon, 27 Feb 2012 18:03:22 +0100
> Subject: [PATCH] qt4.inc: depend on tiff
>
> * Fixes the following error with qt4-embedded-4.8.0 and possibly others:
>
> | ../../../gui/image/qtiffhandler.cpp:48:20: fatal error: tiffio.h: No such file or directory
>
> Signed-off-by: Andreas Oberritter<obi@opendreambox.org>
> ---
>   meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
>   meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
>   meta/recipes-qt/qt4/qt4.inc          |    4 ++--
>   3 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
> index e472af5..80948f3 100644
> --- a/meta/recipes-qt/qt4/qt4-embedded.inc
> +++ b/meta/recipes-qt/qt4/qt4-embedded.inc
> @@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
>   SECTION = "libs"
>   HOMEPAGE ="http://qt.nokia.com"
>   DEPENDS += "directfb tslib"
> -INC_PR = "r40"
> +INC_PR = "r41"
>
>   QT_BASE_LIB  ?= "libqt-embedded"
>
> diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
> index 40939de..75487f7 100644
> --- a/meta/recipes-qt/qt4/qt4-x11-free.inc
> +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
> @@ -5,7 +5,7 @@ HOMEPAGE ="http://qt.nokia.com"
>   SECTION = "x11/libs"
>   DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
>
> -INC_PR = "r37"
> +INC_PR = "r38"
>
>   QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
>   QT_GLFLAGS_qemux86 = "-opengl"
> diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
> index ea868ff..161daa3 100644
> --- a/meta/recipes-qt/qt4/qt4.inc
> +++ b/meta/recipes-qt/qt4/qt4.inc
> @@ -1,6 +1,6 @@
>   inherit qmake_base
>
> -DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3"
> +DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff"
>
>   require qt4_arch.inc
>   QT_ARCH := "${@qt_arch(d)}"
> @@ -15,7 +15,7 @@ QT_GLFLAGS ?= ""
>
>   QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
>                       -shared -no-nas-sound -no-nis \
> -                    -system-libjpeg -system-libpng -system-zlib \
> +                    -system-libjpeg -system-libpng -system-libtiff -system-zlib \
>                       -no-pch -qdbus -stl -glib -phonon -webkit \
>                       -xmlpatterns -no-rpath -qt3support -silent \
>                       ${QT_SQL_DRIVER_FLAGS} \
> -- 1.7.5.4

Merged into OE-core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index e472af5..80948f3 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@  DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r40"
+INC_PR = "r41"
 
 QT_BASE_LIB  ?= "libqt-embedded"
 
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 40939de..75487f7 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@  HOMEPAGE = "http://qt.nokia.com"
 SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 
-INC_PR = "r37"
+INC_PR = "r38"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index ea868ff..161daa3 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -1,6 +1,6 @@ 
 inherit qmake_base
 
-DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3"
+DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff"
 
 require qt4_arch.inc
 QT_ARCH := "${@qt_arch(d)}"
@@ -15,7 +15,7 @@  QT_GLFLAGS ?= ""
 
 QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
                     -shared -no-nas-sound -no-nis \
-                    -system-libjpeg -system-libpng -system-zlib \
+                    -system-libjpeg -system-libpng -system-libtiff -system-zlib \
                     -no-pch -qdbus -stl -glib -phonon -webkit \
                     -xmlpatterns -no-rpath -qt3support -silent \
                     ${QT_SQL_DRIVER_FLAGS} \