[packages/qt5-qtwebengine] Revert "apply ffmpeg 5 patches only when building with ffmpeg >= 5"

atler atler at pld-linux.org
Sat Dec 23 02:47:00 CET 2023


commit 6cb5c281fd849aae0b1f95798eb1326594371f9d
Author: Jan Palus <atler at pld-linux.org>
Date:   Sat Dec 23 00:51:37 2023 +0100

    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.

 qt5-qtwebengine.spec | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
---
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}
 
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list