diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk index 261fc5a..7f7bb16 100644 --- a/contrib/depends/packages/native_qt.mk +++ b/contrib/depends/packages/native_qt.mk @@ -1,9 +1,9 @@ package=native_qt -$(package)_version=6.8.2 +$(package)_version=6.8.3 $(package)_download_path=https://download.qt.io/official_releases/qt/6.8/$($(package)_version)/submodules $(package)_suffix=everywhere-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) -$(package)_sha256_hash=012043ce6d411e6e8a91fdc4e05e6bedcfa10fcb1347d3c33908f7fdd10dfe05 +$(package)_sha256_hash=56001b905601bb9023d399f3ba780d7fa940f3e4861e496a7c490331f49e0b80 $(package)_linux_dependencies=native_wayland $(package)_qt_libs=corelib network widgets gui plugins testlib $(package)_patches = dont_hardcode_pwd.patch @@ -14,19 +14,19 @@ $(package)_patches += rcc_hardcode_timestamp.patch $(package)_patches += root_CMakeLists.txt $(package)_qttools_file_name=qttools-$($(package)_suffix) -$(package)_qttools_sha256_hash=326381b7d43f07913612f291abc298ae79bd95382e2233abce982cff2b53d2c0 +$(package)_qttools_sha256_hash=02a4e219248b94f1333df843d25763f35251c1074cdc4fb5bda67d340f8c8b3a $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix) -$(package)_qtsvg_sha256_hash=aa2579f21ca66d19cbcf31d87e9067e07932635d36869c8239d4decd0a9dc1fa +$(package)_qtsvg_sha256_hash=35eb516460f00f264eb504baa253432384351cf23fb9980a5857190e8deef438 $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix) -$(package)_qtmultimedia_sha256_hash=34f561fdc07b158bcc4ad040b596fc6086c48908060e854b473b557e4feb1569 +$(package)_qtmultimedia_sha256_hash=32e82307d783172a3b984cc3c47c5e4e8b819cee3cbfc702c7012c47f15f6b01 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix) -$(package)_qtshadertools_sha256_hash=d1d5f90e8885fc70d63ac55a4ce4d9a2688562033a000bc4aff9320f5f551871 +$(package)_qtshadertools_sha256_hash=f6ec88bf42deba84d8f6b5d0914636ceed4749ccb51d1945b2f79b322b7ecf47 $(package)_qtwayland_file_name=qtwayland-$($(package)_suffix) -$(package)_qtwayland_sha256_hash=5e46157908295f2bf924462d8c0855b0508ba338ced9e810891fefa295dc9647 +$(package)_qtwayland_sha256_hash=20fe385887d21190165a3180c17dcfc8b9a0e1da4ec76865b6334bdc709994b0 $(package)_extra_sources += $($(package)_qttools_file_name) $(package)_extra_sources += $($(package)_qtsvg_file_name) diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk index c5bfe2b..5148fe0 100644 --- a/contrib/depends/packages/qt.mk +++ b/contrib/depends/packages/qt.mk @@ -1,9 +1,9 @@ package=qt -$(package)_version=6.8.2 +$(package)_version=6.8.3 $(package)_download_path=https://download.qt.io/official_releases/qt/6.8/$($(package)_version)/submodules $(package)_suffix=everywhere-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) -$(package)_sha256_hash=012043ce6d411e6e8a91fdc4e05e6bedcfa10fcb1347d3c33908f7fdd10dfe05 +$(package)_sha256_hash=56001b905601bb9023d399f3ba780d7fa940f3e4861e496a7c490331f49e0b80 $(package)_darwin_dependencies=openssl native_qt $(package)_mingw32_dependencies=openssl native_qt $(package)_linux_dependencies=openssl native_qt freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm libxcb_util_cursor dbus wayland native_wayland @@ -27,22 +27,22 @@ $(package)_patches += qtwayland-tabletevent-fix.patch #$(package)_patches += fix-static-fontconfig-static-linking.patch $(package)_qttools_file_name=qttools-$($(package)_suffix) -$(package)_qttools_sha256_hash=326381b7d43f07913612f291abc298ae79bd95382e2233abce982cff2b53d2c0 +$(package)_qttools_sha256_hash=02a4e219248b94f1333df843d25763f35251c1074cdc4fb5bda67d340f8c8b3a $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix) -$(package)_qtsvg_sha256_hash=aa2579f21ca66d19cbcf31d87e9067e07932635d36869c8239d4decd0a9dc1fa +$(package)_qtsvg_sha256_hash=35eb516460f00f264eb504baa253432384351cf23fb9980a5857190e8deef438 $(package)_qtwebsockets_file_name=qtwebsockets-$($(package)_suffix) -$(package)_qtwebsockets_sha256_hash=919df562ba3446c8393992d112085ad2d96d23aaf802b1cd7a30bf3ba2fe8cbe +$(package)_qtwebsockets_sha256_hash=fc6310c1b12d6e22a31062727aa6574ed69239d036c8a4247b3b089902709b11 $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix) -$(package)_qtmultimedia_sha256_hash=34f561fdc07b158bcc4ad040b596fc6086c48908060e854b473b557e4feb1569 +$(package)_qtmultimedia_sha256_hash=32e82307d783172a3b984cc3c47c5e4e8b819cee3cbfc702c7012c47f15f6b01 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix) -$(package)_qtshadertools_sha256_hash=d1d5f90e8885fc70d63ac55a4ce4d9a2688562033a000bc4aff9320f5f551871 +$(package)_qtshadertools_sha256_hash=f6ec88bf42deba84d8f6b5d0914636ceed4749ccb51d1945b2f79b322b7ecf47 $(package)_qtwayland_file_name=qtwayland-$($(package)_suffix) -$(package)_qtwayland_sha256_hash=5e46157908295f2bf924462d8c0855b0508ba338ced9e810891fefa295dc9647 +$(package)_qtwayland_sha256_hash=20fe385887d21190165a3180c17dcfc8b9a0e1da4ec76865b6334bdc709994b0 $(package)_extra_sources += $($(package)_qttools_file_name) $(package)_extra_sources += $($(package)_qtsvg_file_name) diff --git a/contrib/depends/patches/qt/v4l2.patch b/contrib/depends/patches/qt/v4l2.patch index 24a7bcf..4d7acb6 100644 --- a/contrib/depends/patches/qt/v4l2.patch +++ b/contrib/depends/patches/qt/v4l2.patch @@ -1,5 +1,5 @@ diff --git a/src/plugins/multimedia/CMakeLists.txt b/src/plugins/multimedia/CMakeLists.txt -index 5bc39c1f8..c74f2ff4c 100644 +index 5b163e98a..eac405570 100644 --- a/src/plugins/multimedia/CMakeLists.txt +++ b/src/plugins/multimedia/CMakeLists.txt @@ -2,7 +2,7 @@ @@ -976,7 +976,7 @@ index 000000000..95b069b64 +#endif // QFFMPEGMEDIAMETADATA_H diff --git a/src/plugins/multimedia/v4l2/qffmpegvideosink.cpp b/src/plugins/multimedia/v4l2/qffmpegvideosink.cpp new file mode 100644 -index 000000000..93e7ceeed +index 000000000..128ce2f56 --- /dev/null +++ b/src/plugins/multimedia/v4l2/qffmpegvideosink.cpp @@ -0,0 +1,17 @@ @@ -991,18 +991,18 @@ index 000000000..93e7ceeed +{ +} + -+void QFFmpegVideoSink::setVideoFrame(const QVideoFrame &frame) ++void QFFmpegVideoSink::onVideoFrameChanged(const QVideoFrame &frame) +{ -+ QPlatformVideoSink::setVideoFrame(frame); ++ +} + +QT_END_NAMESPACE diff --git a/src/plugins/multimedia/v4l2/qffmpegvideosink_p.h b/src/plugins/multimedia/v4l2/qffmpegvideosink_p.h new file mode 100644 -index 000000000..cbaa810d7 +index 000000000..9eac79129 --- /dev/null +++ b/src/plugins/multimedia/v4l2/qffmpegvideosink_p.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,40 @@ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + @@ -1035,7 +1035,8 @@ index 000000000..cbaa810d7 +public: + QFFmpegVideoSink(QVideoSink *sink); + -+ void setVideoFrame(const QVideoFrame &frame) override; ++protected: ++ void onVideoFrameChanged(const QVideoFrame &frame) override; +}; + +QT_END_NAMESPACE @@ -1896,7 +1897,7 @@ index 000000000..79cc3cfa9 +#endif // QV4L2CAMERA_H diff --git a/src/plugins/multimedia/v4l2/qv4l2cameradevices.cpp b/src/plugins/multimedia/v4l2/qv4l2cameradevices.cpp new file mode 100644 -index 000000000..44abde914 +index 000000000..c89ff69c6 --- /dev/null +++ b/src/plugins/multimedia/v4l2/qv4l2cameradevices.cpp @@ -0,0 +1,168 @@ @@ -1941,7 +1942,7 @@ index 000000000..44abde914 + doCheckCameras(); +} + -+QList<QCameraDevice> QV4L2CameraDevices::videoInputs() const ++QList<QCameraDevice> QV4L2CameraDevices::findVideoInputs() const +{ + return m_cameras; +} @@ -1949,7 +1950,7 @@ index 000000000..44abde914 +void QV4L2CameraDevices::checkCameras() +{ + if (doCheckCameras()) -+ emit videoInputsChanged(); ++ onVideoInputsChanged(); +} + +bool QV4L2CameraDevices::doCheckCameras() @@ -2070,10 +2071,10 @@ index 000000000..44abde914 +#include "moc_qv4l2cameradevices_p.cpp" diff --git a/src/plugins/multimedia/v4l2/qv4l2cameradevices_p.h b/src/plugins/multimedia/v4l2/qv4l2cameradevices_p.h new file mode 100644 -index 000000000..ce424d3b6 +index 000000000..22ac44027 --- /dev/null +++ b/src/plugins/multimedia/v4l2/qv4l2cameradevices_p.h -@@ -0,0 +1,46 @@ +@@ -0,0 +1,47 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + @@ -2104,11 +2105,12 @@ index 000000000..ce424d3b6 +public: + QV4L2CameraDevices(QPlatformMediaIntegration *integration); + -+ QList<QCameraDevice> videoInputs() const override; -+ +public Q_SLOTS: + void checkCameras(); + ++protected: ++ QList<QCameraDevice> findVideoInputs() const override; ++ +private: + bool doCheckCameras(); +