diff options
Diffstat (limited to 'multimedia/qt6-multimedia')
4 files changed, 10 insertions, 27 deletions
diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo index 3c6442a01277..36b60cc1c246 100644 --- a/multimedia/qt6-multimedia/distinfo +++ b/multimedia/qt6-multimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1749159292 -SHA256 (KDE/Qt/6.9.1/qtmultimedia-everywhere-src-6.9.1.tar.xz) = 955e36459518ee55f8e2bb79defc6e44aa94dc1edf5ac58a22d7734b2e07391d -SIZE (KDE/Qt/6.9.1/qtmultimedia-everywhere-src-6.9.1.tar.xz) = 9776408 +TIMESTAMP = 1756197836 +SHA256 (KDE/Qt/6.9.2/qtmultimedia-everywhere-src-6.9.2.tar.xz) = 7bf8a19a57a7432181b05d0e264acfd8ca4b75a3901d01a27a32935703e5ab12 +SIZE (KDE/Qt/6.9.2/qtmultimedia-everywhere-src-6.9.2.tar.xz) = 9768828 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(); diff --git a/multimedia/qt6-multimedia/pkg-plist b/multimedia/qt6-multimedia/pkg-plist index 60250965f115..2f80534bdab5 100644 --- a/multimedia/qt6-multimedia/pkg-plist +++ b/multimedia/qt6-multimedia/pkg-plist @@ -102,6 +102,7 @@ %%GSTREAMER%%%%QT_INCDIR%%/QtGstreamerMediaPluginImpl/QtGstreamerMediaPluginImplVersion %%GSTREAMER%%%%QT_INCDIR%%/QtGstreamerMediaPluginImpl/qtgstreamermediapluginimplversion.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudio_alignment_support_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudio_platform_implementation_support_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudio_qiodevice_support_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudio_qspan_support_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudio_rtsan_support_p.h @@ -112,8 +113,6 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioformat_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiohelpers_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudioringbuffer_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiostatemachine_p.h -%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiostatemachineutils_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiosystem_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qaudiosystem_platform_stream_support_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qautoresetevent_p.h @@ -342,7 +341,6 @@ %%QT_INCDIR%%/QtSpatialAudio/qtspatialaudioexports.h %%QT_INCDIR%%/QtSpatialAudio/qtspatialaudioglobal.h %%QT_INCDIR%%/QtSpatialAudio/qtspatialaudioversion.h -lib/cmake/Qt6/FindAVFoundation.cmake lib/cmake/Qt6/FindFFmpeg.cmake lib/cmake/Qt6/FindGObject.cmake lib/cmake/Qt6/FindGStreamer.cmake |