From: Jan Palus <atler@pld-linux.org>
Date: Sat, 23 Dec 2023 15:20:46 +0000 (+0100)
Subject: bring back condition on ffmpeg 5+ patches from fa199ea with adjustments
X-Git-Tag: auto/th/qt5-qtwebengine-5.15.15-4~1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fqt5-qtwebengine.git;a=commitdiff_plain;h=abdff7895b23125f01c2d46ad3558d50f3189756

bring back condition on ffmpeg 5+ patches from fa199ea with adjustments

- when querying ffmpeg-devel version use --quiet so it does not return
  "package ffmpeg-devel is not installed"
- do not quote arguments passed to _ver_ge as quotes are passed
  literally. since _ver_ge accepts two arguments it meant previously
  effective call was: %{_ver_ge "package ffmpeg-devel} where '"package'
  was first argument wheres 'ffmpeg-devel' was second
---

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index ca85d35..ebab3e9 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 --quiet -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}