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: fixup Qt OpenGL automake conditionals
Author:  Gregor Jasny <gja...@googlemail.com>
Date:    Fri Jan 18 10:32:23 2019 +0100

(cherry picked from commit e07d1b90190f2b98fe4f5be20406b49ecbe5b3e7)

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

---

http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=23726094a7e797859d0de84d9306aa8aae7fbd7b
diff --git a/configure.ac b/configure.ac
index 1db4658f9387..0ff058c34941 100644
--- a/configure.ac
+++ b/configure.ac
@@ -518,10 +518,10 @@ AM_CONDITIONAL([WITH_DVBV5_REMOTE], [test 
x$enable_libdvbv5  != xno -a x$have_li
 AM_CONDITIONAL([WITH_DYN_LIBV4L],   [test x$enable_dyn_libv4l != xno])
 AM_CONDITIONAL([WITH_V4LUTILS],            [test x$enable_v4l_utils != xno -a 
x$linux_os = xyes])
 AM_CONDITIONAL([WITH_QV4L2],       [test x${qt_pkgconfig} = xtrue -a 
x$enable_qv4l2 != xno])
-AM_CONDITIONAL([WITH_QVIDCAP],     [test x${qt_pkgconfig_gl} = xtrue -a 
x$enable_qvidcap != xno])
+AM_CONDITIONAL([WITH_QVIDCAP],     [test x${qt_desktop_opengl} = xyes -a 
x$enable_qvidcap != xno])
 AM_CONDITIONAL([WITH_V4L_PLUGINS],  [test x$enable_dyn_libv4l != xno -a 
x$enable_shared != xno])
 AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$enable_dyn_libv4l != xno -a 
x$enable_shared != xno])
-AM_CONDITIONAL([WITH_QTGL],        [test x${qt_pkgconfig_gl} = xtrue])
+AM_CONDITIONAL([WITH_QTGL],        [test x${qt_desktop_opengl} = xyes])
 AM_CONDITIONAL([WITH_GCONV],        [test x$enable_gconv = xyes -a 
x$enable_shared == xyes -a x$with_gconvdir != x -a -f 
$with_gconvdir/gconv-modules])
 AM_CONDITIONAL([WITH_V4L2_CTL_LIBV4L], [test x${enable_v4l2_ctl_libv4l} != 
xno])
 AM_CONDITIONAL([WITH_V4L2_CTL_STREAM_TO], [test x${enable_v4l2_ctl_stream_to} 
!= xno])

_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to