diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-09-30 22:03:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-30 13:03:56 -0700 |
| commit | 35bfef708400cf882efb3e4df93045e0a06c9c23 (patch) | |
| tree | f507c664794ece69707f33aef7fc627d96acbed7 /ports/qtmultimedia | |
| parent | 8ad33ead9075cd8d6d357e0b870ba8d501efe35c (diff) | |
| download | vcpkg-35bfef708400cf882efb3e4df93045e0a06c9c23.tar.gz vcpkg-35bfef708400cf882efb3e4df93045e0a06c9c23.zip | |
[Qt 6.2] Update Qt6 to 6.2 (#18687)
* [qt6] Update to 6.1.1
* version stuff
* fix empty dir
* update version
* fix casing in qtbase
* [libpq] add secure32.lib on windows
* add clang-cl fix
* version stuff
* fix flag removal by adding a space
* version stuff
* make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q
* fix libpq wrapper opensll linkage on linux
* use policy to fix dependent ports
* version stuff
* use upstream patch
* version stuff
* fix source_location with clang-cl
* version stuff
* add all new modules
* add all modules to the qt port
* push all the ports
* fix patch
* update ports
* split qt_install_submodule into smaller functions
* add qlitehtml submodule to qttools
* update a few ports before moving to beta
* update vcpkg.json and refs and fix issue with update
* fix dependencies
* remove patch
* update to 6.2
* add nodejs to vcpkg_find_acquire_program for qtwebengine
* format manifest.
* fix webengine and see if it builds.
* apply format diff
* add patch
* fix arm builds
* fix linux gcc 7.5 build error
* fix patch
* bump version in qtbase otherwise CI seems to resuse the wrong version
* fix webengine release build
* try fixing gcc 7.5 build
* revert gcc 7.5 fixes since they broke osx
* revert gcc 7.5 fixes since they broke osx
* fix qtimageformats.
* actually enable new qt6 builds.
* fix search path for nodejs.
* fix the webengine patch again.
* fix wrong binary name
* revisit all dependencies
* revisit webengine features and build settings
* more feature stuff
* remove qt6betablock and more features review for qt 6.2
* add missing qt prefix.
* format manifest
* fix ci issues
* format manifest.
* add node on osx.
* install node on linux
* fix a typo and a disable another find_package
* fix mingw build issues and switch to not using tag
* use CMAKE_HOST_WIN32 instead
* update ref
* fix core configure error
* fix mingw case.
* fix script installation
* remove qmake helper scrpt
* delete debug folder if empty
* add vcpkg-tool-nodejs
* revert changes in the pipeline scripts
* adjust qtwebengine to the changes
* format manifest and revert doc changes
* fix message and logic
* fix hashes and make host only port
* fix hash again?
* qttools add linguist feature for crossbuilds
* fix dependency
* add thread and future to concurrent feature
* add assistant as a required host feature
(somebody should tell Qt not to do that)
* fix dependency.
* [skip ci] not a host dep?!?
* [skip ci] debuging
* [skip ci] more debug messages
* [skip ci] try always redownloading
* [skip ci] fix hash und skip hash for redownloading once
* [skip ci] comment out skip sha and redownload
* add vcpkg_fixup_pkgconfig to libvpx
* qtwebengine requires qml and quick
* fix manifest format
* qtwebengine does not support static builds!
* remove unnecessary parts of the patch
* update to beta2
* add some " and a message in update mode
* [skip ci] remove old and reorder patches
* [skip ci] add qtpaths6
* [skip actions] fix webengine patch
* [skip actions] fix a few submodule refs
* [skip actions] fix qtwebengine
* [skip actions] remove qml feature from webengine in qt metaport
* qtdeclarative raise minimum cmake version
* use the tree id instead?
* [skip actions] raise minimum cmake version in qtquick3d
* fix fetching of unadvertised commit ids
* revert changes to vcpkg_from_git
* revert doc changes
* [skip actions] use the new FETCH_REF
* [skip actiosn] remove raise of minimum version to retry with new cmake version
* [skip actions] update to beta3
* revert removal of patch
* update to beta4
remove qtquickcontrols2 deps
* fix missing \
* [skip actions] fix gstreamer feature on windows
* [skip actions]
remove outdated patches
format qtmultimedia
* [skip actions] update to rc1
* [skip actions] remove patch for now
* update refs
* [skip actions] comment patch to try another patch in qtmultimedia
* x86 is not supported by qtwebengine (at least one of its internal third party deps fails due to x64 intrinsics.)
* Finalize for 6.2 release.
Open issues: QtWebengine and cross builds.
* version stuff
* fix semver in qtquickcontrols.
* version stuff
* revise qtwebengine supports expression
* update version
Diffstat (limited to 'ports/qtmultimedia')
| -rw-r--r-- | ports/qtmultimedia/fix_windows_header_include.patch | 13 | ||||
| -rw-r--r-- | ports/qtmultimedia/portfile.cmake | 40 | ||||
| -rw-r--r-- | ports/qtmultimedia/vcpkg.json | 49 |
3 files changed, 102 insertions, 0 deletions
diff --git a/ports/qtmultimedia/fix_windows_header_include.patch b/ports/qtmultimedia/fix_windows_header_include.patch new file mode 100644 index 000000000..6e06e5c4a --- /dev/null +++ b/ports/qtmultimedia/fix_windows_header_include.patch @@ -0,0 +1,13 @@ +diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h +index 23e349e02..233a816d4 100644 +--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h ++++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h +@@ -56,7 +56,7 @@ + #include <qset.h>
+ #include <qaudio.h>
+ #include <qaudiodevice.h>
+-#include <windows.h>
++#include <QtCore/qt_windows.h>
+
+ struct IMMDeviceEnumerator;
+
diff --git a/ports/qtmultimedia/portfile.cmake b/ports/qtmultimedia/portfile.cmake new file mode 100644 index 000000000..35d706187 --- /dev/null +++ b/ports/qtmultimedia/portfile.cmake @@ -0,0 +1,40 @@ +set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase") +include("${SCRIPT_PATH}/qt_install_submodule.cmake") + +set(${PORT}_PATCHES fix_windows_header_include.patch) + +#Maybe TODO: ALSA + PulseAudio? (Missing Ports) + +# qt_find_package(ALSA PROVIDED_TARGETS ALSA::ALSA MODULE_NAME multimedia QMAKE_LIB alsa) +# qt_find_package(AVFoundation PROVIDED_TARGETS AVFoundation::AVFoundation MODULE_NAME multimedia QMAKE_LIB avfoundation) +# qt_find_package(WrapPulseAudio PROVIDED_TARGETS WrapPulseAudio::WrapPulseAudio MODULE_NAME multimedia QMAKE_LIB pulseaudio) +# qt_find_package(WMF PROVIDED_TARGETS WMF::WMF MODULE_NAME multimedia QMAKE_LIB wmf) + +# qt_configure_add_summary_section(NAME "Qt Multimedia") +# qt_configure_add_summary_entry(ARGS "alsa") +# qt_configure_add_summary_entry(ARGS "gstreamer_1_0") +# qt_configure_add_summary_entry(ARGS "linux_v4l") +# qt_configure_add_summary_entry(ARGS "pulseaudio") +# qt_configure_add_summary_entry(ARGS "mmrenderer") +# qt_configure_add_summary_entry(ARGS "avfoundation") +# qt_configure_add_summary_entry(ARGS "wmf") + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS +FEATURES +INVERTED_FEATURES + "qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick + "widgets" CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets + "gstreamer" CMAKE_DISABLE_FIND_PACKAGE_GStreamer +) + +if("gstreamer" IN_LIST FEATURES) + list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='yes'") +else() + list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'") +endif() + +qt_install_submodule(PATCHES ${${PORT}_PATCHES} + CONFIGURE_OPTIONS ${FEATURE_OPTIONS} + CONFIGURE_OPTIONS_RELEASE + CONFIGURE_OPTIONS_DEBUG + ) diff --git a/ports/qtmultimedia/vcpkg.json b/ports/qtmultimedia/vcpkg.json new file mode 100644 index 000000000..f354e57af --- /dev/null +++ b/ports/qtmultimedia/vcpkg.json @@ -0,0 +1,49 @@ +{ + "name": "qtmultimedia", + "version-semver": "6.2.0", + "description": "Qt Multimedia", + "homepage": "https://www.qt.io/", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "gui", + "network" + ] + } + ], + "default-features": [ + "widgets" + ], + "features": { + "gstreamer": { + "description": "Build with gstreamer", + "dependencies": [ + "angle", + "gstreamer" + ] + }, + "qml": { + "description": "Build QML imports", + "dependencies": [ + { + "name": "qtdeclarative", + "default-features": false + } + ] + }, + "widgets": { + "description": "Build Multimedia Widgets", + "dependencies": [ + { + "name": "qtbase", + "default-features": false, + "features": [ + "widgets" + ] + } + ] + } + } +} |
