diff --git a/0001-h264vaapi-Use-the-proper-getter-for-getting-the-hard.patch b/0001-h264vaapi-Use-the-proper-getter-for-getting-the-hard.patch deleted file mode 100644 index a0a30c6..0000000 --- a/0001-h264vaapi-Use-the-proper-getter-for-getting-the-hard.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5ff964b62d0112f27b52b742f4e6a054ba9e4732 Mon Sep 17 00:00:00 2001 -From: Arjen Hiemstra -Date: Thu, 3 Oct 2024 10:44:04 +0200 -Subject: [PATCH] h264vaapi: Use the proper getter for getting the hardware - context - -The hw_frames_context was moved out of AVFilterLink for FFmpeg 7.1. -Apparently there is actually a proper getter for getting the -hw_frames_ctx of a filter context, so use that instead so things keep -compiling with 7.1. - -While at it, add a comment explaining why we need this in the first -place. ---- - src/h264vaapiencoder.cpp | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/h264vaapiencoder.cpp b/src/h264vaapiencoder.cpp -index 2d610de..cf315f3 100644 ---- a/src/h264vaapiencoder.cpp -+++ b/src/h264vaapiencoder.cpp -@@ -144,7 +144,11 @@ bool H264VAAPIEncoder::initialize(const QSize &size) - // av_dict_set_int(&options, "threads", qMin(16, QThread::idealThreadCount()), 0); - applyEncodingPreference(options); - -- m_avCodecContext->hw_frames_ctx = av_buffer_ref(m_outputFilter->inputs[0]->hw_frames_ctx); -+ // Assign the right hardware context for encoding frames. -+ // We rely on FFmpeg for creating the VAAPI hardware context as part of -+ // `avfilter_graph_parse()`. The codec context needs the VAAPI context to be -+ // able to encode properly, so get that from the output filter. -+ m_avCodecContext->hw_frames_ctx = av_buffer_ref(av_buffersink_get_hw_frames_ctx(m_outputFilter)); - - if (int result = avcodec_open2(m_avCodecContext, codec, &options); result < 0) { - qCWarning(PIPEWIRERECORD_LOGGING) << "Could not open codec" << av_err2str(ret); --- -2.46.1 - diff --git a/kpipewire-6.1.5.tar.xz b/kpipewire-6.1.5.tar.xz deleted file mode 100644 index d4850e0..0000000 --- a/kpipewire-6.1.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25b32cfcaff352f0c4acda5746adffd2e3b28b5ff0648521bde8628ca7145a49 -size 149096 diff --git a/kpipewire-6.1.5.tar.xz.sig b/kpipewire-6.1.5.tar.xz.sig deleted file mode 100644 index 9b927a0..0000000 --- a/kpipewire-6.1.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmbgCFcACgkQ11dEg7tX -sY1ypg/+LX5uzdfEqBbZQNtyl7selXiGGlWlwqgB0zbVhLI4KawapP0zU1YTgQtQ -eVjHBF9TdRyN3JgEKeDhAeKxchIau0n7/VNugvLLlyB93vC4Qmg6Dy7szIuiLoIa -tWycxAaPaaF+LLx+WHwYG4ymgWvzkh0+7dYoWn4EBwfrqhqB8ijJexWYawgqEiVh -FdkFiOGPLZ8nbwCkvYFFkxv9cfHmCO4nZpHrfekp8vvSsGY9sngvvjhHc+Uf0eU8 -Q7Onyro768isRP+pPsifZwjLS1JvdMIKHt3+gC9/MTLXsc2kyBSNnlVGFT+JAV6A -fdMt3AuuBeVVJPJ11TiawefjR1KCSh8jdeHNsBmszBvpXTuAcC2pbEF22KOwau7W -qBU15RYl1g9DRL/0h0XzTDHjOdi+IQOmui1ZrO1vNrw+uxA+Zo7dPBSbf7ex4E33 -AEgzQrDiZgk+DBPC3opIl1W4IB1kf+FTu1azqCT5DFR3S5QEA7vLbidaV8T2VGH9 -EE0eZEiGBeKrzj7O8KpclRL2IDuBsBfEQoSiDQU34Pk2Q9Vw9HvL2Au/j/tBzc67 -OT//ng3QXjK/rl2iw9Bj6WZfLODiRGE1edQ79nxfJHZpIl+HTubQxDtlDOQ3bYOd -lqQiy0KgupZ19xbH9BnLrgeEzQM0rp4xgr78rEEcJOQIPOc6WAo= -=t2v3 ------END PGP SIGNATURE----- diff --git a/kpipewire-6.2.0.tar.xz b/kpipewire-6.2.0.tar.xz new file mode 100644 index 0000000..eb92b50 --- /dev/null +++ b/kpipewire-6.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72c07e6c6608b6c5eaa2460d975bf9047489651fb05de5e5b540876529f425b0 +size 149360 diff --git a/kpipewire-6.2.0.tar.xz.sig b/kpipewire-6.2.0.tar.xz.sig new file mode 100644 index 0000000..4b0407c --- /dev/null +++ b/kpipewire-6.2.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmb+j+4ACgkQ11dEg7tX +sY3vvA//eoAg4EYFceZSCoUa7Bi96Rl/cy3HQCDWqOakoBMFxTNH6f+Q1jleBPVh +0TXzqGQpMgx9MQsRJrpeJnoTXKsVUD+TpFDNh5C+eSf4e12G7BJZZoMTPmkWNwLY +itopMgfLtMvYfUIfPMb41lNfNSbPTQy6H7Y+yrQe4QoujPRACDtvLO18tuhdtuwa +zhWV7y+aTbbbOi45STBbMbpYddx7Qo9Lx9PYfZQU4VkAzQHHPHrbbkBKoMMkN6G4 +7VvR5QPrVokd4H0t5X795Zu2V30/zofHTiA8EUu+wchD8helHwUzlxriZcXis1rt +VRtKsuaXV44SsrB+JCjtE4QQXiRNnHEnJbSLnHLUrr23nybSjDYFNBQsaCMBWLWu +6aRNaThm7Sui4MN7rKKs/7YwlrF20si+xPG7gnr8V2ckQhCsBo/OXM41Z2+GXEPu +eP01jW2txlGE9oZBMSH/pa9odzeu11FUUrBx/EOHR94wozLu+EEDKevvLdmurvcK +X8kUHmY30SVCJAv1w9EOOOPofodbx0/UocVHwWuKtDLKry+GfFlOatQDN3B+RqcX +qC/X8AhDaY9C/r+YPZlvlQ99pFfnXyrxELjVZRi/F349/4qxpu5oLnQ2bdq9FYXj +ePkaP11gwnWdYj/n+guxIDgpRuuAN9jjGudEIx5JEoVPgc60Gyw= +=MvNW +-----END PGP SIGNATURE----- diff --git a/kpipewire6.changes b/kpipewire6.changes index 4202fd1..a51adb8 100644 --- a/kpipewire6.changes +++ b/kpipewire6.changes @@ -1,9 +1,52 @@ +------------------------------------------------------------------- +Sat Oct 5 10:44:17 UTC 2024 - Fabian Vogt + +- Update to 6.2.0: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.2.0 +- Changes since 6.1.90: + * update version for new release + * h264vaapi: Use the proper getter for getting the hardware context + +------------------------------------------------------------------- +Thu Oct 3 14:12:07 UTC 2024 - Christophe Marin + +- Drop patch, no longer needed: + * 0001-h264vaapi-Use-the-proper-getter-for-getting-the-hard.patch + ------------------------------------------------------------------- Thu Oct 3 14:08:29 UTC 2024 - Christophe Marin - Add ffmpeg 7.1 compatibility patch: * 0001-h264vaapi-Use-the-proper-getter-for-getting-the-hard.patch +------------------------------------------------------------------- +Tue Sep 17 14:53:30 UTC 2024 - Fabian Vogt + +- Update to 6.1.90: + * New feature release + * For more details see https://kde.org/announcements/plasma/6/6.1.90 +- Changes since 6.1.5: + * update version for new release + * sourcestream: Do not process null streams + * Add missing "pipewireencodedstream.h" include + * Generate wayland code with PRIVATE_CODE + * produce: Use a separate condition_variable for passthrough/output thread + * Guard m_stream in setMaxFramerate + * pipewireproduce.cpp: Add guard to m_stream + * sourcestream: make resilient against pipewire restarts + * Fix some copy-and-paste issues in h264vaapi and libx264 encoders + * Add encoder using libopenh264 (kde#476187) + * Simpler yet more useful handling of KPIPEWIRE_FORCE_ENCODER + * produce: Properly cleanup on deactivate in all cases (kde#488687) + * produce: Destroy PipeWireSourceStream on the right thread (kde#489434) + * gitignore: add VS Code dir + * mediamonitortest: start media session and create dummy output to test playback state + * Use only non external only format modifiers + * Drop implicit modifier shortcut + * Use reserve to reserve space in list + * update version for new release + ------------------------------------------------------------------- Tue Sep 10 14:53:47 UTC 2024 - Fabian Vogt diff --git a/kpipewire6.spec b/kpipewire6.spec index acc5cef..debe48a 100644 --- a/kpipewire6.spec +++ b/kpipewire6.spec @@ -17,7 +17,7 @@ %global kf6_version 6.0.0 -%define qt6_version 6.6.0 +%define qt6_version 6.7.0 %define _sover 6 %define rname kpipewire @@ -27,18 +27,16 @@ %{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')} %bcond_without released Name: kpipewire6 -Version: 6.1.5 +Version: 6.2.0 Release: 0 Summary: PipeWire integration for KDE Plasma License: LGPL-2.0-only AND LGPL-3.0-only URL: https://www.kde.org -Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz +Source: %{rname}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig +Source1: %{rname}-%{version}.tar.xz.sig Source2: plasma.keyring %endif -# PATCH-FIX-UPSTREAM -Patch0: 0001-h264vaapi-Use-the-proper-getter-for-getting-the-hard.patch BuildRequires: kf6-extra-cmake-modules BuildRequires: pkgconfig BuildRequires: qt6-gui-private-devel >= %{qt6_version}