depends: qt: consolidate qtmultimedia patches

diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index e554cdebb4307337807c09c40278aa8ed9968b64..91a6c3936e2bfaca0515051914bbbacdd452f85a 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -7,7 +7,6 @@ $(package)_sha256_hash=ead4623bcb54a32257c5b3e3a5aec6d16ec96f4cda58d2e003f5a0c16
 $(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
-$(package)_patches += qtmultimedia-fixes.patch
 $(package)_patches += rcc_hardcode_timestamp.patch
 $(package)_patches += root_CMakeLists.txt
 $(package)_patches += v4l2.patch
@@ -219,7 +218,6 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/libxau-fix.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix_static_qt_darwin_camera_permissions.patch && \
   cd ../qtmultimedia && \
-  patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
   patch -p1 -i $($(package)_patch_dir)/v4l2.patch
 endef
 

diff --git a/contrib/depends/patches/qt/qtmultimedia-fixes.patch b/contrib/depends/patches/qt/qtmultimedia-fixes.patch
deleted file mode 100644 (file)
index 755a1cf..0000000
--- a/contrib/depends/patches/qt/qtmultimedia-fixes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake
-index 7bb46abc6..785fe5faa 100644
---- a/src/multimedia/configure.cmake
-+++ b/src/multimedia/configure.cmake
-@@ -63,28 +63,6 @@ if(TARGET EGL::EGL)
- endif()
- qt_find_package(EGL PROVIDED_TARGETS EGL::EGL)
- 
--# If FFMPEG_DIR is specified, we require FFmpeg to be present. This makes
--# configuration problems easier to detect, and reduces risk of silent
--# fallback to native backends.
--if (DEFINED FFMPEG_DIR)
--    set(ffmpeg_required REQUIRED)
--endif()
--
--qt_find_package(FFmpeg OPTIONAL_COMPONENTS AVCODEC AVFORMAT AVUTIL SWRESAMPLE SWSCALE PROVIDED_TARGETS FFmpeg::avcodec FFmpeg::avformat FFmpeg::avutil FFmpeg::swresample FFmpeg::swscale MODULE_NAME multimedia QMAKE_LIB ffmpeg ${ffmpeg_required})
--qt_find_package_extend_sbom(
--    TARGETS
--        FFmpeg::avcodec
--        FFmpeg::avformat
--        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
--        # source root directory.
--        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/ffmpeg
--)
- 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)
- 
-@@ -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 OR QT_FEATURE_pipewire)
--              AND QT_FEATURE_thread
-+    CONDITION UNIX OR WIN32
- )
- 
- # Caveat: FEATURE_ffmpeg_stubs cannot really be used to disable stubbing, it is just used to inform

diff --git a/contrib/depends/patches/qt/v4l2.patch b/contrib/depends/patches/qt/v4l2.patch
index a6b8b9a766087c926de3073be838f2b5a4b516d0..92d4626509c7a896a9378e90538871a9dd3489d7 100644 (file)
--- a/contrib/depends/patches/qt/v4l2.patch
+++ b/contrib/depends/patches/qt/v4l2.patch
@@ -1,3 +1,47 @@
+diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake
+index 7bb46abc6..785fe5faa 100644
+--- a/src/multimedia/configure.cmake
++++ b/src/multimedia/configure.cmake
+@@ -63,28 +63,6 @@ if(TARGET EGL::EGL)
+ endif()
+ qt_find_package(EGL PROVIDED_TARGETS EGL::EGL)
+ 
+-# If FFMPEG_DIR is specified, we require FFmpeg to be present. This makes
+-# configuration problems easier to detect, and reduces risk of silent
+-# fallback to native backends.
+-if (DEFINED FFMPEG_DIR)
+-    set(ffmpeg_required REQUIRED)
+-endif()
+-
+-qt_find_package(FFmpeg OPTIONAL_COMPONENTS AVCODEC AVFORMAT AVUTIL SWRESAMPLE SWSCALE PROVIDED_TARGETS FFmpeg::avcodec FFmpeg::avformat FFmpeg::avutil FFmpeg::swresample FFmpeg::swscale MODULE_NAME multimedia QMAKE_LIB ffmpeg ${ffmpeg_required})
+-qt_find_package_extend_sbom(
+-    TARGETS
+-        FFmpeg::avcodec
+-        FFmpeg::avformat
+-        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
+-        # source root directory.
+-        ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/ffmpeg
+-)
+ 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)
+ 
+@@ -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 OR QT_FEATURE_pipewire)
+-              AND QT_FEATURE_thread
++    CONDITION UNIX OR WIN32
+ )
+ 
+ # Caveat: FEATURE_ffmpeg_stubs cannot really be used to disable stubbing, it is just used to inform
 diff --git a/src/plugins/multimedia/CMakeLists.txt b/src/plugins/multimedia/CMakeLists.txt
 index f42a84da5..2f529b508 100644
 --- a/src/plugins/multimedia/CMakeLists.txt