public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Troy Dawson <tdawson@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/k3b] epel9-next: Apply patch for ffmpeg7
Date: Mon, 20 Jul 2026 19:53:13 GMT	[thread overview]
Message-ID: <178457719329.1.8493796159355197729.rpms-k3b-9b0af1cd8ad9@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/k3b
Branch : epel9-next
Commit : 9b0af1cd8ad91e617296ad5d0a4a5839d1fac3a5
Author : Troy Dawson <tdawson@redhat.com>
Date   : 2026-07-20T12:52:56-07:00
Stats  : +40/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/k3b/c/9b0af1cd8ad91e617296ad5d0a4a5839d1fac3a5?branch=epel9-next

Log:
Apply patch for ffmpeg7

---
diff --git a/k3b-23.08-ffmpeg7-changes.patch b/k3b-23.08-ffmpeg7-changes.patch
new file mode 100644
index 0000000..2b92b22
--- /dev/null
+++ b/k3b-23.08-ffmpeg7-changes.patch
@@ -0,0 +1,34 @@
+From fad077ba1d85dfb43775067294cb6625372051eb Mon Sep 17 00:00:00 2001
+From: Troy Dawson <tdawson@redhat.com>
+Date: Fri, 17 Jul 2026 13:19:34 -0700
+Subject: [PATCH] ffmpeg7 patch
+
+---
+ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+index c407a55..6dd18db 100644
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -140,7 +140,7 @@ bool K3bFFMpegFile::open()
+ 
+     d->sampleFormat = d->codecContext->sample_fmt;
+     d->isSpacious = ::av_sample_fmt_is_planar(d->sampleFormat) &&
+-        d->codecContext->channels > 1;
++        d->codecContext->ch_layout.nb_channels > 1;
+     d->packet = ::av_packet_alloc();
+ 
+     // dump some debugging info
+@@ -185,7 +185,7 @@ int K3bFFMpegFile::sampleRate() const
+ 
+ int K3bFFMpegFile::channels() const
+ {
+-    return d->codecContext->channels;
++    return d->codecContext->ch_layout.nb_channels;
+ }
+ 
+ 
+-- 
+2.52.0
+

diff --git a/k3b.spec b/k3b.spec
index e9f8717..3c08c47 100644
--- a/k3b.spec
+++ b/k3b.spec
@@ -10,7 +10,7 @@ Name:    k3b
 Summary: CD/DVD/Blu-ray burning application
 Epoch:   1
 Version: 23.08.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL-2.0-or-later
 URL:     http://www.k3b.org/
@@ -29,6 +29,8 @@ Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{name
 Patch10: prefer-wodim.patch
 
 ## downstream patches
+# ffmpeg 7 patch
+Patch100: k3b-23.08-ffmpeg7-changes.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: libappstream-glib
@@ -177,6 +179,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.k3b.deskt
 
 
 %changelog
+* Fri Jul 17 2026 Troy Dawson <tdawson@redhat.com> - 1:23.08.5-2
+- Apply patch for ffmpeg7
+
 * Thu Feb 15 2024 Alessandro Astone <ales.astone@gmail.com> - 1:23.08.5-1
 - 23.08.5
 

                 reply	other threads:[~2026-07-20 19:53 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178457719329.1.8493796159355197729.rpms-k3b-9b0af1cd8ad9@fedoraproject.org \
    --to=tdawson@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox