[packages/qt5-qtwebengine] apply ffmpeg 5 patches only when building with ffmpeg >= 5
atler
atler at pld-linux.org
Fri Dec 22 21:31:00 CET 2023
commit fa199ea5bc4181829b20bf261830c22f8fe306e4
Author: Jan Palus <atler at pld-linux.org>
Date: Fri Dec 22 21:17:27 2023 +0100
apply ffmpeg 5 patches only when building with ffmpeg >= 5
they break build against ffmpeg 4
qt5-qtwebengine.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 4597990..ace9477 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -122,6 +122,8 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define qt5bindir %(qtpaths-qt5 --binaries-dir)
+%define ffmpeg_ver %(rpm -q --qf=%%{V} ffmpeg-devel)
+
%description
Qt is a cross-platform application and UI framework. Using Qt, you can
write web-enabled applications once and deploy them across desktop,
@@ -285,10 +287,12 @@ Przykłady do biblioteki Qt5 WebEngine.
%endif
%patch1 -p1
%patch2 -p1
-%patch3 -p1 -d src/3rdparty
%patch4 -p1 -d src/3rdparty
%patch5 -p1 -d src/3rdparty/chromium
+%if %{_ver_ge "%ffmpeg_ver" "5"}
+%patch3 -p1 -d src/3rdparty
%patch6 -p1 -d src/3rdparty/chromium
+%endif
%{qt5bindir}/syncqt.pl -version %{version}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/fa199ea5bc4181829b20bf261830c22f8fe306e4
More information about the pld-cvs-commit
mailing list