diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2025-12-20 13:16:40 -0500 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2025-12-20 13:17:14 -0500 |
| commit | d774872bf72016e5e94a31b0698a8c1333a4cfec (patch) | |
| tree | 44ecfc9ed0fbe92dccadf29c0c83f3ca9aefa2c7 | |
| parent | security/vuxml: Add smb4k vulnerabilities (diff) | |
multimedia/qt6-multimedia: Fix build on i386
Reported by: pkg-fallout
3 files changed, 34 insertions, 2 deletions
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_plugins_multimedia_ffmpeg_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt index e8ba5dbeb30e..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,6 +1,6 @@ ---- src/plugins/multimedia/ffmpeg/CMakeLists.txt.orig 2025-08-15 19:16:13 UTC +--- src/plugins/multimedia/ffmpeg/CMakeLists.txt.orig 2025-11-13 22:23:51 UTC +++ src/plugins/multimedia/ffmpeg/CMakeLists.txt -@@ -92,7 +92,7 @@ qt_internal_add_module(FFmpegMediaPluginImplPrivate +@@ -94,7 +94,7 @@ qt_internal_add_module(FFmpegMediaPluginImplPrivate ../../../3rdparty/signalsmith-stretch ) |