Skip to content
This repository was archived by the owner on Nov 11, 2025. It is now read-only.

Commit 6846f0b

Browse files
committed
qt682, qgis 3.40.4, gdal 3.10.2
1 parent 076d8a7 commit 6846f0b

File tree

18 files changed

+79
-47
lines changed

18 files changed

+79
-47
lines changed

.github/workflows/android.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ jobs:
3434
QT_ARCH: 'android_arm64_v8a'
3535
ANDROID_ABI: 'arm64-v8a'
3636

37-
runs-on: macos-13
37+
runs-on: macos-15
3838
env: # update README for devs if you modify these env. variables
39-
QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
39+
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
4040
ANDROIDAPI: 24
4141
NDK_VERSION: '25.1.8937393'
4242
NDK_VERSION_FULL: r25b
4343
JDK_VERSION: 11
4444
SDK_PLATFORM: android-33
4545
SDK_BUILD_TOOLS: 33.0.1
46-
XC_VERSION: ${{ '15.2' }}
46+
XC_VERSION: ${{ '16.2' }}
4747
CMAKE_VERSION: '3.29.0'
4848
VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
4949

@@ -97,7 +97,7 @@ jobs:
9797
uses: actions/cache/restore@v3
9898
with:
9999
path: ${{ github.workspace }}/Qt
100-
key: ${{ runner.os }}-QtCache-v15-${{ env.QT_VERSION }}-${{ matrix.QT_ARCH }}
100+
key: ${{ runner.os }}-QtCache-v0-${{ env.QT_VERSION }}-${{ matrix.QT_ARCH }}
101101

102102
- name: Install Qt
103103
if: steps.cache-qt-restore.outputs.cache-hit != 'true'

.github/workflows/ios.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ concurrency:
2424

2525
jobs:
2626
ios_build:
27-
runs-on: macos-13
27+
runs-on: macos-15
2828
env: # update README for devs if you modify these env. variables
29-
QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
29+
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
3030
TRIPLET: "arm64-ios"
3131
DEPLOYMENT_TARGET: '13.0' # iOS Deployment target
32-
XC_VERSION: ${{ '15.2' }}
32+
XC_VERSION: ${{ '16.2' }}
3333
QT_ARCH: "ios"
3434
CMAKE_VERSION: '3.29.0'
3535
VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
@@ -65,7 +65,7 @@ jobs:
6565
uses: actions/cache/restore@v3
6666
with:
6767
path: ${{ github.workspace }}/Qt
68-
key: ${{ runner.os }}-QtCache-v20-${{ env.QT_VERSION }}-ios
68+
key: ${{ runner.os }}-QtCache-v0-${{ env.QT_VERSION }}-ios
6969

7070
- name: Install Qt
7171
if: steps.cache-qt-restore.outputs.cache-hit != 'true'

.github/workflows/linux.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ubuntu-22.04
2828

2929
env: # update README for devs if you modify these env. variables
30-
QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
30+
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
3131
TRIPLET: "x64-linux"
3232
QT_ARCH: "desktop"
3333
CMAKE_VERSION: '3.29.0'
@@ -68,7 +68,7 @@ jobs:
6868
modules: 'qtsensors qtconnectivity qt5compat qtmultimedia qtpositioning qtshadertools'
6969
dir: ${{ github.workspace }}
7070
cache: true
71-
cache-key-prefix: ${{ runner.os }}-QtCache-v2-${{ env.QT_VERSION }}-lnx
71+
cache-key-prefix: ${{ runner.os }}-QtCache-v0-${{ env.QT_VERSION }}-lnx
7272

7373
- name: Get vcpkg
7474
shell: bash

.github/workflows/mac.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: macos-13
2727

2828
env: # update README for devs if you modify these env. variables
29-
QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
29+
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
3030
TRIPLET: "x64-osx"
3131
DEPLOYMENT_TARGET: "10.15.0"
3232
XC_VERSION: ${{ '15.2' }}
@@ -60,7 +60,7 @@ jobs:
6060
dir: ${{ github.workspace }}
6161
modules: 'qtsensors qtconnectivity qt5compat qtmultimedia qtpositioning qtshadertools'
6262
cache: true
63-
cache-key-prefix: ${{ runner.os }}-QtCache-v1-${{ env.QT_VERSION }}-mac
63+
cache-key-prefix: ${{ runner.os }}-QtCache-v0-${{ env.QT_VERSION }}-mac
6464

6565
- name: Setup compiler
6666
uses: maxim-lobanov/setup-xcode@v1

.github/workflows/mac_arm64.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ concurrency:
2323

2424
jobs:
2525
mac_os_build:
26-
runs-on: macos-14
26+
runs-on: macos-15
2727

2828
env: # update README for devs if you modify these env. variables
29-
QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
29+
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
3030
TRIPLET: "arm64-osx"
31-
DEPLOYMENT_TARGET: "10.15.0"
32-
XC_VERSION: ${{ '15.2' }}
31+
DEPLOYMENT_TARGET: "12.0" # arm64 only
32+
XC_VERSION: ${{ '16.2' }}
3333
CMAKE_VERSION: '3.29.0'
3434
QT_ARCH: "desktop"
3535
VCPKG_ROOT: "${{ github.workspace }}/vcpkg"
@@ -59,7 +59,7 @@ jobs:
5959
dir: ${{ github.workspace }}
6060
modules: 'qtsensors qtconnectivity qt5compat qtmultimedia qtpositioning qtshadertools'
6161
cache: true
62-
cache-key-prefix: ${{ runner.os }}-QtCache-v1-${{ env.QT_VERSION }}-mac-arm64
62+
cache-key-prefix: ${{ runner.os }}-QtCache-v0-${{ env.QT_VERSION }}-mac-arm64
6363

6464
- name: Setup compiler
6565
uses: maxim-lobanov/setup-xcode@v1

.github/workflows/win.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: windows-2019
2828

2929
env: # update README for devs if you modify these env. variables
30-
QT_VERSION: '6.6.3' # use scripts/update_qt_version.bash to change
30+
QT_VERSION: '6.8.2' # use scripts/update_qt_version.bash to change
3131
TRIPLET: "x64-windows"
3232
VS_VERSION: "2019"
3333
CMAKE_GENERATOR: "Visual Studio 16 2019" # see https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md
@@ -63,7 +63,7 @@ jobs:
6363
dir: ${{ github.workspace }}
6464
modules: 'qtsensors qtconnectivity qt5compat qtmultimedia qtpositioning qtshadertools'
6565
cache: true
66-
cache-key-prefix: ${{ runner.os }}-QtCache-v1-${{ env.QT_VERSION }}-win
66+
cache-key-prefix: ${{ runner.os }}-QtCache-v0-${{ env.QT_VERSION }}-win
6767

6868
- name: Get vcpkg
6969
shell: bash

README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[![Build win64](https://github.com/MerginMaps/mobile-sdk/actions/workflows/win.yml/badge.svg)](https://github.com/MerginMaps/mobile-sdk/actions/workflows/win.yml)
1+
[![Build win64](https://github.com/MerginMaps/mobile-sdk/actions/workflows/win.yml/badge.svg)](https://github.com/MerginMaps/mobile-sdk/actions/workflows/win.yml)
22
[![Build macOS](https://github.com/merginmaps/mobile-sdk/actions/workflows/mac.yml/badge.svg)](https://github.com/merginmaps/mobile-sdk/actions/workflows/mac.yml)
33
[![Build macOS arm64](https://github.com/merginmaps/mobile-sdk/actions/workflows/mac_arm64.yml/badge.svg)](https://github.com/merginmaps/mobile-sdk/actions/workflows/mac_arm64.yml)
44
[![Build iOS](https://github.com/merginmaps/mobile-sdk/actions/workflows/ios.yml/badge.svg)](https://github.com/merginmaps/mobile-sdk/actions/workflows/ios.yml)
@@ -83,7 +83,7 @@ The release is automatically created for each commit on master for each triplet
8383
8484
export PATH=$(brew --prefix flex):$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
8585
export PATH=`pwd`/../vcpkg:$PATH;\
86-
export Qt6_DIR=/opt/Qt/6.6.3/android_arm64_v8a;export QT_HOST_PATH=/opt/Qt/6.6.3/macos;\
86+
export Qt6_DIR=/opt/Qt/6.8.2/android_arm64_v8a;export QT_HOST_PATH=/opt/Qt/6.8.2/macos;\
8787
export ANDROIDAPI=24;\
8888
export ANDROID_NDK_HOME='/opt/Android/android-sdk/ndk/25.1.8937393';\
8989
export ANDROID_NDK_ROOT='/opt/Android/android-sdk/ndk/25.1.8937393';\
@@ -127,8 +127,8 @@ Note that this sdk application is dummy on this target and cannot be executed on
127127
128128
export PATH=$(brew --prefix flex):$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
129129
export PATH=`pwd`/../vcpkg:$PATH;\
130-
export Qt6_DIR=/opt/Qt/6.6.3/android_armv7;\
131-
export QT_HOST_PATH=/opt/Qt/6.6.3/macos;\
130+
export Qt6_DIR=/opt/Qt/6.8.2/android_armv7;\
131+
export QT_HOST_PATH=/opt/Qt/6.8.2/macos;\
132132
export ANDROIDAPI=24;\
133133
export ANDROID_NDK_HOME='/opt/Android/android-sdk/ndk/25.1.8937393';\
134134
export ANDROID_NDK_ROOT='/opt/Android/android-sdk/ndk/25.1.8937393';\
@@ -172,8 +172,8 @@ Note that this sdk application is dummy on this target and cannot be executed on
172172
173173
export PATH=$(brew --prefix flex)/bin:$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
174174
export PATH=${PWD}/../vcpkg:$PATH;\
175-
export Qt6_DIR=/opt/Qt/6.6.3/ios;\
176-
export QT_HOST_PATH=/opt/Qt/6.6.3/macos;\
175+
export Qt6_DIR=/opt/Qt/6.8.2/ios;\
176+
export QT_HOST_PATH=/opt/Qt/6.8.2/macos;\
177177
export DEPLOYMENT_TARGET=14.0;
178178
179179
cmake -B . -S ../../mobile-sdk/ \
@@ -206,7 +206,7 @@ set ROOT_DIR=C:\Users\Peter\repo
206206
set BUILD_DIR=%ROOT_DIR%\build-sdk\win64
207207
set SOURCE_DIR=%ROOT_DIR%\mobile-sdk
208208
set VCPKG_ROOT=%ROOT_DIR%\vcpkg
209-
set Qt6_DIR=C:\Qt\6.6.3\msvc2019_64
209+
set Qt6_DIR=C:\Qt\6.8.2\msvc2019_64
210210
set PATH=%VCPKG_ROOT%;%QT_ROOT%\bin;C:\Program Files\CMake\bin\;%PATH%
211211
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\Tools\VsDevCmd.bat" -arch=x64
212212
```
@@ -238,7 +238,7 @@ cmake --build %BUILD_DIR% --config Release --verbose
238238
239239
export PATH=$(brew --prefix flex)/bin:$(brew --prefix bison)/bin:$(brew --prefix gettext)/bin:$PATH;\
240240
export PATH=${PWD}/../vcpkg:$PATH;\
241-
export Qt6_DIR=/opt/Qt/6.6.3/macos;\
241+
export Qt6_DIR=/opt/Qt/6.8.2/macos;\
242242
export DEPLOYMENT_TARGET=10.15.0
243243
244244
cmake -B . -S ../../mobile-sdk/ \
@@ -265,7 +265,7 @@ cmake --build %BUILD_DIR% --config Release --verbose
265265
cd build/x64-linux
266266
267267
export PATH=${PWD}/../vcpkg:$PATH
268-
export Qt6_DIR=~/Qt/6.6.3/gcc_64
268+
export Qt6_DIR=~/Qt/6.8.2/gcc_64
269269
270270
cmake -B . -S ../../mobile-sdk/ \
271271
-DCMAKE_TOOLCHAIN_FILE=../vcpkg/scripts/buildsystems/vcpkg.cmake \

VCPKG_BASELINE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
fba75d09065fcc76a25dcf386b1d00d33f5175af
1+
d5ec528843d29e3a52d745a64b469f810b2cedbf

vcpkg-overlay/ports/gdal/cmake-project-include.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
if(GDAL_USE_KEA)
2+
find_package(Kealib CONFIG REQUIRED)
3+
add_library(KEA::KEA ALIAS Kealib::Kealib)
4+
set(GDAL_CHECK_PACKAGE_KEA_NAMES Kealib CACHE INTERNAL "vcpkg")
5+
set(GDAL_CHECK_PACKAGE_KEA_TARGETS Kealib::Kealib CACHE INTERNAL "vcpkg")
6+
endif()
7+
18
if(GDAL_USE_WEBP)
29
find_package(WebP CONFIG REQUIRED)
310
add_library(WEBP::WebP ALIAS WebP::webp)

vcpkg-overlay/ports/gdal/find-link-libraries.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ index c697484..6e83222 100644
2929
if(PKG_CONFIG_FOUND)
3030
- pkg_check_modules(PC_OPENJPEG QUIET libopenjp2)
3131
+ pkg_check_modules(PC_OPENJPEG QUIET IMPORTED_TARGET libopenjp2)
32-
set(OPENJPEG_VERSION_STRING ${PC_OPENJPEG_VERSION})
32+
set(OpenJPEG_VERSION_STRING ${PC_OPENJPEG_VERSION})
3333
endif()
3434
+if(PC_OPENJPEG_FOUND)
3535
+ set(OPENJPEG_INCLUDE_DIR "${PC_OPENJPEG_INCLUDE_DIRS}" CACHE STRING "")

0 commit comments

Comments
 (0)