[packages/chiaki-ng] - rel 6, upstream fix for ffmpeg 9
baggins
baggins at pld-linux.org
Wed Oct 21 00:03:09 CEST 2026
commit 171b3fa295ddc8e63bcdc239ff67d7ea605ae28e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Oct 21 00:02:42 2026 +0200
- rel 6, upstream fix for ffmpeg 9
chiaki-ng.spec | 4 +++-
ffmpeg9.patch | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 65 insertions(+), 1 deletion(-)
---
diff --git a/chiaki-ng.spec b/chiaki-ng.spec
index 34486b5..1be5db8 100644
--- a/chiaki-ng.spec
+++ b/chiaki-ng.spec
@@ -5,11 +5,12 @@
Summary: PlayStation Remote Play for Everyone
Name: chiaki-ng
Version: 1.10.0
-Release: 5
+Release: 6
License: AGPL v3
Group: X11/Applications/Networking
Source0: https://github.com/streetpea/chiaki-ng/archive/v%{version}/%{name}-%{version}.tar.gz
# Source0-md5: ff577d46e0dab16da0a1d94e16ca2e69
+Patch0: ffmpeg9.patch
URL: https://streetpea.github.io/chiaki-ng/
BuildRequires: Qt6Concurrent-devel
BuildRequires: Qt6Core-devel
@@ -51,6 +52,7 @@ Entertainment LLC.
%prep
%setup -q
+%patch -P0 -p1
%build
mkdir -p build
diff --git a/ffmpeg9.patch b/ffmpeg9.patch
new file mode 100644
index 0000000..ebbbbd9
--- /dev/null
+++ b/ffmpeg9.patch
@@ -0,0 +1,62 @@
+From 82d4253566c49a62b67d50f200f69c9a9f0af7a3 Mon Sep 17 00:00:00 2001
+From: Martin <martin at evenbom.se>
+Date: Thu, 20 Aug 2026 18:29:48 +0200
+Subject: [PATCH] fix for ffmpeg v9(#795), but also keeps support for v <7.1
+
+---
+ gui/src/qmlmainwindow.cpp | 35 +++++++++++++++++++++++++++++++++++
+ 1 file changed, 35 insertions(+)
+
+diff --git a/gui/src/qmlmainwindow.cpp b/gui/src/qmlmainwindow.cpp
+index 936964581..fef508eb7 100644
+--- a/gui/src/qmlmainwindow.cpp
++++ b/gui/src/qmlmainwindow.cpp
+@@ -4637,6 +4637,39 @@ AVBufferRef *QmlMainWindow::vulkanHwDeviceCtx()
+ vkctx->nb_enabled_inst_extensions = placebo_vk_inst->num_extensions;
+ vkctx->enabled_dev_extensions = placebo_vulkan->extensions;
+ vkctx->nb_enabled_dev_extensions = placebo_vulkan->num_extensions;
++
++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(59, 34, 100)
++ vkctx->nb_qf = 0;
++ if (placebo_vulkan->queue_graphics.index >= 0 && placebo_vulkan->queue_graphics.count > 0) {
++ AVVulkanDeviceQueueFamily &qf = vkctx->qf[vkctx->nb_qf++];
++ qf.idx = placebo_vulkan->queue_graphics.index;
++ qf.num = placebo_vulkan->queue_graphics.count;
++ qf.flags = VK_QUEUE_GRAPHICS_BIT;
++ qf.video_caps = static_cast<VkVideoCodecOperationFlagBitsKHR>(0);
++ }
++ if (placebo_vulkan->queue_transfer.index >= 0 && placebo_vulkan->queue_transfer.count > 0) {
++ AVVulkanDeviceQueueFamily &qf = vkctx->qf[vkctx->nb_qf++];
++ qf.idx = placebo_vulkan->queue_transfer.index;
++ qf.num = placebo_vulkan->queue_transfer.count;
++ qf.flags = VK_QUEUE_TRANSFER_BIT;
++ qf.video_caps = static_cast<VkVideoCodecOperationFlagBitsKHR>(0);
++ }
++ if (placebo_vulkan->queue_compute.index >= 0 && placebo_vulkan->queue_compute.count > 0) {
++ AVVulkanDeviceQueueFamily &qf = vkctx->qf[vkctx->nb_qf++];
++ qf.idx = placebo_vulkan->queue_compute.index;
++ qf.num = placebo_vulkan->queue_compute.count;
++ qf.flags = VK_QUEUE_COMPUTE_BIT;
++ qf.video_caps = static_cast<VkVideoCodecOperationFlagBitsKHR>(0);
++ }
++ if (vk_decode_queue_index >= 0) {
++ AVVulkanDeviceQueueFamily &qf = vkctx->qf[vkctx->nb_qf++];
++ qf.idx = vk_decode_queue_index;
++ qf.num = 1;
++ qf.flags = VK_QUEUE_VIDEO_DECODE_BIT_KHR;
++ qf.video_caps = static_cast<VkVideoCodecOperationFlagBitsKHR>(
++ VK_VIDEO_CODEC_OPERATION_DECODE_H264_BIT_KHR | VK_VIDEO_CODEC_OPERATION_DECODE_H265_BIT_KHR);
++ }
++#else
+ vkctx->queue_family_index = placebo_vulkan->queue_graphics.index;
+ vkctx->nb_graphics_queues = placebo_vulkan->queue_graphics.count;
+ vkctx->queue_family_tx_index = placebo_vulkan->queue_transfer.index;
+@@ -4645,6 +4678,8 @@ AVBufferRef *QmlMainWindow::vulkanHwDeviceCtx()
+ vkctx->nb_comp_queues = placebo_vulkan->queue_compute.count;
+ vkctx->queue_family_decode_index = vk_decode_queue_index;
+ vkctx->nb_decode_queues = 1;
++#endif
++
+ vkctx->lock_queue = [](struct AVHWDeviceContext *dev_ctx, uint32_t queue_family, uint32_t index) {
+ auto vk = reinterpret_cast<pl_vulkan>(dev_ctx->user_opaque);
+ vk->lock_queue(vk, queue_family, index);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chiaki-ng.git/commitdiff/171b3fa295ddc8e63bcdc239ff67d7ea605ae28e
More information about the pld-cvs-commit
mailing list