summaryrefslogtreecommitdiff
path: root/multimedia/qt6-multimedia/files
diff options
context:
space:
mode:
Diffstat (limited to 'multimedia/qt6-multimedia/files')
-rw-r--r--multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake12
-rw-r--r--multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp15
2 files changed, 6 insertions, 21 deletions
diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
index 508f5cd80e34..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 2025-05-04 13:16:35 UTC
+--- src/multimedia/configure.cmake.orig 2025-08-18 00:47:41 UTC
+++ src/multimedia/configure.cmake
-@@ -132,7 +132,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 567d571867a6..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-05-04 13:16:35 UTC
-+++ src/multimedia/pulseaudio/qpulseaudiosink.cpp
-@@ -491,8 +491,8 @@ qint64 QPulseAudioSink::write(const char *data, qint64
- // or even affect the system volume if flat volumes are enabled
-
- QAudioHelperInternal::applyVolume(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();