diff options
Diffstat (limited to 'multimedia/qt6-multimedia/files')
6 files changed, 20 insertions, 35 deletions
diff --git a/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake b/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake index 03598d129790..b3afbc959c8e 100644 --- a/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake +++ b/multimedia/qt6-multimedia/files/patch-cmake_FindFFmpeg.cmake @@ -1,11 +1,11 @@ ---- cmake/FindFFmpeg.cmake.orig 2024-11-22 07:31:25 UTC +--- cmake/FindFFmpeg.cmake.orig 2025-05-04 13:16:35 UTC +++ cmake/FindFFmpeg.cmake -@@ -255,7 +255,7 @@ function(__ffmpeg_internal_set_dependencies _component - - # The pkgconfig directory is always in lib/pkgconfig/, even on Windows - # where libs and dlls are in bin/ -- set(PC_FILE ${${_component}_LIBRARY_DIR}/../lib/pkgconfig/lib${lib}.pc) -+ set(PC_FILE ${${_component}_LIBRARY_DIR}/../libdata/pkgconfig/lib${lib}.pc) +@@ -278,7 +278,7 @@ function(__ffmpeg_internal_set_dependencies _component + if (WIN32) + set(PC_FILE ${${_component}_LIBRARY_DIR}/../lib/pkgconfig/lib${lib}.pc) + else() +- set(PC_FILE ${${_component}_LIBRARY_DIR}/pkgconfig/lib${lib}.pc) ++ set(PC_FILE ${${_component}_LIBRARY_DIR}/../libdata/pkgconfig/lib${lib}.pc) + endif() if(EXISTS ${PC_FILE}) - file(READ ${PC_FILE} pcfile) diff --git a/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt b/multimedia/qt6-multimedia/files/patch-src_CMakeLists.txt index 5b783c6ccaaf..4112b1c41f56 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 2023-11-08 02:47:23 UTC +--- src/CMakeLists.txt.orig 2025-02-20 14:13:07 UTC +++ src/CMakeLists.txt -@@ -16,7 +16,7 @@ endif() +@@ -26,7 +26,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 cacf6404d45e..89722fa1d38a 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_CMakeLists.txt @@ -1,6 +1,6 @@ ---- src/multimedia/CMakeLists.txt.orig 2024-11-22 07:31:25 UTC +--- src/multimedia/CMakeLists.txt.orig 2025-05-04 13:16:35 UTC +++ src/multimedia/CMakeLists.txt -@@ -115,7 +115,7 @@ qt_internal_extend_target(Multimedia +@@ -136,7 +136,7 @@ qt_internal_extend_target(Multimedia ) qt_internal_extend_target(Multimedia diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake index 058f21834cc5..cbf22dd3f497 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 2024-11-22 07:31:25 UTC +--- src/multimedia/configure.cmake.orig 2025-08-18 00:47:41 UTC +++ src/multimedia/configure.cmake -@@ -138,7 +138,7 @@ qt_feature("ffmpeg" PRIVATE - LABEL "FFmpeg" +@@ -129,7 +129,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) -+ CONDITION FFmpeg_FOUND AND (APPLE OR WIN32 OR ANDROID OR QNX OR QT_FEATURE_alsa OR QT_FEATURE_pulseaudio) + 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 QT_FEATURE_thread ) qt_feature("pipewire" PRIVATE - LABEL "PipeWire" diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp deleted file mode 100644 index 42f24b8af9cb..000000000000 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp +++ /dev/null @@ -1,15 +0,0 @@ -Fix 32-bit builds with PULSEAUDIO option. - ---- src/multimedia/pulseaudio/qpulseaudiosink.cpp.orig 2025-02-20 14:13:07 UTC -+++ src/multimedia/pulseaudio/qpulseaudiosink.cpp -@@ -496,8 +496,8 @@ qint64 QPulseAudioSink::write(const char *data, qint64 - // or even affect the system volume if flat volumes are enabled - - QAudioHelperInternal::applyVolume(m_volume, m_format, -- QSpan{ reinterpret_cast<const std::byte *>(data), len }, -- QSpan{ reinterpret_cast<std::byte *>(dest), len }); -+ QSpan{ reinterpret_cast<const std::byte *>(data), static_cast<qsizetype>(len) }, -+ QSpan{ reinterpret_cast<std::byte *>(dest), static_cast<qsizetype>(len) }); - - if ((pa_stream_write(m_stream.get(), dest, len, nullptr, 0, PA_SEEK_RELATIVE)) < 0) { - engineLock.unlock(); diff --git a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h index f968a8db5070..83f757e0b68d 100644 --- a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h +++ b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h @@ -1,7 +1,7 @@ ---- src/plugins/multimedia/ffmpeg/qv4l2camera_p.h.orig 2024-03-19 05:09:26 UTC +--- src/plugins/multimedia/ffmpeg/qv4l2camera_p.h.orig 2025-03-09 20:10:22 UTC +++ src/plugins/multimedia/ffmpeg/qv4l2camera_p.h @@ -18,6 +18,8 @@ - #include <private/qplatformcamera_p.h> + #include <QtMultimedia/private/qplatformcamera_p.h> #include <sys/time.h> +#include <sys/time.h> // timeval |