[packages/qt5-qtwebkit] - qtmultimedia conflicts with gstreamer

qboosh qboosh at pld-linux.org
Tue Dec 22 22:02:38 CET 2020


commit d8711f9d88cefcc5522867df8c83b18ec6f1af15
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Dec 22 22:03:18 2020 +0100

    - qtmultimedia conflicts with gstreamer

 qt5-qtwebkit.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 7a5ab33..b437cfb 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -6,7 +6,7 @@
 # -- build targets
 %bcond_with	doc		# Documentation
 # -- features
-%bcond_without	qtmultimedia	# QtMultimedia support
+%bcond_with	qtmultimedia	# QtMultimedia support (instead of GStreamer)
 %bcond_without	seccomp		# WebProcess seccomp filters
 
 %if %{with bootstrap}
@@ -208,7 +208,7 @@ cmake \
 	-DCMAKE_C_FLAGS_RELEASE:STRING="-DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELEASE:STRING="-DNDEBUG" \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-	%{?with_qtmultimedia:-DUSE_QT_MULTIMEDIA:BOOL=ON} \
+	%{?with_qtmultimedia:-DUSE_GSTREAMER:BOOL=OFF -DUSE_QT_MULTIMEDIA:BOOL=ON} \
 	%{?with_doc:-DGENERATE_DOCUMENTATION=ON} \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/d8711f9d88cefcc5522867df8c83b18ec6f1af15



More information about the pld-cvs-commit mailing list