Debian Codegraph @

contrib/depends/patches/qt/qtmultimedia-fixes.patch

raw
1 diff --git a/src/multimedia/configure.cmake b/src/multimedia/configure.cmake
2 index fd69e8186..23657d9f5 100644
3 --- a/src/multimedia/configure.cmake
4 +++ b/src/multimedia/configure.cmake
5 @@ -65,27 +65,6 @@ if(TARGET EGL::EGL)
6 endif()
7 qt_find_package(EGL PROVIDED_TARGETS EGL::EGL)
8
9 -# If FFMPEG_DIR is specified, we require FFmpeg to be present. This makes
10 -# configuration problems easier to detect, and reduces risk of silent
11 -# fallback to native backends.
12 -if (DEFINED FFMPEG_DIR)
13 - set(ffmpeg_required REQUIRED)
14 -endif()
15 -
16 -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})
17 -qt_find_package_extend_sbom(
18 - TARGETS
19 - FFmpeg::avcodec
20 - FFmpeg::avformat
21 - FFmpeg::avutil
22 - FFmpeg::swresample
23 - FFmpeg::swscale
24 - ATTRIBUTION_FILE_DIR_PATHS
25 - # Need to pass an absolute path here, otherwise the file will be relative to the root of
26 - # the source tree, not the current dir, because system libraries are processed in the
27 - # source root directory.
28 - ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/ffmpeg
29 -)
30 qt_find_package(PipeWire PROVIDED_TARGETS PipeWire::PipeWire MODULE_NAME multimedia QMAKE_LIB pipewire)
31 qt_find_package(VAAPI COMPONENTS VA DRM PROVIDED_TARGETS VAAPI::VAAPI MODULE_NAME multimedia QMAKE_LIB vaapi)
32
33 @@ -138,7 +117,7 @@ qt_feature("ffmpeg" PRIVATE
34 LABEL "FFmpeg"
35 ENABLE INPUT_ffmpeg STREQUAL 'yes'
36 DISABLE INPUT_ffmpeg STREQUAL 'no'
37 - CONDITION FFmpeg_FOUND AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_pulseaudio)
38 + CONDITION UNIX OR WIN32
39 )
40 qt_feature("pipewire" PRIVATE
41 LABEL "PipeWire"