diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-04 19:20:39 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-08-05 17:27:27 +0200 |
| commit | 088399a68731c138c03cc6857d6409b82b06ecb5 (patch) | |
| tree | a5071807841911593f2d843d942574220e6340bf | |
| parent | 4a3ef7cc5424e96092d3f67221fcfd45e418d460 (diff) | |
qtimageformats: Make the dependencies deterministic
* jasper and libwebp were autodetected from sysroot
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtimageformats.inc | 16 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch | 31 |
2 files changed, 46 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qtimageformats.inc b/recipes-qt/qt5/qtimageformats.inc index f90e58aa..39afd461 100644 --- a/recipes-qt/qt5/qtimageformats.inc +++ b/recipes-qt/qt5/qtimageformats.inc @@ -1,4 +1,18 @@ 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)}" diff --git a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch new file mode 100644 index 00000000..d12851f9 --- /dev/null +++ b/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch @@ -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 + |