[packages/qt6] add qtwebengine_system_ffmpeg bcond

atler atler at pld-linux.org
Tue Oct 17 11:14:44 CEST 2023


commit ede7cb2e8b318535f307e22bb33d5bee16d237fd
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Oct 17 11:12:43 2023 +0200

    add qtwebengine_system_ffmpeg bcond
    
    qtwebengine needs ffmpeg < 5 as of this writing, so use internal ffmpeg
    4 when building qtwebengine.
    
    keep ffmpeg-devel BR for qtmultimedia ffmpeg plugin

 qt6.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/qt6.spec b/qt6.spec
index 2be0cff..be9d787 100644
--- a/qt6.spec
+++ b/qt6.spec
@@ -58,6 +58,8 @@
 %bcond_with	sse42		# use SSE4.2 instructions (the same)
 %bcond_with	avx		# use AVX instructions (Intel since Sandy Bridge, AMD since Bulldozer)
 %bcond_with	avx2		# use AVX2 instructions (Intel since Haswell)
+# -- system libraries
+%bcond_with	qtwebengine_system_ffmpeg	# use system FFmpeg in qtwebengine
 
 %ifnarch %{ix86} %{x8664} x32 sparc sparcv9 alpha ppc
 %undefine	with_ibase
@@ -149,6 +151,9 @@ BuildRequires:	dbus-devel >= 1.2
 BuildRequires:	double-conversion-devel
 %{?with_fbx:BuildRequires:	fbxsdk-devel}
 BuildRequires:	ffmpeg-devel
+%if %{with qtwebengine} && %{with qtwebengine_system_ffmpeg}
+BuildRequires:	ffmpeg-devel < 5.0
+%endif
 %{?with_qtwebengine:BuildRequires:	flex}
 BuildRequires:	flite-devel
 BuildRequires:	fontconfig-devel
@@ -3742,7 +3747,7 @@ cd build
 	-DQT_FEATURE_system_zlib=ON \
 	-DQT_FEATURE_webengine_proprietary_codecs=ON \
 	-DQT_FEATURE_webengine_system_alsa=ON \
-	-DQT_FEATURE_webengine_system_ffmpeg=ON \
+	%{cmake_on_off qtwebengine_system_ffmpeg QT_FEATURE_webengine_system_ffmpeg} \
 	-DQT_FEATURE_webengine_system_freetype=ON \
 	-DQT_FEATURE_webengine_system_glib=ON \
 	-DQT_FEATURE_webengine_system_harfbuzz=ON \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt6.git/commitdiff/ede7cb2e8b318535f307e22bb33d5bee16d237fd



More information about the pld-cvs-commit mailing list