This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: Qt5: test for Desktop OpenGL presence Author: Gregor Jasny <gja...@googlemail.com> Date: Fri Jan 18 00:37:53 2019 +0100 Ubuntu ships Qt5 for armel, armhf, and arm64 with OpenGL ES instead of Desktop OpenGL which is required by qv4l for OpenGL acceleration. (cherry picked from commit a280b08f4cbd1a82d25a6fc63726f40ba9bf8f9b) configure.ac | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=0ca43f8efaf0dbc152da793912e2093564429fd4 diff --git a/configure.ac b/configure.ac index 63d606a31a76..1db4658f9387 100644 --- a/configure.ac +++ b/configure.ac @@ -232,6 +232,32 @@ if test "x$qt_pkgconfig" = "xtrue"; then PKG_CHECK_MODULES(QT5GL, [Qt5OpenGL >= 5.0 gl], [qt_pkgconfig_gl=true], [qt_pkgconfig_gl=false]) fi if test "x$qt_pkgconfig_gl" = "xtrue"; then + SAVED_CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${CXXFLAGS} ${QT_CFLAGS} ${QT5GL_CFLAGS}" + AC_LANG_PUSH([C++]) + AC_MSG_CHECKING([for Qt5 Desktop OpenGL]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE( +[[ +#define GL_GLEXT_PROTOTYPES +#define QT_NO_OPENGL_ES_2 + +#include <QGLWidget> +#include <QGLShader> +#include <QGLShaderProgram> +#include <QGLFunctions> + +#ifndef GL_UNSIGNED_INT_8_8_8_8 +#error Missing OpenGL Extensions +#endif +]])], + [qt_desktop_opengl=yes], + [qt_desktop_opengl=no]) + AC_MSG_RESULT([$qt_desktop_opengl]) + CXXFLAGS="${SAVED_CXXFLAGS}" + AC_LANG_POP + fi + + if test "x$qt_desktop_opengl" = "xyes"; then QTGL_CFLAGS="$QT5GL_CFLAGS -fPIC" QTGL_LIBS="$QT5GL_LIBS" AC_SUBST(QT_CFLAGS) @@ -248,7 +274,7 @@ if test "x$qt_pkgconfig" = "xtrue"; then else QT_VERSION="v5" fi - AC_MSG_WARN(Qt5 OpenGL is not available) + AC_MSG_WARN(Qt5 Desktop OpenGL is not available) fi else PKG_CHECK_MODULES(QT, [QtCore >= 4.0 QtGui >= 4.0], [qt_pkgconfig=true], [qt_pkgconfig=false]) _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
