head 1.3; access; symbols pkgsrc-2026Q1:1.2.0.8 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.6 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.4 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.2 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.1.0.6 pkgsrc-2025Q1-base:1.1 pkgsrc-2024Q4:1.1.0.4 pkgsrc-2024Q4-base:1.1 pkgsrc-2024Q3:1.1.0.2 pkgsrc-2024Q3-base:1.1; locks; strict; comment @# @; 1.3 date 2026.05.13.05.31.23; author adam; state Exp; branches; next 1.2; commitid Wi1M7Akcbrtf7CFG; 1.2 date 2025.03.31.16.38.07; author adam; state Exp; branches; next 1.1; commitid 5nTO2sYdhjuwVePF; 1.1 date 2024.06.26.16.41.00; author adam; state Exp; branches; next ; commitid aoVhMfGlsRKvSvfF; desc @@ 1.3 log @qt6: updated to 6.11.1 6.11.1 Bug fixes @ text @$NetBSD: patch-src_plugins_multimedia_ffmpeg_CMakeLists.txt,v 1.2 2025/03/31 16:38:07 adam Exp $ FFmpeg stubs are only available on Linux and Android. --- src/plugins/multimedia/ffmpeg/CMakeLists.txt.orig 2026-05-08 03:28:44.000000000 +0000 +++ src/plugins/multimedia/ffmpeg/CMakeLists.txt @@@@ -118,6 +118,7 @@@@ if (QT_FEATURE_vaapi) EGL::EGL ) +if (LINUX OR ANDROID) list(FIND FFMPEG_STUBS "va" va_stub_index) if (${va_stub_index} EQUAL -1) # va is not provided via the stub mechanism: link directly to libva @@@@ -129,6 +130,7 @@@@ if (QT_FEATURE_vaapi) qt_internal_multimedia_add_private_stub_to_plugin("va") endif() endif() +endif() qt_internal_extend_target(FFmpegMediaPluginImplPrivate CONDITION APPLE @ 1.2 log @qt6: updated to 6.8.3 As a patch release, Qt 6.8.3 does not introduce new features but contains more than 300 bug fixes, security updates, and other improvements to the top of the Qt 6.8.2 release. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- src/plugins/multimedia/ffmpeg/CMakeLists.txt.orig 2025-03-18 20:15:11.000000000 +0000 d7 1 a7 1 @@@@ -107,6 +107,7 @@@@ if (QT_FEATURE_vaapi) d13 3 a15 3 if (NOT QT_LINK_STUBS_TO_FFMPEG_PLUGIN AND (FFMPEG_SHARED_LIBRARIES OR ${va_stub_index} EQUAL -1)) target_compile_definitions(FFmpegMediaPluginImplPrivate PRIVATE Q_FFMPEG_PLUGIN_STUBS_ONLY) @@@@ -114,6 +115,7 @@@@ if (QT_FEATURE_vaapi) @ 1.1 log @qt6: updated to 6.7.2 6.7.2 As a patch release, Qt 6.7.2 does not introduce new features but contains more than 200 bug fixes, security updates, and other improvements to the top of the Qt 6.7.1 release. See more information about the most important changes and bug fixes from Qt 6.7.2 release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.2/release-note.md @ text @d3 1 a3 1 FFmpeg stub are only available on Linux. d5 1 a5 1 --- src/plugins/multimedia/ffmpeg/CMakeLists.txt.orig 2024-06-08 01:28:28.000000000 +0000 d7 2 a8 1 @@@@ -108,7 +108,7 @@@@ if (QT_FEATURE_vaapi) d11 1 d13 3 a15 4 - if (NOT QT_LINK_STUBS_TO_FFMPEG_PLUGIN AND (FFMPEG_SHARED_LIBRARIES OR ${va_stub_index} EQUAL -1)) + if (LINUX AND NOT QT_LINK_STUBS_TO_FFMPEG_PLUGIN AND (FFMPEG_SHARED_LIBRARIES OR ${va_stub_index} EQUAL -1)) target_compile_definitions(QFFmpegMediaPlugin PRIVATE Q_FFMPEG_PLUGIN_STUBS_ONLY) qt_internal_multimedia_find_vaapi_soversion() d17 6 @