Commit Graph

157 Commits

Author SHA1 Message Date
Allan Sandfeld Jensen
349d3e1a2f Fix SetEnvVar for Debian
Change-Id: I4152575cc071ea7f51e102a3807b05ed9f89d2fd
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 14f7603e91)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-07-06 06:41:47 +00:00
Piotr Wierciński
2a9e989c97 wasm: update emscripten to 3.1.37
Qt 6.6 will require emscripten 3.1.37

Change-Id: I24d172b9ba055c690274a99af109b50cd2f79b88
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
(cherry picked from commit 13c53ef79f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-27 10:12:17 +00:00
Assam Boudjelthia
9075653904 Coin:Android: unify and update OpenSSL provisioning scripts
Use the same prebuilt pacakges for all platforms since the prebuilt libs
are going to be used for the target and they are not tied to the host.

Task-number: QTBUG-110025
Change-Id: I2c79722989902b16883b31cbc6e140855239fcc8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 4e59702b14)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-06-27 10:12:15 +00:00
Alexey Edelev
e1b7e865ec Disable openssl for ffmpeg library
Openssl library causes backward compatibility issues. We need to disable
it to make ffmpegmediaplugin work on all supported linux platforms.

Fixes: QTBUG-113324
Pick-to: 6.5 6.5.1
Change-Id: Ib266e2cf67e9336fb206735b8b2418fccd8f7b00
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-05-20 03:20:04 +02:00
Samuel Mira
99afe7199e Fix FFmpeg provisioning for Android in arm64, x86 and x86_64
Added install-ffmpeg-android script for the android cross-compile
Removed android stuff from install-ffmpeg
Changed the yaml variables to include the target arch
Added the arm64 target arch

Task-number: QTQAINFRA-5476
Pick-to: 6.5
Change-Id: Id9609ed0427f2fc42f7f27e7787a81ad145f59be
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-04-26 22:44:30 +00:00
Artem Dyomin
aed030bb90 Update ffmpeg version to n6.0
Checked the basic functionality on macOS, linux, and windows.
To be tested in detail.

Pick-to: 6.5
Change-Id: I109f52ab33d58088332a3885c83d622815edd22e
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-04-15 18:10:47 +00:00
Heikki Halmet
2345f01c58 Provisioning: Use cached emsdk version 3.1.25 for unix
Task-number: QTQAINFRA-5458
Pick-to: 6.5
Change-Id: Ie9a38a38175cfd03ff15a886a5cd1621ae5ced36
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-04-13 05:08:01 +00:00
Artem Dyomin
9b88e24d71 Enable network support for FFmpeg
This patch configures FFmpeg with network support. This enables QtMM
to handle network source such as HTTP, HTTPS, or RTSP.
Details:
- on macOS and windows ffmpeg uses native security backend so we don't
  include openssl to the build. Additional patch for linking
  with the security backend is in QtMM commit under the same task.
- on linux we add openssl; for all CI linux platforms libssl-dev is
  installed.

Task-number: QTBUG-110708
Pick-to: 6.5
Change-Id: I80a7dfda702c4d554df3a7380aac642890a28b94
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-03-12 15:59:17 +00:00
Alexey Edelev
e68f9a28a8 Ensure that protobuf and gRPC libraries are build with -fPIC/PIE
Need to build protobuf and gRPC libraries with PIC/PIE to make them
compatible with Qt libraries and executables that are build with
PIC PIE.

Change-Id: Ie830f359e9e0fa15af65b96330edbf7f3f52df9b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Konrad Kujawa <konrad.kujawa@qt.io>
2023-03-02 11:51:09 +01:00
Samuel Mira
b9c2512748 Enable ffmpeg for Android
After ffmpeg was removed on Android targets following QTBUG-110172,
this patch enables it after fixing the failing test.

Task-number: QTBUG-110453
Pick-to: 6.4 6.5
Change-Id: I5598a9b72d06af6664455e933129a08192afac15
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-02-12 11:57:33 +00:00
Heikki Halmet
64b24b0d85 Replace Ubuntu 20.04 with Ubuntu 22.04
Libclang version is built with Ubuntu 22.04 on it, others still
keep old one which is built with Ubuntu 20.04.

Pick-to: 6.5
Task-number: QTQAINFRA-4926
Change-Id: I47bb49c1efecab6863ae52d3acf7eb47bdc47c35
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2023-02-11 07:13:02 +00:00
Konrad Kujawa
5a1ed71917 Set OPENSSL_ROOT_DIR for gRPC unix provisioning script
Pick-to: 6.5
Change-Id: I44fb0f94f183ddc10399c331e8e1a38c533dcf0d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-02-10 06:21:57 +01:00
Artem Dyomin
e5cf7b2d58 Fix missing ffmpeg for desktop Linux CI platforms
What's done:
- ffmpeg build added to OpenSuse platforms
- installing of yasm moved to packages install file in
  order to get rid of OS checkings

Pick-to: 6.5
Change-Id: I256f19a03e7f01d27923b083b63d9a6b6a5f29b4
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-01-24 09:22:06 +00:00
Heikki Halmet
f01a4281d6 Fix path of OPENSSL_ANDROID_HOME
Change-Id: I910cc6695381d870d21b5775d19a76db2d19cf73
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 70405cddba)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-24 05:46:58 +00:00
Heikki Halmet
f4db2c77a3 Add OpenSSL to the PATH for linux targets
This is required by QtApplicationmanager with openSUSE target

Change-Id: Ia27353d56c162461eb7f38700cd0ea56cce16e6b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 6f1b182a6d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-01-21 18:06:41 +00:00
Artem Dyomin
0f8eccdfc5 Update ffmpeg version to 5.1 for desktop platforms
Some issues have been fixed in ffmpeg 5.1, e.g, with videotoolbox.
So the update at least fixes our playback
of some video formats on macos, e.g. provided in the related bug.

After the update I tested the basic functionality on windows,
linux, macOS, and run CI tests, which are OK.

Task-number: QTBUG-98102
Pick-to: 6.5 6.4
Change-Id: I72f45780e1c3983d6a1941db2b833b78784b90de
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-01-16 22:15:16 +01:00
Samuel Mira
f412e6f1d1 Provision FFmpeg library for Android
Pick-to: 6.4 6.5
Fixes: QTBUG-100474
Change-Id: I5cc6f645bd020628bc6a77d4a5d42575f4fcf979
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-01-11 09:48:20 +02:00
Heikki Halmet
68a7947e42 Start using OpenSSL 3.0.7 in CI
Task-number: QTQAINFRA-4889
Change-Id: I3e335395762710d520ca93a5996d1b21d202ed4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vladimir Minenko <vladimir.minenko@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-01-10 05:50:29 +00:00
Morten Sørvig
1d77e42542 wasm: update emscripten to 3.1.25
Qt 6.5 will require emscripten 3.1.25

Change-Id: I23e0d0b6951a4d69aa431710114ec2c06f7afcc3
Reviewed-by: Aleksandr Reviakin <aleksandr.reviakin@qt.io>
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2022-12-28 10:22:38 +00:00
Heikki Halmet
5880c423c8 Add RHEL 9 to CI
This will replace RHEL 8

Task-number: QTQAINFRA-5111
Change-Id: Ib65e9b7a2afa85418d5113261bc83ba915b2bce0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2022-12-23 17:45:40 +00:00
Konrad Kujawa
63d72293b7 Add provisioning for gRPC
Add provisioning scripts to install gRPC.
gRPC is requirement to build QtGrpc

Task-number: QTBUG-105492
Change-Id: I1a6d008a1d2c1616000909aacdb721401f706168
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-12-07 07:57:21 +01:00
Alexey Edelev
c32a843766 Bump macOS minimum deployment target to 11 for 3rd party dependencies
3rd party dependencies should be built using the same minimum deployment
target as Qt uses for compatibility.

Change-Id: I2edb2c19b90757898f6dcb76ad60602ae2249ebc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2022-11-29 11:32:13 +01:00
Alexey Edelev
76a44df841 Adjust CMAKE_OSX_DEPLOYMENT_TARGET for protobuf package across MacOS platforms
Change-Id: Ie9f1b2273c437016fd51173e330a5df4cc924ebc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-25 09:50:46 +01:00
Konrad Kujawa
2034c71953 Update Protobuf to 21.9 version
Change-Id: Ia25251b87ea993f47046b9cfff3d0b024b57277f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2022-11-23 09:14:04 +01:00
Luca Di Sera
487c92a3d0 Update QDoc libclang to 15.0.0
The `libclang_version` variable is now updated to the current version, 15.0.0,
in both "coin/provisioning/common/unix/libclang.sh" and
"coin/provisioning/common/windows/libclang.ps1".

The naming of the artifacts for the provided library was slightly
changed from previous versions.

Before, the version number would contain two integers separated by a
dot.
The generated artifact would be named after this version number, with
the dot removed.

That is, for example, for version 12.0, a release artifact would be
called "libclang-release_120.*".

The updated two version uses a three segments version number and,
furthermore, the artifacts name do not collapse the separating dots such
that a release artifact would be called "libclang-release_15.0.0.*".

To support the new naming scheme, some processing was removed from both
provisioning scripts.

For Windows, the line removing all dots from the `libclang_version`
variable was removed.

For Unix, the removal of the dots in the `libclang_version`
variable when expanding the variable to generate the target urls to
retrieve the artifact was removed, using the bare value of the variable
itself.

For Unix provisioning, the artifacts for some of the platform, namely
"CentOS" and "Ubuntu 22.04", are not provided anymore.

"CentOS" was replaced by "Rhel8.4" on "gcc10.0", hence the target url
for the redhat platform was modified based on the new name.

The "Ubuntu 22.04" artifacts were not provided, such that the platform
was removed.

The sha1 of the target artifacts on both provisioning script was updated
for all platforms.

Task-number: QTBUG-107199
Pick-to: 6.4
Change-Id: I873680825b0953e897c610fb0b47f3cd90625646
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2022-11-17 20:20:33 +01:00
David Skoland
4a6f43ed8d wasm: Add actual emscripten installation to path in coin
I'm not sure where the emscripten-$version came from, maybe that's
how it used to be? In any case, in the current version (3.1.x),
the installation folder is in upstream/emscripten, so add PATH
there to access all emscripten utils.

Pick-to: 6.4
Change-Id: I648feae21bc5caecc3f0bf0a7d16238680a85590
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-11-09 07:08:15 +01:00
Heikki Halmet
1a91aa20ac Provisioning: Fix for checking the installed Android openssl version
Pick-to: 6.4
Change-Id: I2b180772da0e16aa69c7044eacc9c8ee617c6217
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-11-02 07:06:24 +00:00
Matti Paaso
936ede45de Update Android NDK to version r25b
Update NDK to version r25b and prebuilt openssl 1.1.1m built with
it. Change log: https://github.com/android/ndk/wiki/Changelog-r25

Task-number: QTBUG-105397
Change-Id: I501f43066e7ba8af8a57efdbee6c4a625bb80852
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-10-17 19:47:10 +03:00
Heikki Halmet
9255466d9f Provisioning: Use OpenSSL 3 version with Red Hat 9
OpenSSL 3 is default version when installing OpenSSL with yum. We need
to use OpenSSL 3 also with Android

Change-Id: If283c68d00d9a41131044fe245b5e84b39fd4744
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-10-11 17:16:18 +03:00
Heikki Halmet
8a72b1de99 Support multiple Android NDK versions
We need to verify latest Android NDK version in all
Qt6 branches and we need to retain the NDK version we
had when the specific branch was released at the first time.

Verification of the latest NDK will be done during integrations
in 'dev' branch and with older brances it will be done using
nightly build targets

Task-number: QTQAINFRA-4990
Change-Id: I2a96e419d403820f55f4244230c28ad09dc9095b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-09-20 10:30:05 +03:00
Heikki Halmet
911505cd37 Provisioning: Fix Protobuf installation for Ubuntu 22.04
Cmake environment variable need to be read from .bash_profile
(or .bashrc) instead of .profile with Ubuntu 22.04

Change-Id: Ic0589666e48946ba05366304407a0e5824b27a2c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2022-09-20 07:30:03 +00:00
Alexey Edelev
134c07923c Rename protobuf provisioning scripts
Use correct protobuf project name for provisioning scripts.
This also should trigger provisioning for all the involved platforms.

Change-Id: I4cfa74c1d41f497db528ee3ae152db1d51de821a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2022-09-08 10:27:57 +02:00
Alexey Edelev
ad84c5cb8a Update protobuf provisioning scripts
Enable protobuf provisioning for all linux platforms, since it's
required to build qtbase with protobuf support.

Delete install_protobuff for macos 10.14 since it's not used and
wouldn't build without special casing.

Change-Id: I9c7dea876c45dbcbfc3110b106ae683bbe9179ec
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-09-08 10:27:54 +02:00
Johanna Äijälä
6754cb362a Provisioning: update Squish 7.0.1
Update Squish to 7.0.1, include versions with Qt6.3 and 6.2 support.

Pick-to: 6.4
Pick-to: 6.3
Change-Id: I2bd7cd51a41befdbf2ef242eb72c2c2add84f733
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-09-04 07:04:51 +03:00
Tor Arne Vestbø
ffd7bc3bd7 coin: Prepare for removing macOS 10.14 as a supported deployment target
Change-Id: I9fcee3df2d9bfeb8f920df8a30e3e1b556874fd4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-08-28 23:01:28 +00:00
Heikki Halmet
73234745bb Add Ubuntu 22.04 to Nightly CI
Targets will be non-blocking and only in nightly run for now

Task-number: QTQAINFRA-4926
Change-Id: I7b229c1ccc34da4f1843dac3c25e19f7df819489
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-08-23 07:56:38 +03:00
Simo Fält
e8495fc86e Add wrapper for sccache command in Linux and macOS
The sccache tends to fail every now and then. Adding a wrapper
which calls build tools directly if first call with sccacche fails.

Task-number: COIN-740
Pick-to: 6.2 6.3 6.4
Change-Id: Ic03cf991da585d1569387118183763497ea73b72
Reviewed-by: Toni Saario <toni.saario@qt.io>
2022-08-12 07:45:00 +00:00
Piotr Srebrny
51c663d171 Build static FFmpeg library on macOS
This patch modifies linux/ffmpeg-install.sh to work also for macOS.
The FFmpeg libraries are installed under /usr/local both for Linux
and macOS.

Since macOS x64 does not have the lzma lib for arm64 architecture
installed by default, I disable this libraries for FFmpeg. This
only affects the TIFF image decoder that we do not use.

Added the execute permission to the ubuntu scripts.

Change-Id: Ib8623c6a9bcdd24c89045ede0494839fb9cd2ecc
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-07-28 09:56:16 +02:00
Lorn Potter
b6b127c2d9 wasm: update emscripten version to 3.1.10
Qt 6.4.0 will require emscripten 3.1.10

Change-Id: I9411902674104aae8f4ba3b6af11e9956932d6b9
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-05-27 08:31:33 +10:00
Heikki Halmet
789c276431 Update NDK to r23b
This also fixes Android OpenSSL installation

NDK update will be added only to dev and 6.3 branches

Task-number: QTQAINFRA-4837
Change-Id: I1233217e71f345d30f3dec83d7477d3c6e3b6c2d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-04-12 11:45:04 +00:00
Morten Johan Sørvig
53493a2351 wasm: upgrade emsdk version to 3.1.6
3.0.0 has a critical bug which can cause linking failures
(see QTBUG-101267). Update to the most recent version
where the bug has been fixed.

Task-number: QTBUG-101267
Pick-to: 6.3
Change-Id: Ib2e6abb72eb50b77db63175bbbf4a88b5e3c3920
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2022-03-12 16:10:12 +00:00
Johanna Äijälä
b3cd29e56f Provisioning: Squish 6.7.2
Update Squish packages to 6.7.2.

Pick-to: 6.3
Pick-to: 6.2
Change-Id: Id16b6337ff779eb21e1bd421ac46c57ad183dde2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-02-19 09:03:44 +02:00
Heikki Halmet
8732165461 Provisioning: Update OpenSSL to version 1.1.1m
Pick-to: 6.3
Pick-to: 6.2
Pick-to: 5.15
Change-Id: I93702b9faac5abc9fc01a5725cf34a17a94f0bea
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2022-02-05 15:59:17 +02:00
Kai Köhne
becb423e80 Replace LGPL2.1 only header with LGPL3 one
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Pick-to: 6.3
Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-19 19:47:15 +00:00
Morten Johan Sørvig
6f1ef4d3f6 Provisioning: Update emsdk to 3.0.0
emsdk 3.0.0 is the minimum/recommended version for
Qt 6.3.

The python/node/jre versions appear to be unchanged.
Remove the unused versionTag variable.

Change-Id: Ic7b72691295040f899a22c54066b0aea3995cd7a
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2021-12-09 07:56:50 +01:00
Heikki Halmet
7184b6b7b0 Provisioning: Install emsdk using emsdk.git
This will reduce the manual work when updating emsdk version
This requires also python certificates to be installed

Pick-to: 6.2
Change-Id: Id33d73f67f3312a27e9660522e7ca7ce17a89dbc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-04 12:36:10 +02:00
Toni Saario
dfa50ed7c3 Set Conan V2 mode
V2 mode causes conan to raise error when an feature that is being
deprecated in conan V2 is used. This allows maintaining V2 compatibility.

Pick-to: 6.2
Change-Id: I9c0cb70ce3a194966594d48433763e5423e187f1
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Allan Sandfeld Jensen
83b4afd584 Add python3 html5lib
Needed for qtwebengine in 6.3

Change-Id: I6dc941fabe4e28e3dce19db8f7812be034be8586
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-20 11:13:09 +01:00
Ville-Pekka Karhu
7e2882d0a7 Provisioning: Add macOS Monterey (12) x86 to CI
This will also upgrade Xcode to version 13.1

Task-number: QTQAINFRA-4508
Pick-to: 6.2
Change-Id: Idce56d429b4cd8c7eea3b75e8d91d2f281c0c871
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-11-16 14:52:03 +02:00
Assam Boudjelthia
d59825d250 Coin:Android: set ANDROID_SDK_ROOT explicitly
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Pick-to: 6.2
Task-number: QTBUG-97002
Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-10-22 09:14:29 +02:00