Disable QTGL for qt5 because of qv4l2 crash on startup.
Signed-off-by: Peter Seiderer <ps.report@xxxxxxx>
---
configure.ac | 41 +++++++++++++++++++++++++++--------------
1 file changed, 27 insertions(+), 14 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7bf9bf6..245a409 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,29 +131,42 @@ AS_IF([test "x$with_jpeg" != xno],
AM_CONDITIONAL([HAVE_JPEG], [$have_jpeg])
-PKG_CHECK_MODULES(QT, [QtCore >= 4.4 QtGui >= 4.4], [qt_pkgconfig=true], [qt_pkgconfig=false])
+PKG_CHECK_MODULES(QT, [Qt5Core >= 5.0 Qt5Gui >= 5.0 Qt5Widgets >= 5.0], [qt_pkgconfig=true], [qt_pkgconfig=false])
if test "x$qt_pkgconfig" = "xtrue"; then
+ QT_CFLAGS="$QT_CFLAGS -fPIC"
AC_SUBST(QT_CFLAGS)
AC_SUBST(QT_LIBS)
- MOC=`$PKG_CONFIG --variable=moc_location QtCore`
- UIC=`$PKG_CONFIG --variable=uic_location QtCore`
- RCC=`$PKG_CONFIG --variable=rcc_location QtCore`
- if test -z "$RCC"; then
- RCC="rcc"
- fi
+ AC_CHECK_PROGS(MOC, [moc-qt5 moc])
+ AC_CHECK_PROGS(UIC, [uic-qt5 uic])
+ AC_CHECK_PROGS(RCC, [rcc-qt5 rcc])
AC_SUBST(MOC)
AC_SUBST(UIC)
AC_SUBST(RCC)
+# disable QTGL for qt5 because qv4l2 crash
+ qt_pkgconfig_gl=false
else
- AC_MSG_WARN(Qt4 or higher is not available)
+ PKG_CHECK_MODULES(QT, [QtCore >= 4.0 QtGui >= 4.0], [qt_pkgconfig=true], [qt_pkgconfig=false])
+ if test "x$qt_pkgconfig" = "xtrue"; then
+ MOC=`$PKG_CONFIG --variable=moc_location Qt5Core`
+ UIC=`$PKG_CONFIG --variable=uic_location Qt5Core`
+ RCC=`$PKG_CONFIG --variable=rcc_location Qt5Core`
+ if test -z "$RCC"; then
+ RCC="rcc"
+ fi
+ AC_SUBST(MOC)
+ AC_SUBST(UIC)
+ AC_SUBST(RCC)
+ PKG_CHECK_MODULES(QTGL, [QtOpenGL >= 4.8 gl], [qt_pkgconfig_gl=true], [qt_pkgconfig_gl=false])
+ if test "x$qt_pkgconfig_gl" = "xtrue"; then
+ AC_DEFINE([HAVE_QTGL], [1], [qt has opengl support])
+ else
+ AC_MSG_WARN(Qt4 OpenGL is not available)
+ fi
+ else
+ AC_MSG_WARN(Qt4 or higher is not available)
+ fi
fi
-PKG_CHECK_MODULES(QTGL, [QtOpenGL >= 4.8 gl], [qt_pkgconfig_gl=true], [qt_pkgconfig_gl=false])
-if test "x$qt_pkgconfig_gl" = "xtrue"; then
- AC_DEFINE([HAVE_QTGL], [1], [qt has opengl support])
-else
- AC_MSG_WARN(Qt4 OpenGL or higher is not available)
-fi
PKG_CHECK_MODULES(ALSA, [alsa], [alsa_pkgconfig=true], [alsa_pkgconfig=false])
if test "x$alsa_pkgconfig" = "xtrue"; then
--
2.1.2
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
