Revert "qtimageformats: Make the dependencies deterministic"

This reverts commit 088399a68731c138c03cc6857d6409b82b06ecb5.

2 files changed, 1 insertions, 46 deletions

diff --git a/recipes-qt/qt5/qtimageformats.inc b/recipes-qt/qt5/qtimageformats.inc
index 39afd461..f90e58aa 100644
--- a/recipes-qt/qt5/qtimageformats.inc
+++ b/recipes-qt/qt5/qtimageformats.inc
@@ -1,18 +1,4 @@
 require qt5.inc
 
-DEPENDS += "qtbase"
+DEPENDS += "qtbase tiff"
 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
deleted file mode 100644
index d12851f9..00000000
--- a/recipes-qt/qt5/qtimageformats/0001-qtimageformats.pro-Make-the-dependencies-determinist.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-