diff options
Diffstat (limited to 'multimedia/qt6-multimedia/files')
9 files changed, 54 insertions, 22 deletions
diff --git a/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake b/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake index b3afbc959c8e..1882e3f8d185 100644 --- a/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake +++ b/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake @@ -1,6 +1,6 @@ ---- cmake/FindFFmpeg.cmake.orig 2025-05-04 13:16:35 UTC +--- cmake/FindFFmpeg.cmake.orig 2025-08-15 19:16:13 UTC +++ cmake/FindFFmpeg.cmake -@@ -278,7 +278,7 @@ function(__ffmpeg_internal_set_dependencies _component +@@ -276,7 +276,7 @@ function(__ffmpeg_internal_set_dependencies _component if (WIN32) set(PC_FILE ${${_component}_LIBRARY_DIR}/../lib/pkgconfig/lib${lib}.pc) else() diff --git a/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt index 4112b1c41f56..87d5d76b932e 100644 --- a/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt +++ b/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt @@ -1,9 +1,9 @@ Prevent building spatialaudio_quick3d if quick3d is installed and the feature is disabled. ---- src/CMakeLists.txt.orig 2025-02-20 14:13:07 UTC +--- src/CMakeLists.txt.orig 2025-08-15 19:16:13 UTC +++ src/CMakeLists.txt -@@ -26,7 +26,7 @@ endif() +@@ -27,7 +27,7 @@ endif() if(TARGET Qt::Quick) add_subdirectory(multimediaquick) endif() diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt index 89722fa1d38a..a92e689b9be6 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt @@ -1,11 +1,11 @@ ---- src/multimedia/CMakeLists.txt.orig 2025-05-04 13:16:35 UTC +--- src/multimedia/CMakeLists.txt.orig 2025-08-15 19:16:13 UTC +++ src/multimedia/CMakeLists.txt -@@ -136,7 +136,7 @@ qt_internal_extend_target(Multimedia +@@ -156,7 +156,7 @@ qt_internal_extend_target(Multimedia ) qt_internal_extend_target(Multimedia -- CONDITION LINUX OR ANDROID -+ CONDITION UNIX OR ANDROID +- CONDITION (LINUX OR ANDROID) AND QT_FEATURE_library ++ CONDITION (UNIX OR ANDROID) AND QT_FEATURE_library SOURCES qsymbolsresolveutils.cpp qsymbolsresolveutils_p.h) qt_internal_add_simd_part(Multimedia SIMD sse2 diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake index cbf22dd3f497..f9782a976418 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake @@ -1,11 +1,11 @@ ---- src/multimedia/configure.cmake.orig 2025-08-18 00:47:41 UTC +--- src/multimedia/configure.cmake.orig 2025-08-15 19:16:13 UTC +++ src/multimedia/configure.cmake -@@ -129,7 +129,7 @@ qt_feature("ffmpeg" PRIVATE +@@ -237,7 +237,7 @@ qt_feature("ffmpeg" PRIVATE 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) -+ AND (APPLE OR WIN32 OR ANDROID OR QNX OR OR QT_FEATURE_alsa OR QT_FEATURE_pulseaudio) +- AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_pulseaudio OR QT_FEATURE_pipewire) ++ AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_alsa OR QT_FEATURE_pulseaudio OR QT_FEATURE_pipewire) AND QT_FEATURE_thread ) - qt_feature("pipewire" PRIVATE + diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__instance.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__instance.cpp index 9139b9f3957a..739d5bf50160 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__instance.cpp +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__instance.cpp @@ -2,9 +2,9 @@ Adapt to local symbols from multimedia/pipewire PR: 284719 ---- src/multimedia/pipewire/qpipewire_instance.cpp.orig 2025-02-20 14:13:07 UTC +--- src/multimedia/pipewire/qpipewire_instance.cpp.orig 2025-08-15 19:16:13 UTC +++ src/multimedia/pipewire/qpipewire_instance.cpp -@@ -43,7 +43,7 @@ QPipeWireInstance::QPipeWireInstance() +@@ -45,7 +45,7 @@ QPipeWireInstance::QPipeWireInstance() QPipeWireInstance::QPipeWireInstance() { @@ -13,7 +13,7 @@ PR: 284719 qCDebug(lcPipewire) << "PipeWire initialized: compiled against" << pw_get_headers_version() << " running " << pw_get_library_version(); -@@ -52,7 +52,7 @@ QPipeWireInstance::~QPipeWireInstance() +@@ -54,7 +54,7 @@ QPipeWireInstance::~QPipeWireInstance() QPipeWireInstance::~QPipeWireInstance() { if (pw_check_library_version(0, 3, 49)) diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__propertydict.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__propertydict.cpp new file mode 100644 index 000000000000..35699524d9bf --- /dev/null +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__propertydict.cpp @@ -0,0 +1,16 @@ +Fix build on i386. + +error: non-constant-expression cannot be narrowed from type 'uint32_t' (aka +'unsigned int') to 'qsizetype' (aka 'int') in initializer list + +--- src/multimedia/pipewire/qpipewire_propertydict.cpp.orig 2025-11-13 22:23:51 UTC ++++ src/multimedia/pipewire/qpipewire_propertydict.cpp +@@ -31,7 +31,7 @@ PwPropertyDict toPropertyDict(const spa_dict &dict) + + PwPropertyDict toPropertyDict(const spa_dict &dict) + { +- QSpan<const spa_dict_item> items{ dict.items, dict.n_items }; ++ QSpan<const spa_dict_item> items{ dict.items, static_cast<qsizetype>(dict.n_items) }; + + PwPropertyDict map; + for (const spa_dict_item &item : items) diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__support.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__support.cpp new file mode 100644 index 000000000000..d2fddc373701 --- /dev/null +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__support.cpp @@ -0,0 +1,16 @@ +Fix build on i386. + +error: non-constant-expression cannot be narrowed from type 'uint32_t' (aka +'unsigned int') to 'qsizetype' (aka 'int') in initializer list + +--- src/multimedia/pipewire/qpipewire_support.cpp.orig 2025-11-13 22:23:51 UTC ++++ src/multimedia/pipewire/qpipewire_support.cpp +@@ -16,7 +16,7 @@ QDebug operator<<(QDebug dbg, const spa_dict &dict) + // debug support + QDebug operator<<(QDebug dbg, const spa_dict &dict) + { +- QSpan<const spa_dict_item> items{ dict.items, dict.n_items }; ++ QSpan<const spa_dict_item> items{ dict.items, static_cast<qsizetype>(dict.n_items) }; + + QDebugStateSaver saver(dbg); + dbg.nospace(); diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__symbolloader.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__symbolloader.cpp index d55400eba281..41e12b8b0b52 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__symbolloader.cpp +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_pipewire_qpipewire__symbolloader.cpp @@ -2,9 +2,9 @@ Adapt to local symbols from multimedia/pipewire PR: 284719 ---- src/multimedia/pipewire/qpipewire_symbolloader.cpp.orig 2025-02-20 14:13:07 UTC +--- src/multimedia/pipewire/qpipewire_symbolloader.cpp.orig 2025-08-15 19:16:13 UTC +++ src/multimedia/pipewire/qpipewire_symbolloader.cpp -@@ -14,8 +14,8 @@ BEGIN_INIT_FUNCS("pipewire-" PW_API_VERSION, "0") +@@ -17,8 +17,8 @@ BEGIN_INIT_FUNCS("pipewire-" PW_API_VERSION, "0") //BEGIN_INIT_FUNCS("pipewire-0.3", "0") BEGIN_INIT_FUNCS("pipewire-" PW_API_VERSION, "0") @@ -15,7 +15,7 @@ PR: 284719 INIT_OPT_FUNC(pw_check_library_version); INIT_FUNC(pw_context_new); INIT_FUNC(pw_context_destroy); -@@ -44,8 +44,8 @@ END_INIT_FUNCS() +@@ -52,8 +52,8 @@ END_INIT_FUNCS() END_INIT_FUNCS() diff --git a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt index dde899287a8a..4ac8d13cf740 100644 --- a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt +++ b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt @@ -1,7 +1,7 @@ ---- src/plugins/multimedia/ffmpeg/CMakeLists.txt.orig 2025-03-09 20:10:22 UTC +--- src/plugins/multimedia/ffmpeg/CMakeLists.txt.orig 2025-11-13 22:23:51 UTC +++ src/plugins/multimedia/ffmpeg/CMakeLists.txt -@@ -86,7 +86,7 @@ qt_internal_add_module(FFmpegMediaPluginImplPrivate - ../../../3rdparty/signalsmith-stretch/ +@@ -94,7 +94,7 @@ qt_internal_add_module(FFmpegMediaPluginImplPrivate + ../../../3rdparty/signalsmith-stretch ) -if (LINUX OR ANDROID) |