From patchwork Mon Dec 15 21:02:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 5497691 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2D6639F1CD for ; Mon, 15 Dec 2014 21:02:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C18620A1B for ; Mon, 15 Dec 2014 21:02:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1E31420A20 for ; Mon, 15 Dec 2014 21:02:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750987AbaLOVCY (ORCPT ); Mon, 15 Dec 2014 16:02:24 -0500 Received: from mout.gmx.net ([212.227.15.15]:63464 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750783AbaLOVCX (ORCPT ); Mon, 15 Dec 2014 16:02:23 -0500 Received: from linux.local ([188.99.124.14]) by mail.gmx.com (mrgmx003) with ESMTPSA (Nemesis) id 0MH0eg-1YDKMp2fAo-00DnaL for ; Mon, 15 Dec 2014 22:02:21 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH 1/2] qv4l2: enable qt5 opengl build Date: Mon, 15 Dec 2014 22:02:19 +0100 Message-Id: <1418677340-8769-1-git-send-email-ps.report@gmx.net> X-Mailer: git-send-email 2.1.2 X-Provags-ID: V03:K0:vB2I8LErVxJEkragk39MObNeqRZoj4iR0c/1T3lGETuukBeB2sq b3eQhIUmH6M+0WBRQlxVMP00CaqVTiXO9NEbe0tfBk2aX72KsOCtDY/HxMYtKJ6CpqEi5Ox TAHRYR2U+kTQePRtNsJ8j2AemqdGWlVf+6y81Xs8xWHQXCGRprGe3yayevwzRbFE7TJFmRF X50kUUgZjnHCgFzMDeYYQ== 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-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Peter Seiderer --- configure.ac | 12 ++++++++++-- utils/qv4l2/qv4l2.pro | 7 ++----- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 588dd9e..dce2848 100644 --- a/configure.ac +++ b/configure.ac @@ -143,8 +143,16 @@ if test "x$qt_pkgconfig" = "xtrue"; then AC_SUBST(MOC) AC_SUBST(UIC) AC_SUBST(RCC) -# disable QTGL for qt5 because qv4l2 crash - qt_pkgconfig_gl=false + PKG_CHECK_MODULES(QT5GL, [Qt5OpenGL >= 5.0 gl], [qt_pkgconfig_gl=true], [qt_pkgconfig_gl=false]) + if test "x$qt_pkgconfig_gl" = "xtrue"; then + QTGL_CFLAGS="$QT5GL_CFLAGS -fPIC" + QTGL_LIBS="$QT5GL_LIBS" + AC_SUBST(QT_CFLAGS) + AC_SUBST(QT_LIBS) + AC_DEFINE([HAVE_QTGL], [1], [qt has opengl support]) + else + AC_MSG_WARN(Qt5 OpenGL is not available) + fi else PKG_CHECK_MODULES(QT, [QtCore >= 4.0 QtGui >= 4.0], [qt_pkgconfig=true], [qt_pkgconfig=false]) if test "x$qt_pkgconfig" = "xtrue"; then diff --git a/utils/qv4l2/qv4l2.pro b/utils/qv4l2/qv4l2.pro index 82500af..a2106d0 100644 --- a/utils/qv4l2/qv4l2.pro +++ b/utils/qv4l2/qv4l2.pro @@ -8,12 +8,9 @@ CONFIG += debug greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -# -# qt5: opengl support for disabled (will crash on startup) -# -# qt4: to disable opengl suppport comment out the following +# opengl: to disable opengl suppport comment out the following # line and the line '#define HAVE_QTGL 1' from ../../config.h -lessThan(QT_MAJOR_VERSION, 5): QT += opengl +QT += opengl INCLUDEPATH += $$PWD/../.. INCLUDEPATH += $$PWD/../v4l2-ctl/