diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk index fb4dc4b..4a89a5b 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.7.1 +$(package)_version=6.7.2 $(package)_download_path=https://download.qt.io/official_releases/qt/6.7/$($(package)_version)/submodules $(package)_suffix=everywhere-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) -$(package)_sha256_hash=b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19 +$(package)_sha256_hash=c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599 $(package)_qt_libs=corelib network widgets gui plugins testlib $(package)_patches = dont_hardcode_pwd.patch $(package)_patches += fast_fixed_dtoa_no_optimize.patch @@ -13,16 +13,16 @@ $(package)_patches += rcc_hardcode_timestamp.patch $(package)_patches += root_CMakeLists.txt $(package)_qttools_file_name=qttools-$($(package)_suffix) -$(package)_qttools_sha256_hash=0953cddf6248f3959279a10904892e8a98eb3e463d729a174b6fc47febd99824 +$(package)_qttools_sha256_hash=58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix) -$(package)_qtsvg_sha256_hash=3ed5b80f7228c41dd463b7a57284ed273d224d1c323c0dd78c5209635807cbce +$(package)_qtsvg_sha256_hash=fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01 $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix) -$(package)_qtmultimedia_sha256_hash=656d1543727f5bf1bd39fe2548ac454860109dc8555df77d7940f21e3d65cd3e +$(package)_qtmultimedia_sha256_hash=8ef835115acb9a1d3d2c9f23cfacb43f2c537e3786a8ab822299a2a7765651d3 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix) -$(package)_qtshadertools_sha256_hash=e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2 +$(package)_qtshadertools_sha256_hash=edfa34c0ac8c00fcaa949df1d8e7a77d89dadd6386e683ce6c3e3b117e2f7cc1 $(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 3338da4..ed6f8ee 100644 --- a/contrib/depends/packages/qt.mk +++ b/contrib/depends/packages/qt.mk @@ -1,9 +1,9 @@ package=qt -$(package)_version=6.7.1 +$(package)_version=6.7.2 $(package)_download_path=https://download.qt.io/official_releases/qt/6.7/$($(package)_version)/submodules $(package)_suffix=everywhere-src-$($(package)_version).tar.xz $(package)_file_name=qtbase-$($(package)_suffix) -$(package)_sha256_hash=b7338da1bdccb4d861e714efffaa83f174dfe37e194916bfd7ec82279a6ace19 +$(package)_sha256_hash=c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599 $(package)_darwin_dependencies=native_cctools native_qt openssl $(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 @@ -25,19 +25,19 @@ $(package)_patches += revert-f67ee7c39.patch #$(package)_patches += fix-static-fontconfig-static-linking.patch $(package)_qttools_file_name=qttools-$($(package)_suffix) -$(package)_qttools_sha256_hash=0953cddf6248f3959279a10904892e8a98eb3e463d729a174b6fc47febd99824 +$(package)_qttools_sha256_hash=58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix) -$(package)_qtsvg_sha256_hash=3ed5b80f7228c41dd463b7a57284ed273d224d1c323c0dd78c5209635807cbce +$(package)_qtsvg_sha256_hash=fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01 $(package)_qtwebsockets_file_name=qtwebsockets-$($(package)_suffix) -$(package)_qtwebsockets_sha256_hash=fe16a6e4d2b819c72a56f671c5c697bae4c7f9fee4df2a4473b14caf7602feeb +$(package)_qtwebsockets_sha256_hash=5bde4af6ec9ce8c8632b782ab77b82d910721be2c714e6d38902521bcd1d215f $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix) -$(package)_qtmultimedia_sha256_hash=656d1543727f5bf1bd39fe2548ac454860109dc8555df77d7940f21e3d65cd3e +$(package)_qtmultimedia_sha256_hash=8ef835115acb9a1d3d2c9f23cfacb43f2c537e3786a8ab822299a2a7765651d3 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix) -$(package)_qtshadertools_sha256_hash=e585e3a985b2e2bad8191a84489a04e69c3defc6022a8e746aad22a1f17910c2 +$(package)_qtshadertools_sha256_hash=edfa34c0ac8c00fcaa949df1d8e7a77d89dadd6386e683ce6c3e3b117e2f7cc1 $(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 36797d0..c03cfa1 100644 --- a/contrib/depends/patches/qt/v4l2.patch +++ b/contrib/depends/patches/qt/v4l2.patch @@ -1,15 +1,15 @@ diff --git a/src/plugins/multimedia/CMakeLists.txt b/src/plugins/multimedia/CMakeLists.txt -index 978710112..1cb2cc730 100644 +index 5bc39c1f8..c74f2ff4c 100644 --- a/src/plugins/multimedia/CMakeLists.txt +++ b/src/plugins/multimedia/CMakeLists.txt @@ -2,7 +2,7 @@ # SPDX-License-Identifier: BSD-3-Clause - if (QT_FEATURE_ffmpeg) + if(QT_FEATURE_ffmpeg) - add_subdirectory(ffmpeg) + add_subdirectory(v4l2) - endif () - if (QT_FEATURE_gstreamer) + endif() + if(QT_FEATURE_gstreamer) add_subdirectory(gstreamer) diff --git a/src/plugins/multimedia/v4l2/CMakeLists.txt b/src/plugins/multimedia/v4l2/CMakeLists.txt new file mode 100644 @@ -1044,7 +1044,7 @@ index 000000000..cbaa810d7 +#endif diff --git a/src/plugins/multimedia/v4l2/qv4l2camera.cpp b/src/plugins/multimedia/v4l2/qv4l2camera.cpp new file mode 100644 -index 000000000..2086af10d +index 000000000..1ba05364d --- /dev/null +++ b/src/plugins/multimedia/v4l2/qv4l2camera.cpp @@ -0,0 +1,707 @@ @@ -1444,7 +1444,7 @@ index 000000000..2086af10d +void QV4L2Camera::setCameraBusy() +{ + m_cameraBusy = true; -+ emit error(QCamera::CameraError, QLatin1String("Camera is in use")); ++ updateError(QCamera::CameraError, QLatin1String("Camera is in use")); +} + +void QV4L2Camera::initV4L2Controls() @@ -1462,7 +1462,7 @@ index 000000000..2086af10d + qCWarning(qLcV4L2Camera) << "Unable to open the camera" << deviceName + << "for read to query the parameter info:" + << qt_error_string(errno); -+ emit error(QCamera::CameraError, QLatin1String("Cannot open camera")); ++ updateError(QCamera::CameraError, QLatin1String("Cannot open camera")); + return; + } + @@ -1701,7 +1701,7 @@ index 000000000..2086af10d + + if (!m_memoryTransfer) { + qCWarning(qLcV4L2Camera) << "Cannot init v4l2 memory transfer," << qt_error_string(errno); -+ emit error(QCamera::CameraError, QLatin1String("Cannot init V4L2 memory transfer")); ++ updateError(QCamera::CameraError, QLatin1String("Cannot init V4L2 memory transfer")); + } +} +