From: Jan Palus <atler@pld-linux.org>
Date: Fri, 22 Dec 2023 23:51:37 +0000 (+0100)
Subject: Revert "apply ffmpeg 5 patches only when building with ffmpeg >= 5"
X-Git-Tag: auto/th/qt5-qtwebengine-5.15.15-3
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=6cb5c281fd849aae0b1f95798eb1326594371f9d;hp=01c0b8ac1cba82efff6a0f437ac150c42570d0a6;p=packages%2Fqt5-qtwebengine.git

Revert "apply ffmpeg 5 patches only when building with ffmpeg >= 5"

rpm-specdump cannot deal with combination of this specific %if and
%ffmpeg_ver having dash in "ffmpeg-devel". get it out of the way for a
rebuild.

This reverts commit fa199ea5bc4181829b20bf261830c22f8fe306e4.
---

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 0f9e18c..ca85d35 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -122,8 +122,6 @@ 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,
@@ -287,12 +285,10 @@ 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}