depends: qt: update to 6.10.0

diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk
index a7e70de146b539a2d47b6c9b8c6c28bd1865cb89..10b26599d258b72c43f5f241213123d799a7f82e 100644 (file)
--- a/contrib/depends/packages/native_qt.mk
+++ b/contrib/depends/packages/native_qt.mk
@@ -1,9 +1,9 @@
 package=native_qt
-$(package)_version=6.9.1
-$(package)_download_path=https://download.qt.io/official_releases/qt/6.9/$($(package)_version)/submodules
+$(package)_version=6.10.0
+$(package)_download_path=https://download.qt.io/official_releases/qt/6.10/$($(package)_version)/submodules
 $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=40caedbf83cc9a1959610830563565889878bc95f115868bbf545d1914acf28e
+$(package)_sha256_hash=ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16f72046d
 $(package)_linux_dependencies=native_wayland
 $(package)_qt_libs=corelib network widgets gui plugins testlib
 $(package)_patches += guix_cross_lib_path.patch
@@ -12,19 +12,19 @@ $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += root_CMakeLists.txt
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=90c4a562f4ccfd043fd99f34c600853e0b5ba9babc6ec616c0f306f2ce3f4b4c
+$(package)_qttools_sha256_hash=d86d5098cf3e3e599f37e18df477e65908fc8f036e10ea731b3469ec4fdbd02a
 
 $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
-$(package)_qtsvg_sha256_hash=2dfc5de5fd891ff2afd9861e519bf1a26e6deb729b3133f68a28ba763c9abbd5
+$(package)_qtsvg_sha256_hash=5ed2c0e04d5e73ff75c2a2ed92db5dc1788ba70f704fc2b71bc21644beda2533
 
 $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
-$(package)_qtmultimedia_sha256_hash=955e36459518ee55f8e2bb79defc6e44aa94dc1edf5ac58a22d7734b2e07391d
+$(package)_qtmultimedia_sha256_hash=04424021cf0d1d19799f5967310d484d1afa6fdd0b31725d0ee7608d2eef1126
 
 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
-$(package)_qtshadertools_sha256_hash=4e1ed24cce0887fb4b6c7be4f150239853a29c330c9717f6bacfb6376f3b4b74
+$(package)_qtshadertools_sha256_hash=87ba478c3fd827862fc79f6d78d369dfec162c901b7f66ed988b3e1d6ffdfbf6
 
 $(package)_qtwayland_file_name=qtwayland-$($(package)_suffix)
-$(package)_qtwayland_sha256_hash=7d21ea0e687180ebb19b9a1f86ae9cfa7a25b4f02d5db05ec834164409932e3e
+$(package)_qtwayland_sha256_hash=603f2b0a259b24bd0fb14f880d7761b1d248118a42a6870cdbe8fdda4173761f
 
 $(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 cc00305fcfe88c9aa12a6feca966ab2f3dc7e909..bafca6835a29f1203dc5e8ed39d0663b80e571d4 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -1,9 +1,9 @@
 package=qt
-$(package)_version=6.9.1
-$(package)_download_path=https://download.qt.io/official_releases/qt/6.9/$($(package)_version)/submodules
+$(package)_version=6.10.0
+$(package)_download_path=https://download.qt.io/official_releases/qt/6.10/$($(package)_version)/submodules
 $(package)_suffix=everywhere-src-$($(package)_version).tar.xz
 $(package)_file_name=qtbase-$($(package)_suffix)
-$(package)_sha256_hash=40caedbf83cc9a1959610830563565889878bc95f115868bbf545d1914acf28e
+$(package)_sha256_hash=ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16f72046d
 $(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
@@ -14,35 +14,33 @@ $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += root_CMakeLists.txt
 $(package)_patches += v4l2.patch
 $(package)_patches += windows_func_fix.patch
-$(package)_patches += xcb-util-image-fix.patch
 $(package)_patches += libxau-fix.patch
 $(package)_patches += toolchain.cmake
 $(package)_patches += revert-macOS-Silence-warning-about-supporting-secure.patch
 $(package)_patches += no-resonance-audio.patch
 $(package)_patches += fix_static_qt_darwin_camera_permissions.patch
 $(package)_patches += macos-available-qtbase.patch
-$(package)_patches += qtmultimedia_windows_fix_include.patch
 $(package)_patches += qtmultimedia_macos_fix_include.patch
 $(package)_patches += qtmultimedia_macos_fix_available.patch
 #$(package)_patches += fix-static-fontconfig-static-linking.patch
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
-$(package)_qttools_sha256_hash=90c4a562f4ccfd043fd99f34c600853e0b5ba9babc6ec616c0f306f2ce3f4b4c
+$(package)_qttools_sha256_hash=d86d5098cf3e3e599f37e18df477e65908fc8f036e10ea731b3469ec4fdbd02a
 
 $(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
-$(package)_qtsvg_sha256_hash=2dfc5de5fd891ff2afd9861e519bf1a26e6deb729b3133f68a28ba763c9abbd5
+$(package)_qtsvg_sha256_hash=5ed2c0e04d5e73ff75c2a2ed92db5dc1788ba70f704fc2b71bc21644beda2533
 
 $(package)_qtwebsockets_file_name=qtwebsockets-$($(package)_suffix)
-$(package)_qtwebsockets_sha256_hash=98be8c863b7f02cc98eedc0b6eac07544c10a9d2fa11c685fd61f6b243f748f5
+$(package)_qtwebsockets_sha256_hash=d1092e7da5c3b8eea242e4069f05ff8e710a17c54d5010c1b557e26f7948806e
 
 $(package)_qtmultimedia_file_name=qtmultimedia-$($(package)_suffix)
-$(package)_qtmultimedia_sha256_hash=955e36459518ee55f8e2bb79defc6e44aa94dc1edf5ac58a22d7734b2e07391d
+$(package)_qtmultimedia_sha256_hash=04424021cf0d1d19799f5967310d484d1afa6fdd0b31725d0ee7608d2eef1126
 
 $(package)_qtshadertools_file_name=qtshadertools-$($(package)_suffix)
-$(package)_qtshadertools_sha256_hash=4e1ed24cce0887fb4b6c7be4f150239853a29c330c9717f6bacfb6376f3b4b74
+$(package)_qtshadertools_sha256_hash=87ba478c3fd827862fc79f6d78d369dfec162c901b7f66ed988b3e1d6ffdfbf6
 
 $(package)_qtwayland_file_name=qtwayland-$($(package)_suffix)
-$(package)_qtwayland_sha256_hash=7d21ea0e687180ebb19b9a1f86ae9cfa7a25b4f02d5db05ec834164409932e3e
+$(package)_qtwayland_sha256_hash=603f2b0a259b24bd0fb14f880d7761b1d248118a42a6870cdbe8fdda4173761f
 
 $(package)_extra_sources += $($(package)_qttools_file_name)
 $(package)_extra_sources += $($(package)_qtsvg_file_name)
@@ -227,7 +225,6 @@ define $(package)_preprocess_cmds
             -e 's|@wmf_libs@|$(WMF_LIBS)|' \
       toolchain.cmake && \
   cd qtbase && \
-  patch -p1 -i $($(package)_patch_dir)/xcb-util-image-fix.patch && \
   patch -p1 -i $($(package)_patch_dir)/libxau-fix.patch && \
   patch -p1 -i $($(package)_patch_dir)/revert-macOS-Silence-warning-about-supporting-secure.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix_static_qt_darwin_camera_permissions.patch && \
@@ -235,7 +232,6 @@ define $(package)_preprocess_cmds
   cd ../qtmultimedia && \
   patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
   patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \
-  patch -p1 -i $($(package)_patch_dir)/qtmultimedia_windows_fix_include.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtmultimedia_macos_fix_include.patch && \
   patch -p1 -i $($(package)_patch_dir)/qtmultimedia_macos_fix_available.patch
 endef

diff --git a/contrib/depends/patches/qt/qtmultimedia-fixes.patch b/contrib/depends/patches/qt/qtmultimedia-fixes.patch
index 8fe583f5fe877253a16f8454a50b1f02a0e730fe..755a1cfbea4f63e745f14b4dc797b2bfb12d3a41 100644 (file)
--- a/contrib/depends/patches/qt/qtmultimedia-fixes.patch
+++ b/contrib/depends/patches/qt/qtmultimedia-fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake
-index fd69e8186..23657d9f5 100644
+index 7bb46abc6..785fe5faa 100644
 --- a/src/multimedia/configure.cmake
 +++ b/src/multimedia/configure.cmake
-@@ -65,27 +65,6 @@ if(TARGET EGL::EGL)
+@@ -63,28 +63,6 @@ if(TARGET EGL::EGL)
  endif()
  qt_find_package(EGL PROVIDED_TARGETS EGL::EGL)
  
@@ -21,6 +21,7 @@ index fd69e8186..23657d9f5 100644
 -        FFmpeg::avutil
 -        FFmpeg::swresample
 -        FFmpeg::swscale
+-    USE_ATTRIBUTION_FILES
 -    ATTRIBUTION_FILE_DIR_PATHS
 -        # Need to pass an absolute path here, otherwise the file will be relative to the root of
 -        # the source tree, not the current dir, because system libraries are processed in the
@@ -30,12 +31,14 @@ index fd69e8186..23657d9f5 100644
  qt_find_package(PipeWire PROVIDED_TARGETS PipeWire::PipeWire MODULE_NAME multimedia QMAKE_LIB pipewire)
  qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VAAPI MODULE_NAME multimedia QMAKE_LIB vaapi)
  
-@@ -138,7 +117,7 @@ qt_feature("ffmpeg" PRIVATE
+@@ -236,9 +214,7 @@ qt_feature("ffmpeg" PRIVATE
      LABEL "FFmpeg"
      ENABLE INPUT_ffmpeg STREQUAL 'yes'
      DISABLE INPUT_ffmpeg STREQUAL 'no'
--    CONDITION FFmpeg_FOUND AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_pulseaudio)
+-    CONDITION FFmpeg_FOUND
+-              AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_pulseaudio OR QT_FEATURE_pipewire)
+-              AND QT_FEATURE_thread
 +    CONDITION UNIX OR WIN32
  )
- qt_feature("pipewire" PRIVATE
-     LABEL "PipeWire"
+ 
+ # Caveat: FEATURE_ffmpeg_stubs cannot really be used to disable stubbing, it is just used to inform

diff --git a/contrib/depends/patches/qt/qtmultimedia_windows_fix_include.patch b/contrib/depends/patches/qt/qtmultimedia_windows_fix_include.patch
deleted file mode 100644 (file)
index ca0ade1..0000000
--- a/contrib/depends/patches/qt/qtmultimedia_windows_fix_include.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/multimedia/windows/player/mfplayersession.cpp b/src/plugins/multimedia/windows/player/mfplayersession.cpp
-index ccdd5b6c5..94218a5b9 100644
---- a/src/plugins/multimedia/windows/player/mfplayersession.cpp
-+++ b/src/plugins/multimedia/windows/player/mfplayersession.cpp
-@@ -30,7 +30,7 @@
- #include <mfidl.h>
- #include <mmdeviceapi.h>
- #include <propvarutil.h>
--#include <Wininet.h>
-+#include <wininet.h>
- #include <functiondiscoverykeys_devpkey.h>
- 
- //#define DEBUG_MEDIAFOUNDATION

diff --git a/contrib/depends/patches/qt/v4l2.patch b/contrib/depends/patches/qt/v4l2.patch
index 4d7acb620cabb07e71e99be30267e538efdc7171..a6b8b9a766087c926de3073be838f2b5a4b516d0 100644 (file)
--- 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 5b163e98a..eac405570 100644
+index f42a84da5..2f529b508 100644
 --- a/src/plugins/multimedia/CMakeLists.txt
 +++ b/src/plugins/multimedia/CMakeLists.txt
 @@ -2,7 +2,7 @@
@@ -672,7 +672,7 @@ index 000000000..e34005bbf
 +#endif
 diff --git a/src/plugins/multimedia/v4l2/qffmpegmediaintegration.cpp b/src/plugins/multimedia/v4l2/qffmpegmediaintegration.cpp
 new file mode 100644
-index 000000000..63a8ff196
+index 000000000..90f338172
 --- /dev/null
 +++ b/src/plugins/multimedia/v4l2/qffmpegmediaintegration.cpp
 @@ -0,0 +1,131 @@
@@ -754,12 +754,12 @@ index 000000000..63a8ff196
 +#endif
 +}
 +
-+QMaybe<QPlatformMediaCaptureSession *> QFFmpegMediaIntegration::createCaptureSession()
++q23::expected<QPlatformMediaCaptureSession *, QString> QFFmpegMediaIntegration::createCaptureSession()
 +{
 +    return new QFFmpegMediaCaptureSession();
 +}
 +
-+QMaybe<QPlatformCamera *> QFFmpegMediaIntegration::createCamera(QCamera *camera)
++q23::expected<QPlatformCamera *, QString> QFFmpegMediaIntegration::createCamera(QCamera *camera)
 +{
 +#ifdef Q_OS_DARWIN
 +    return new QAVFCamera(camera);
@@ -773,12 +773,12 @@ index 000000000..63a8ff196
 +#endif
 +}
 +
-+QMaybe<QPlatformImageCapture *> QFFmpegMediaIntegration::createImageCapture(QImageCapture *imageCapture)
++q23::expected<QPlatformImageCapture *, QString> QFFmpegMediaIntegration::createImageCapture(QImageCapture *imageCapture)
 +{
 +    return new QFFmpegImageCapture(imageCapture);
 +}
 +
-+QMaybe<QPlatformVideoSink *> QFFmpegMediaIntegration::createVideoSink(QVideoSink *sink)
++q23::expected<QPlatformVideoSink *, QString> QFFmpegMediaIntegration::createVideoSink(QVideoSink *sink)
 +{
 +    return new QFFmpegVideoSink(sink);
 +}
@@ -809,7 +809,7 @@ index 000000000..63a8ff196
 +#include "qffmpegmediaintegration.moc"
 diff --git a/src/plugins/multimedia/v4l2/qffmpegmediaintegration_p.h b/src/plugins/multimedia/v4l2/qffmpegmediaintegration_p.h
 new file mode 100644
-index 000000000..13b81ecc2
+index 000000000..70d525df2
 --- /dev/null
 +++ b/src/plugins/multimedia/v4l2/qffmpegmediaintegration_p.h
 @@ -0,0 +1,47 @@
@@ -846,10 +846,10 @@ index 000000000..13b81ecc2
 +        return static_cast<QFFmpegMediaIntegration *>(QPlatformMediaIntegration::instance());
 +    }
 +
-+    QMaybe<QPlatformMediaCaptureSession *> createCaptureSession() override;
-+    QMaybe<QPlatformCamera *> createCamera(QCamera *) override;
-+    QMaybe<QPlatformImageCapture *> createImageCapture(QImageCapture *) override;
-+    QMaybe<QPlatformVideoSink *> createVideoSink(QVideoSink *sink) override;
++    q23::expected<QPlatformMediaCaptureSession *, QString> createCaptureSession() override;
++    q23::expected<QPlatformCamera *, QString> createCamera(QCamera *) override;
++    q23::expected<QPlatformImageCapture *, QString> createImageCapture(QImageCapture *) override;
++    q23::expected<QPlatformVideoSink *, QString> createVideoSink(QVideoSink *sink) override;
 +
 +protected:
 +    QPlatformMediaFormatInfo *createFormatInfo() override;