From 5584bcc179d272976f09873b0a4f51ecf67fb756 Mon Sep 17 00:00:00 2001 From: Michal Duda Date: Sun, 12 May 2024 09:37:25 +0200 Subject: [PATCH] Components/2024 05 11 (#64) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 🏗Build: Components updated. - libjpeg 3.0.3 - libjxl v0.10.2 - libexpat R_2_6_2 * 🏗Build: GitHub Action for Windows updated to QT 6.7.0 * 🏗Build: GitHub Action for Mac updated macos-latest. * 🏗Build:kimageformats submodule updated to the c2fabef50190a9c2bf2dcbe851b0d39c9951d7f4. --- .github/workflows/macos-build.yml | 2 +- .github/workflows/win-build.yml | 2 +- build/cmake/ExternalProjectVersions.cmake | 6 +++--- components/kimageformats | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos-build.yml b/.github/workflows/macos-build.yml index becd64f..8efeca9 100644 --- a/.github/workflows/macos-build.yml +++ b/.github/workflows/macos-build.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: macos-13 + runs-on: macos-latest steps: - name: checkout diff --git a/.github/workflows/win-build.yml b/.github/workflows/win-build.yml index e525bcd..3044602 100644 --- a/.github/workflows/win-build.yml +++ b/.github/workflows/win-build.yml @@ -7,7 +7,7 @@ on: pull_request: env: - QT_VERSION: "6.6.2" + QT_VERSION: "6.7.0" MINGW_VERSION: "win64_msvc2019_64" BUILD_TYPE: Release artifact_retention_days: 5 diff --git a/build/cmake/ExternalProjectVersions.cmake b/build/cmake/ExternalProjectVersions.cmake index 7907a21..005123f 100644 --- a/build/cmake/ExternalProjectVersions.cmake +++ b/build/cmake/ExternalProjectVersions.cmake @@ -6,16 +6,16 @@ endfunction() if (APPLE OR WIN32) ADD_EP_VERSION(libexiv2 v0.28.2) - ADD_EP_VERSION(libjpeg-turbo 3.0.2) + ADD_EP_VERSION(libjpeg-turbo 3.0.3) ADD_EP_VERSION(libraw 0.21.2) ADD_EP_VERSION(brotli v1.1.0) ADD_EP_VERSION(highway 1.1.0) - ADD_EP_VERSION(libjxl v0.10.1) + ADD_EP_VERSION(libjxl v0.10.2) endif() if (WIN32) ADD_EP_VERSION(zlib v1.3.1) - ADD_EP_VERSION(libexpat R_2_6_1) + ADD_EP_VERSION(libexpat R_2_6_2) ADD_EP_VERSION(libde265 v1.0.15) ADD_EP_VERSION(libheif v1.17.6) endif() diff --git a/components/kimageformats b/components/kimageformats index 0710bc6..c2fabef 160000 --- a/components/kimageformats +++ b/components/kimageformats @@ -1 +1 @@ -Subproject commit 0710bc65f64b12d0536fedb8c5fff89b4009c439 +Subproject commit c2fabef50190a9c2bf2dcbe851b0d39c9951d7f4