t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-06 22:24:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtimageformats: Make the dependencies deterministic

Browse Source 
* jasper and libwebp were autodetected from sysroot

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa
2014-08-04 19:20:39 +02:00
parent 6ce50bf97b
commit b0a32232e7
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
recipes-qt/qt5/qtimageformats.inc
View File

@@ -1,8 +1,22 @@
require qt5.inc
DEPENDS += "qtbase tiff"
DEPENDS += "qtbase"
ALLOW_EMPTY_${PN} = "1"
SRC_URI += "file://0001-qtimageformats.pro-Make-the-dependencies-determinist.patch"
PACKAGECONFIG ?= "libtiff"
# Currently we don't have recipe for libmng, but lock it anyway so qtimageformats stay deterministic even when libmng is introduced
PACKAGECONFIG[jasper] = ",,jasper"
PACKAGECONFIG[libmng] = ",,libmng"
PACKAGECONFIG[libtiff] = ",,tiff"
PACKAGECONFIG[libwebp] = ",,libwebp"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libmng', 'CONFIG+=OE_LIBMNG_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'jasper', 'CONFIG+=OE_JASPER_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libtiff', 'CONFIG+=OE_LIBTIFF_ENABLED', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'libwebp', 'CONFIG+=OE_LIBWEBP_ENABLED', '', d)}"
# older copyright year than what e.g. qtbase is using now
LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \

31
recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch Normal file
View File

@@ -0,0 +1,31 @@
From f309b1e149764a193cbfc694973083e70b5f4a7e Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 4 Aug 2014 19:19:05 +0200
Subject: [PATCH] qtimageformats.pro: Make the dependencies deterministic
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
qtimageformats.pro | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/qtimageformats.pro b/qtimageformats.pro
index 8382e5c..63d13ce 100644
--- a/qtimageformats.pro
+++ b/qtimageformats.pro
@@ -1,9 +1,9 @@
requires(qtHaveModule(gui))
load(configure)
-qtCompileTest(jasper)
-qtCompileTest(libmng)
-qtCompileTest(libtiff)
-qtCompileTest(libwebp)
+OE_JASPER_ENABLED:qtCompileTest(jasper)
+OE_LIBMNG_ENABLED:qtCompileTest(libmng)
+OE_LIBTIFF_ENABLED:qtCompileTest(libtiff)
+OE_LIBWEBP_ENABLED:qtCompileTest(libwebp)
load(qt_parts)
--
2.0.4