sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (bf7320cbd6e12a746767e6a679f034103eb18b1f)
- From: Treeve Jelbert <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (bf7320cbd6e12a746767e6a679f034103eb18b1f)
- Date: Sat, 20 Sep 2025 07:33:02 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:
Changes.kde6 | 1
kde-plasma/kpipewire/HISTORY | 2
kde-plasma/kpipewire/PRE_BUILD | 3
kde-plasma/kpipewire/patches/0001-ffmpeg8-fix.patch | 66
++++++++++++++++++++
4 files changed, 72 insertions(+)
New commits:
commit bf7320cbd6e12a746767e6a679f034103eb18b1f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
kpipewire - fix for ffmpeg8
diff --git a/Changes.kde6 b/Changes.kde6
index 40d7840..20e50f8 100644
--- a/Changes.kde6
+++ b/Changes.kde6
@@ -1,5 +1,6 @@
KDE6 status
+2025-09-19 kpipewire/patches ; fix for ffmpeg8
2025-09-13 krunner - tweak depends
2025-09-12 kde-fw* 6.18.0
2025-09-10 kde* kde => 25.08.1
diff --git a/kde-plasma/kpipewire/HISTORY b/kde-plasma/kpipewire/HISTORY
new file mode 100644
index 0000000..bf1ccfb
--- /dev/null
+++ b/kde-plasma/kpipewire/HISTORY
@@ -0,0 +1,2 @@
+2025-09-18 Treeve Jelbert <treeve AT sourcemage.org>
+ * patches/* PRE_BUILD: added, fix for ffmpeg8
diff --git a/kde-plasma/kpipewire/PRE_BUILD b/kde-plasma/kpipewire/PRE_BUILD
new file mode 100755
index 0000000..242d7f2
--- /dev/null
+++ b/kde-plasma/kpipewire/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build
+cd $SOURCE_DIRECTORY &&
+apply_patch_dir patches
diff --git a/kde-plasma/kpipewire/patches/0001-ffmpeg8-fix.patch
b/kde-plasma/kpipewire/patches/0001-ffmpeg8-fix.patch
new file mode 100644
index 0000000..ae3e17c
--- /dev/null
+++ b/kde-plasma/kpipewire/patches/0001-ffmpeg8-fix.patch
@@ -0,0 +1,66 @@
+From 8205c62d0a684bf8fbc44479cea8a13f2915db88 Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Fri, 19 Sep 2025 13:55:35 +0200
+Subject: [PATCH] ffmpeg8 fix
+
+---
+ src/h264vaapiencoder.cpp | 7 ++++++-
+ src/libopenh264encoder.cpp | 6 ++++++
+ src/libx264encoder.cpp | 6 ++++++
+ 3 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/src/h264vaapiencoder.cpp b/src/h264vaapiencoder.cpp
+index 0cf251b..e9c87d2 100644
+--- a/src/h264vaapiencoder.cpp
++++ b/src/h264vaapiencoder.cpp
+@@ -127,7 +127,12 @@ bool H264VAAPIEncoder::initialize(const QSize &size)
+ } else {
+ m_avCodecContext->global_quality = 35;
+ }
+-
++// fix for ffmpeg8
++#ifndef FF_PROFILE_H264_MAIN
++#define FF_PROFILE_H264_MAIN AV_PROFILE_H264_MAIN
++#define FF_PROFILE_H264_HIGH AV_PROFILE_H264_HIGH
++#define FF_PROFILE_H264_CONSTRAINED_BASELINE
AV_PROFILE_H264_CONSTRAINED_BASELINE
++#endif
+ switch (m_profile) {
+ case H264Profile::Baseline:
+ m_avCodecContext->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE;
+diff --git a/src/libopenh264encoder.cpp b/src/libopenh264encoder.cpp
+index db6ed4d..8ff48d1 100644
+--- a/src/libopenh264encoder.cpp
++++ b/src/libopenh264encoder.cpp
+@@ -55,6 +55,12 @@ bool LibOpenH264Encoder::initialize(const QSize &size)
+ // "q" here stands for "quantization", but that effectively impacts
quality.
+ m_avCodecContext->qmin = m_avCodecContext->qmax =
percentageToAbsoluteQuality(m_quality);
+ }
++// fix for ffmpeg8
++#ifndef FF_PROFILE_H264_MAIN
++#define FF_PROFILE_H264_MAIN AV_PROFILE_H264_MAIN
++#define FF_PROFILE_H264_HIGH AV_PROFILE_H264_HIGH
++#define FF_PROFILE_H264_CONSTRAINED_BASELINE
AV_PROFILE_H264_CONSTRAINED_BASELINE
++#endif
+
+ switch (m_profile) {
+ case H264Profile::Baseline:
+diff --git a/src/libx264encoder.cpp b/src/libx264encoder.cpp
+index d9fe44f..b4d20ba 100644
+--- a/src/libx264encoder.cpp
++++ b/src/libx264encoder.cpp
+@@ -66,6 +66,12 @@ bool LibX264Encoder::initialize(const QSize &size)
+ m_avCodecContext->global_quality = 35;
+ }
+
++// fix for ffmpeg8
++#ifndef FF_PROFILE_H264_MAIN
++#define FF_PROFILE_H264_MAIN AV_PROFILE_H264_MAIN
++#define FF_PROFILE_H264_HIGH AV_PROFILE_H264_HIGH
++#define FF_PROFILE_H264_BASELINE AV_PROFILE_H264_BASELINE
++#endif
+ switch (m_profile) {
+ case H264Profile::Baseline:
+ m_avCodecContext->profile = FF_PROFILE_H264_BASELINE;
+--
+2.51.0
+
- [[SM-Commit] ] GIT changes to master grimoire by Treeve Jelbert (bf7320cbd6e12a746767e6a679f034103eb18b1f), Treeve Jelbert, 09/20/2025
Archive powered by MHonArc 2.6.24.