Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vcpkg, remove a couple of overlay #4974

Merged
merged 4 commits into from
Jan 21, 2024
Merged

Update vcpkg, remove a couple of overlay #4974

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c938dd
Update vcpkg, remove a couple of overlay
nirvn Jan 20, 2024
4bceff0
Setup python for ios builds
m-kuhn Jan 20, 2024
0f2bf5e
Update .github/workflows/ios.yml
m-kuhn Jan 21, 2024
89de482
Remove qtpositioning and qtserialport overlays
m-kuhn Jan 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# CMake settings
cmake_minimum_required(VERSION 3.19)

set(VCPKG_TAG f1c6efee2245009540dde947e0e3d008f3aa7dbb)
set(VCPKG_TAG 91b17dd72add5718332e9a2bf55497e2b126b0a0)

set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/src/qml/imports CACHE PATH "QML import path for Qt Creator to detect custom modules properly")

Expand Down
27 changes: 0 additions & 27 deletions vcpkg/overlay/ffmpeg/0001-create-lib-libraries.patch
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions vcpkg/overlay/ffmpeg/0002-fix-msvc-link.patch
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions vcpkg/overlay/ffmpeg/0003-fix-windowsinclude.patch
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions vcpkg/overlay/ffmpeg/0004-fix-debug-build.patch
View file
Open in desktop

This file was deleted.

55 changes: 0 additions & 55 deletions vcpkg/overlay/ffmpeg/0005-fix-nasm.patch
View file
Open in desktop

This file was deleted.

49 changes: 0 additions & 49 deletions vcpkg/overlay/ffmpeg/0006-fix-StaticFeatures.patch
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions vcpkg/overlay/ffmpeg/0007-fix-lib-naming.patch
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions vcpkg/overlay/ffmpeg/0009-Fix-fdk-detection.patch
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions vcpkg/overlay/ffmpeg/0011-Fix-x265-detection.patch
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions vcpkg/overlay/ffmpeg/0012-Fix-ssl-110-detection.patch
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions vcpkg/overlay/ffmpeg/0013-define-WINVER.patch
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions vcpkg/overlay/ffmpeg/0015-Fix-xml2-detection.patch
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions vcpkg/overlay/ffmpeg/0020-fix-aarch64-libswscale.patch
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions vcpkg/overlay/ffmpeg/0022-fix-iconv.patch
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions vcpkg/overlay/ffmpeg/0023-fix-qsv-init.patch
View file
Open in desktop

This file was deleted.

Loading
Loading