aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-11-26 12:28:08 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2020-11-27 07:27:06 +0200
commitecc126ed6e1b697cba5ca5c76820c0f193d1182c (patch)
tree7abe4fae90c2564ee589414056ac4d87d00b88a5
parent181b94d709e37ecd26c22629a5f1add125ea0454 (diff)
qtimageformats: add PACKAGECONFIGs for all imagetypes
Support for mng cannot be enabled, default to formats available from oe-core. Change-Id: I9ed3e8b9e173f13a67fef4832aa6ef42681f7285 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--coin/test-configs.inc3
-rw-r--r--recipes-qt/qt6/qtimageformats_git.bb6
2 files changed, 9 insertions, 0 deletions
diff --git a/coin/test-configs.inc b/coin/test-configs.inc
index 213c925..6d0717a 100644
--- a/coin/test-configs.inc
+++ b/coin/test-configs.inc
@@ -39,6 +39,9 @@ PACKAGECONFIG_append_pn-qtbase = "\
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \
"
+# imageformats mng FIXME
+PACKAGECONFIG_append_pn-qtimageformats = " jasper"
+
# Use latest uninative package
UNINATIVE_MAXGLIBCVERSION = "2.32"
diff --git a/recipes-qt/qt6/qtimageformats_git.bb b/recipes-qt/qt6/qtimageformats_git.bb
index 4e067a9..c0c1802 100644
--- a/recipes-qt/qt6/qtimageformats_git.bb
+++ b/recipes-qt/qt6/qtimageformats_git.bb
@@ -20,4 +20,10 @@ include recipes-qt/qt6/qt6.inc
DEPENDS += "qtbase"
+PACKAGECONFIG ?= "tiff webp"
+PACKAGECONFIG[jasper] = "-DFEATURE_jasper=ON,-DFEATURE_jasper=OFF,jasper"
+PACKAGECONFIG[mng] = "-DFEATURE_mng=ON,-DFEATURE_mng=OFF,libmng"
+PACKAGECONFIG[tiff] = "-DFEATURE_tiff=ON,-DFEATURE_libtiff=OFF,tiff"
+PACKAGECONFIG[webp] = "-DFEATURE_webp=ON,-DFEATURE_webp=OFF,libwebp"
+
SRCREV = "9b0b68488ac75668da339bdcd1ab358db03f2932"