[vlc-devel] [PATCH 3.0 11/41] contrib: Don't build Qt with OpenGL and Qt subproject requiring OpenGL for windows/arm

[Steve Lhomme]

From: Martin Storsjö <martin at martin.st>

Windows on ARM/ARM64 lacks OpenGL.

To properly support these features, Qt would need to be built with
ANGLE, to allow running the same features on top of Direct3D instead,
but cross compiling ANGLE is nontrivial.

(cherry picked from commit 844e2be43f4290135a6ac48bfd82fe593ec8a86f) (edited)

edited:
- always force no-opengl as we used to
- this branch doesn't have qtdeclarative, qtgraphicaleffects, qtquickcontrols2

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
 contrib/src/qt/rules.mak | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index f72fd60005..21733d53d0 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -31,6 +31,8 @@ endif
 endif
 	$(MOVE)
 
+QT_OPENGL := -no-opengl
+
 ifdef HAVE_MACOSX
 QT_PLATFORM := -platform darwin-g++
 endif
@@ -48,7 +50,7 @@ endif
 endif
 
 QT_CONFIG := -static -opensource -confirm-license -no-pkg-config \
-	-no-sql-sqlite -no-gif -qt-libjpeg -no-openssl -no-opengl -no-dbus \
+	-no-sql-sqlite -no-gif -qt-libjpeg -no-openssl $(QT_OPENGL) -no-dbus \
 	-no-sql-odbc -no-pch \
 	-no-compile-examples -nomake examples
 
-- 
2.26.2