[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH v2] qt4.inc: depend on tiff
From:       sgw () linux ! intel ! com (Saul Wold)
Date:       2012-02-28 18:55:29
Message-ID: 4F4D2321.6050508 () linux ! intel ! com
[Download RAW message or body]

On 02/27/2012 05:02 PM, Andreas Oberritter wrote:
> From fdececee9146f4d23494361d29a34877d67b879b Mon Sep 17 00:00:00 2001
> From: Andreas Oberritter<obi at 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 at 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!


[prev in list] [next in list] [prev in thread] [next in thread]