From 27d187eb3259842d506bb8e35691aa4748f99025 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Mon, 14 Sep 2020 11:43:35 +0300 Subject: Provisioning: Update Conan packages * Update libjpeg-turbo to 2.0.5 * Replace MinGW 7 packages with MinGW 8 * Remove zlib packages as Qt is consistently built with -qt-zlib now Task-bumber: QTQAINFRA-3916 Change-Id: Ie15bbb0f0f5b3a4c1a5d08f2341e9eb16a80cce7 Reviewed-by: Heikki Halmet (cherry picked from commit c79904c463842937f6b2cc959454d2f59943a08e) Reviewed-by: Konstantin Tokarev --- .../2.0.3/qtproject/stable/export/conanmanifest.txt | 4 ---- .../conanmanifest.txt | 12 ------------ .../conanmanifest.txt | 12 ------------ .../conanmanifest.txt | 12 ------------ .../conanmanifest.txt | 12 ------------ .../conanmanifest.txt | 12 ------------ .../conanmanifest.txt | 12 ------------ .../conanmanifest.txt | 12 ------------ .../conanmanifest.txt | 12 ------------ 9 files changed, 100 deletions(-) delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/export/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt delete mode 100644 coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt (limited to 'coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3') diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/export/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/export/conanmanifest.txt deleted file mode 100644 index b0bb10ac..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/export/conanmanifest.txt +++ /dev/null @@ -1,4 +0,0 @@ -1582280120 -LICENSE.md: 5aa9930034582b90e2008d2c609d1317 -conanfile.py: fc9f9025d45306204140aafdf174a422 -export_source/CMakeLists.txt: eb0fcc86f467a4c6ac9f37c16887a29f diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt deleted file mode 100644 index 4f7d3680..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/1c8544b57637b92dcdfce760b76b459bde0ce701/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582282172 -conaninfo.txt: d3531bf4208a49880b6916cb487ca0fd -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: f1380749e57edaa40366510a55c4a581 -lib/pkgconfig/libjpeg.pc: 46be85b895bb997ec57faee440b199c9 -lib/pkgconfig/libturbojpeg.pc: 891d57d67b7bb2d2246f6c84e3802ff3 -lib/turbojpeg-static.lib: 03531f3967223cb10088dccf1f0ab17e -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt deleted file mode 100644 index 9297a30c..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/2b3cb3bb931646fe98ad49632435cdd3ed213435/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582282436 -conaninfo.txt: e412e1148672ae4437d5d9e8f0089dae -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/libjpeg.a: 9ec4a3ea70de97420d8a262641df11fe -lib/libturbojpeg.a: 3704f7242f7d79187bcf09b7ff7bb86e -lib/pkgconfig/libjpeg.pc: fa956ecec06575a626eb24df4ade7059 -lib/pkgconfig/libturbojpeg.pc: 7a28369f664feaef64c4f36043bdbf84 -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt deleted file mode 100644 index 32c864e9..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/4985763cfece81b148d7c11f16d564e42ee2756c/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582280262 -conaninfo.txt: 3ce2f8cfe80b79b4dd725bdff24c402d -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: 277031e07ff0a68b0da547fd73fa8931 -lib/pkgconfig/libjpeg.pc: 18fe4739f1c264cc5807ac171f79d5de -lib/pkgconfig/libturbojpeg.pc: 080a4da3c8052f00721671016bda4f79 -lib/turbojpeg-static.lib: 142395e528dbecc678f0f0242512cb32 -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt deleted file mode 100644 index c64266b1..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/6fe55a250d22d4408ba9c4b99015260e933b58f0/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582281085 -conaninfo.txt: 05273e3ea056a1d7946e1065622c2e6d -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: 94e22b458fa49d878f9f5ecaa83b4d4c -lib/pkgconfig/libjpeg.pc: f86f98cba102e1be6cdbc77e1f73d6e2 -lib/pkgconfig/libturbojpeg.pc: 9138a79005a0dd437ec485743cbc7708 -lib/turbojpeg-static.lib: 85dceca1ee42fb40b9177483a710931c -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt deleted file mode 100644 index acabe605..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/7fbb66ade701b46f34dff2e121edef66968608b5/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582282050 -conaninfo.txt: 5d70fc12733b9ab4f2eef806064af4fc -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: dc1e769eef09dec4761fcecb6e25e416 -lib/pkgconfig/libjpeg.pc: 58e4fea9c97c1e8ddfe69f5c7a90ee63 -lib/pkgconfig/libturbojpeg.pc: d8e6f88b279ae6759cf8f0363cb08913 -lib/turbojpeg-static.lib: 34efadab9c45a4be93bb62e415b7bd5b -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt deleted file mode 100644 index bf51a89e..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/8f06876bcdec0570dded47fecf362dd95832bd6e/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582282336 -conaninfo.txt: 99d4bfcf4fe5b33346747d9aed5a90dd -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/libjpeg.a: 520fd96afa81fffa67fbccc2d7499459 -lib/libturbojpeg.a: 65c525625f9bdb0c9c93b3cae93116f1 -lib/pkgconfig/libjpeg.pc: 9088ad9e74b2b56826bc949805312370 -lib/pkgconfig/libturbojpeg.pc: 176a550708755ea935a3928dcc75bb0c -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt deleted file mode 100644 index 4a4b3386..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/9b721b63e452039565ba8417e25a183d1bbcb4df/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582281572 -conaninfo.txt: 9868d7ba246ae96d18441c975ee816f1 -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: fb149794dc225dcb890e1b2c48569660 -lib/pkgconfig/libjpeg.pc: 16468bac09adeea126c41a7e2eab161f -lib/pkgconfig/libturbojpeg.pc: 6bad484e5ee764e95e570110855d00c8 -lib/turbojpeg-static.lib: 12e129d91c4f92257c7b12d88a0ccd3b -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 diff --git a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt b/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt deleted file mode 100644 index 53b1b8b3..00000000 --- a/coin/provisioning/common/windows/conan_manifests/libjpeg-turbo/2.0.3/qtproject/stable/package/acb703d92685c00a6f85ed3ca8225725f0e186c1/conanmanifest.txt +++ /dev/null @@ -1,12 +0,0 @@ -1582280641 -conaninfo.txt: d0e67ef7124b3767bbd5cebd7e4bf806 -include/jconfig.h: 36405c50a3b1509877826e26eac4fb69 -include/jerror.h: 9b7898fe417de269b8be88b10df908b0 -include/jmorecfg.h: 7873b0a4457d21a746e23c16fc16127d -include/jpeglib.h: 49b0829e2b84fcd4a0cee359199499cb -include/turbojpeg.h: b5b3a4a233ea12d2041ad1d1c971e6a0 -lib/jpeg-static.lib: 50b078fedbf48e2accf55cc1201717d8 -lib/pkgconfig/libjpeg.pc: ef1839c5639ee60768584c29626db8b1 -lib/pkgconfig/libturbojpeg.pc: 53423ccf67af6cc13cc571dd1e7568e0 -lib/turbojpeg-static.lib: c3f43cb91de65238d38bee7051671eff -licenses/LICENSE.md: 2a423a921d0f68082c80ccc7ad808ef2 -- cgit v1.2.3