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: 27345 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 1XwzJq-0000EK-Hl; Fri, 05 Dec 2014 21:17:38 +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 1XwzJo-0002Fk-kp; Fri, 05 Dec 2014 21:17:38 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751502AbaLEURb (ORCPT + 1 other); 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-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, REFERENCES 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, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __REFERENCES 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 ' 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