From patchwork Fri Dec 5 20:17:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 5445791 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 1A7589F4DC for ; Fri, 5 Dec 2014 20:17:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3F991201C0 for ; Fri, 5 Dec 2014 20:17:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 58AF12024D for ; Fri, 5 Dec 2014 20:17:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751502AbaLEURb (ORCPT ); Fri, 5 Dec 2014 15:17:31 -0500 Received: from mout.gmx.net ([212.227.17.21]:61147 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751221AbaLEUR3 (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 0MN1Gu-1Y3ZxG3ey8-006iVZ for ; Fri, 05 Dec 2014 21:17:26 +0100 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v2 3/3] qv4l2: update qmake project file Date: Fri, 5 Dec 2014 21:17:25 +0100 Message-Id: <1417810645-21753-3-git-send-email-ps.report@gmx.net> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1417810645-21753-1-git-send-email-ps.report@gmx.net> References: <1417810645-21753-1-git-send-email-ps.report@gmx.net> X-Provags-ID: V03:K0:4wlD9nkjpBFq/1U5fpwDIWZEGiTwRc5zTINMUuwlpcWQt2YegCc yigimFEG7R/Ewpn6NY6EmSzJmUI3QwOI8LmU93bpZ0en9NkMlD49xRzlGbDGSR91qcer/4W X96NcDmksueNTNjQQQy3wwdRMndO9P791u4vzoIjZPIwx1An6yva0MdBRcCT35f54emw15S jlx+rKLAcyefR+mguuYwQ== 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 --- Changes v1 -> v2: - fix out of tree qmake build (add PWD to library paths) - fix opengl support (qt4 only) and add disabling hint --- utils/qv4l2/qv4l2.pro | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/utils/qv4l2/qv4l2.pro b/utils/qv4l2/qv4l2.pro index 7ab39cc..19a046a 100644 --- a/utils/qv4l2/qv4l2.pro +++ b/utils/qv4l2/qv4l2.pro @@ -1,14 +1,52 @@ ###################################################################### -# Automatically generated by qmake (1.07a) Sat Jun 17 12:35:16 2006 +# qmake project file for qv4l2 ###################################################################### TEMPLATE = app INCLUDEPATH += . ../libv4l2util ../../lib/include ../../include 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 +# line and the line '#define HAVE_QTGL 1' from ../../config.h +lessThan(QT_MAJOR_VERSION, 5): QT += opengl + +INCLUDEPATH += /home/seiderer/Work/v4l_utils/v4l-utils +INCLUDEPATH += /home/seiderer/Work/v4l_utils/v4l-utils/utils/v4l2-ctl/ +INCLUDEPATH += /home/seiderer/Work/v4l_utils/v4l-utils/utils/v4l2-compliance + # Input -HEADERS += qv4l2.h general-tab.h capture-win.h -SOURCES += qv4l2.cpp general-tab.cpp ctrl-tab.cpp capture-win.cpp -LIBS += -L../../lib/libv4l2 -lv4l2 -L../../lib/libv4lconvert -lv4lconvert -lrt -L../libv4l2util -lv4l2util -ldl -ljpeg +HEADERS += alsa_stream.h +HEADERS += capture-win-gl.h +HEADERS += capture-win.h +HEADERS += capture-win-qt.h +HEADERS += general-tab.h +HEADERS += qv4l2.h +HEADERS += raw2sliced.h +HEADERS += vbi-tab.h +HEADERS += ../v4l2-ctl/vivid-tpg.h +HEADERS += ../v4l2-ctl/vivid-tpg-colors.h +HEADERS += ../../config.h + +SOURCES += capture-win.cpp +SOURCES += capture-win-gl.cpp +SOURCES += capture-win-qt.cpp +SOURCES += ctrl-tab.cpp +SOURCES += general-tab.cpp +SOURCES += qv4l2.cpp +SOURCES += raw2sliced.cpp +SOURCES += tpg-tab.cpp +SOURCES += vbi-tab.cpp +SOURCES += ../v4l2-ctl/vivid-tpg.c +SOURCES += ../v4l2-ctl/vivid-tpg-colors.c + +LIBS += -L$$PWD/../../lib/libv4l2 -lv4l2 +LIBS += -L$$PWD/../../lib/libv4lconvert -lv4lconvert +LIBS += -L$$PWD/../libv4l2util -lv4l2util +LIBS += -lrt -ldl -ljpeg RESOURCES += qv4l2.qrc