[packages/qt5-qtwebengine] - rel 4, fix build with ffmpeg 9

baggins baggins at pld-linux.org
Fri Oct 23 12:44:20 CEST 2026


commit b5aaf28f6c68293dcd25bd20a7a630b17bc6717a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Oct 23 12:43:53 2026 +0200

    - rel 4, fix build with ffmpeg 9

 ffmpeg9.patch        | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 qt5-qtwebengine.spec |  4 +++-
 2 files changed, 64 insertions(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index e82536b..ce43c39 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -18,7 +18,7 @@ Summary:	The Qt5 WebEngine library
 Summary(pl.UTF-8):	Biblioteka Qt5 WebEngine
 Name:		qt5-%{orgname}
 Version:	%{base_version}.19
-Release:	3
+Release:	4
 License:	LGPL v3 or GPL v2 or GPL v3 or commercial
 Group:		X11/Libraries
 Source0:	https://download.qt.io/archive/qt/5.15/%{version}/submodules/%{orgname}-everywhere-opensource-src-%{version}.tar.xz
@@ -36,6 +36,7 @@ Patch10:	includes.patch
 Patch11:	glibc2.43.patch
 Patch12:	ffmpeg7.patch
 Patch13:	ffmpeg8.patch
+Patch14:	ffmpeg9.patch
 URL:		https://www.qt.io/
 BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
 BuildRequires:	Qt5Designer-devel >= %{qttools_ver}
@@ -310,6 +311,7 @@ Przykłady do biblioteki Qt5 WebEngine.
 %patch -P11 -p2
 %patch -P12 -p1
 %patch -P13 -p1
+%patch -P14 -p1
 
 %if %{without system_re2}
 # avoid finding system re2
diff --git a/ffmpeg9.patch b/ffmpeg9.patch
new file mode 100644
index 0000000..908c006
--- /dev/null
+++ b/ffmpeg9.patch
@@ -0,0 +1,61 @@
+--- qtwebengine/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter.cc.orig	2026-10-23 12:28:53.878423648 +0200
++++ qtwebengine/src/3rdparty/chromium/media/filters/ffmpeg_aac_bitstream_converter.cc	2026-08-11 14:42:19.000000000 +0200
+@@ -63,17 +68,17 @@
+   hdr[1] |= 1;
+ 
+   switch (audio_profile) {
+-    case FF_PROFILE_AAC_MAIN:
++    case AV_PROFILE_AAC_MAIN:
+       break;
+-    case FF_PROFILE_AAC_HE:
+-    case FF_PROFILE_AAC_HE_V2:
+-    case FF_PROFILE_AAC_LOW:
++    case AV_PROFILE_AAC_HE:
++    case AV_PROFILE_AAC_HE_V2:
++    case AV_PROFILE_AAC_LOW:
+       hdr[2] |= (1 << 6);
+       break;
+-    case FF_PROFILE_AAC_SSR:
++    case AV_PROFILE_AAC_SSR:
+       hdr[2] |= (2 << 6);
+       break;
+-    case FF_PROFILE_AAC_LTP:
++    case AV_PROFILE_AAC_LTP:
+       hdr[2] |= (3 << 6);
+       break;
+     default:
+@@ -196,14 +201,22 @@
+       audio_profile_ != stream_codec_parameters_->profile ||
+       sample_rate_index_ != sample_rate_index ||
+       channel_configuration_ !=
++#if LIBAVCODEC_VERSION_MAJOR > 60
+           stream_codec_parameters_->ch_layout.nb_channels ||
++#else
++          stream_codec_parameters_->channels ||
++#endif
+       frame_length_ != header_plus_packet_size) {
+     header_generated_ =
+         GenerateAdtsHeader(stream_codec_parameters_->codec_id,
+                            0,  // layer
+                            stream_codec_parameters_->profile, sample_rate_index,
+                            0,  // private stream
++#if LIBAVCODEC_VERSION_MAJOR > 60
+                            stream_codec_parameters_->ch_layout.nb_channels,
++#else
++                           stream_codec_parameters_->channels,
++#endif
+                            0,  // originality
+                            0,  // home
+                            0,  // copyrighted_stream
+@@ -215,7 +228,11 @@
+     codec_ = stream_codec_parameters_->codec_id;
+     audio_profile_ = stream_codec_parameters_->profile;
+     sample_rate_index_ = sample_rate_index;
++#if LIBAVCODEC_VERSION_MAJOR > 60
+     channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels;
++#else
++    channel_configuration_ = stream_codec_parameters_->channels;
++#endif
+     frame_length_ = header_plus_packet_size;
+   }
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/b5aaf28f6c68293dcd25bd20a7a630b17bc6717a



More information about the pld-cvs-commit mailing list