diff options
Diffstat (limited to 'multimedia/qt6-multimedia')
8 files changed, 53 insertions, 22 deletions
diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo index 26709f63bb7c..3c6442a01277 100644 --- a/multimedia/qt6-multimedia/distinfo +++ b/multimedia/qt6-multimedia/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743027853 -SHA256 (KDE/Qt/6.8.3/qtmultimedia-everywhere-src-6.8.3.tar.xz) = 32e82307d783172a3b984cc3c47c5e4e8b819cee3cbfc702c7012c47f15f6b01 -SIZE (KDE/Qt/6.8.3/qtmultimedia-everywhere-src-6.8.3.tar.xz) = 9705340 +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 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..508f5cd80e34 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake @@ -1,6 +1,6 @@ ---- src/multimedia/configure.cmake.orig 2024-11-22 07:31:25 UTC +--- src/multimedia/configure.cmake.orig 2025-05-04 13:16:35 UTC +++ src/multimedia/configure.cmake -@@ -138,7 +138,7 @@ qt_feature("ffmpeg" PRIVATE +@@ -132,7 +132,7 @@ qt_feature("ffmpeg" PRIVATE LABEL "FFmpeg" ENABLE INPUT_ffmpeg STREQUAL 'yes' DISABLE INPUT_ffmpeg STREQUAL 'no' diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp b/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp index 42f24b8af9cb..567d571867a6 100644 --- a/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp +++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_pulseaudio_qpulseaudiosink.cpp @@ -1,11 +1,11 @@ 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.orig 2025-05-04 13:16:35 UTC +++ src/multimedia/pulseaudio/qpulseaudiosink.cpp -@@ -496,8 +496,8 @@ qint64 QPulseAudioSink::write(const char *data, qint64 +@@ -491,8 +491,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, + 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) }, 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 diff --git a/multimedia/qt6-multimedia/pkg-plist b/multimedia/qt6-multimedia/pkg-plist index 9e3e76aec166..60250965f115 100644 --- a/multimedia/qt6-multimedia/pkg-plist +++ b/multimedia/qt6-multimedia/pkg-plist @@ -6,6 +6,7 @@ %%FFMPEG%%%%QT_INCDIR%%/QtFFmpegMediaPluginImpl/%%FULLVER%%/QtFFmpegMediaPluginImpl/private/qffmpegaudiodecoder_p.h %%FFMPEG%%%%QT_INCDIR%%/QtFFmpegMediaPluginImpl/%%FULLVER%%/QtFFmpegMediaPluginImpl/private/qffmpegaudioencoder_p.h %%FFMPEG%%%%QT_INCDIR%%/QtFFmpegMediaPluginImpl/%%FULLVER%%/QtFFmpegMediaPluginImpl/private/qffmpegaudioencoderutils_p.h +%%FFMPEG%%%%QT_INCDIR%%/QtFFmpegMediaPluginImpl/%%FULLVER%%/QtFFmpegMediaPluginImpl/private/qffmpegaudioframeconverter_p.h %%FFMPEG%%%%QT_INCDIR%%/QtFFmpegMediaPluginImpl/%%FULLVER%%/QtFFmpegMediaPluginImpl/private/qffmpegaudioinput_p.h %%FFMPEG%%%%QT_INCDIR%%/QtFFmpegMediaPluginImpl/%%FULLVER%%/QtFFmpegMediaPluginImpl/private/qffmpegaudiorenderer_p.h %%FFMPEG%%%%QT_INCDIR%%/QtFFmpegMediaPluginImpl/%%FULLVER%%/QtFFmpegMediaPluginImpl/private/qffmpegavaudioformat_p.h @@ -114,6 +115,7 @@ %%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 %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qautoresetevent_pipe_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qcachedvalue_p.h @@ -132,7 +134,9 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediarecorder_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmediastoragelocation_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmemoryvideobuffer_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmultimedia_assume_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmultimedia_enum_to_string_converter_p.h +%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmultimedia_ranges_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qmultimediautils_p.h %%PIPEWIRE%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpipewire_instance_p.h %%PIPEWIRE%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpipewire_screencapture_p.h @@ -160,6 +164,7 @@ %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformvideosink_p.h %%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformvideosource_p.h %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudio_contextmanager_p.h +%%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudiodevice_p.h %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudiodevices_p.h %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudiosink_p.h %%PULSEAUDIO%%%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qpulseaudiosource_p.h @@ -278,6 +283,7 @@ %%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/mediabackendutils_p.h %%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/mediafileselector_p.h %%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/mediainfo_p.h +%%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/multimedia_debug_support_p.h %%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/osdetection_p.h %%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/qcolorutil_p.h %%QT_INCDIR%%/QtMultimediaTestLib/%%FULLVER%%/QtMultimediaTestLib/private/qfileutil_p.h @@ -397,6 +403,14 @@ lib/cmake/Qt6Multimedia/Qt6MultimediaVersionlessTargets.cmake %%GSTREAMER%%lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginConfigVersionImpl.cmake %%GSTREAMER%%lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake %%GSTREAMER%%lib/cmake/Qt6Multimedia/Qt6QGstreamerMediaPluginTargets.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateConfig.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateConfigVersion.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateConfigVersionImpl.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateDependencies.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateTargets.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6MultimediaPrivate/Qt6MultimediaPrivateVersionlessTargets.cmake lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateAdditionalTargetInfo.cmake lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateConfig.cmake lib/cmake/Qt6MultimediaQuickPrivate/Qt6MultimediaQuickPrivateConfigVersion.cmake @@ -424,6 +438,14 @@ lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets-%%CMAKE_BUILD_TYPE%%. lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsTargets.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessAliasTargets.cmake lib/cmake/Qt6MultimediaWidgets/Qt6MultimediaWidgetsVersionlessTargets.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateConfig.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateConfigVersion.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateConfigVersionImpl.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateDependencies.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateTargets.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6MultimediaWidgetsPrivate/Qt6MultimediaWidgetsPrivateVersionlessTargets.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioAdditionalTargetInfo.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfig.cmake %%Q3D%%lib/cmake/Qt6Qml/QmlPlugins/Qt6quick3dspatialaudioConfigVersion.cmake @@ -454,6 +476,14 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioTargets.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessAliasTargets.cmake lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateAdditionalTargetInfo.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateConfig.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateConfigVersion.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateConfigVersionImpl.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateDependencies.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateTargets.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateVersionlessAliasTargets.cmake +lib/cmake/Qt6SpatialAudioPrivate/Qt6SpatialAudioPrivateVersionlessTargets.cmake %%QT_LIBDIR%%/libQt6BundledResonanceAudio.a %%FFMPEG%%%%QT_LIBDIR%%/libQt6FFmpegMediaPluginImpl.a %%FFMPEG%%%%QT_LIBDIR%%/libQt6FFmpegMediaPluginImpl.prl @@ -489,6 +519,7 @@ lib/cmake/Qt6SpatialAudio/Qt6SpatialAudioVersionlessTargets.cmake %%QT_LIBDIR%%/metatypes/qt6multimediawidgets_%%CMAKE_BUILD_TYPE%%_metatypes.json %%Q3D%%%%QT_LIBDIR%%/metatypes/qt6quick3dspatialaudioprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json %%QT_LIBDIR%%/metatypes/qt6spatialaudio_%%CMAKE_BUILD_TYPE%%_metatypes.json +%%FFMPEG%%%%QT_MKSPECDIR%%/features/ios/add_ios_ffmpeg_libraries.prf %%FFMPEG%%%%QT_MKSPECDIR%%/modules/qt_lib_ffmpegmediapluginimpl_private.pri %%GSTREAMER%%%%QT_MKSPECDIR%%/modules/qt_lib_gstreamermediapluginimpl_private.pri %%QT_MKSPECDIR%%/modules/qt_lib_multimedia.pri |