From patchwork Fri Dec 5 20:17:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 27343 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XwzJm-0000Dt-TS; Fri, 05 Dec 2014 21:17:34 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-8) with esmtp id 1XwzJk-0002Fk-lY; Fri, 05 Dec 2014 21:17:34 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751559AbaLEURa (ORCPT + 1 other); Fri, 5 Dec 2014 15:17:30 -0500 Received: from mout.gmx.net ([212.227.17.22]:65229 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750975AbaLEUR3 (ORCPT ); Fri, 5 Dec 2014 15:17:29 -0500 Received: from linux.local ([94.216.58.185]) by mail.gmx.com (mrgmx103) with ESMTPSA (Nemesis) id 0LZiQy-1Xa4de1bsC-00lWy1 for ; Fri, 05 Dec 2014 21:17:26 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v2 1/3] configure.ac: add qt5 detection support Date: Fri, 5 Dec 2014 21:17:23 +0100 Message-Id: <1417810645-21753-1-git-send-email-ps.report@gmx.net> X-Mailer: git-send-email 2.1.2 X-Provags-ID: V03:K0:VA6pJCeHK3gca1a+R4I3gidpLKmVcix8foUK4vZlIdeEYilxy3d EgCU+ehmfUdIkTLsYbmwOx3yW2UzGNMGDvoum1WFsguEQiNW7wV4256Ez1Ly76TEN4ZMTpN pKdJB2Vp/16wupDNiTQ2eQu67x/8EwFl07+Tnu0HAp6+lh1AN41kUuJp2AnS8MGoPn2ok7V MYK0eQZgGinNZ15dt+KaA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.12.5.200929 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __SUBJ_ALPHA_NEGATE 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' Disable QTGL for qt5 because of qv4l2 crash on startup. Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - fix configure log output for qt5 - fix qt4 detection --- configure.ac | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac index 7bf9bf6..588dd9e 100644 --- a/configure.ac +++ b/configure.ac @@ -131,29 +131,43 @@ 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(QT5, [Qt5Core >= 5.0 Qt5Gui >= 5.0 Qt5Widgets >= 5.0], [qt_pkgconfig=true], [qt_pkgconfig=false]) if test "x$qt_pkgconfig" = "xtrue"; then + QT_CFLAGS="$QT5_CFLAGS -fPIC" + QT_LIBS="$QT5_LIBS" 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 QtCore` + UIC=`$PKG_CONFIG --variable=uic_location QtCore` + RCC=`$PKG_CONFIG --variable=rcc_location QtCore` + 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