From patchwork Sat Apr 15 20:10:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 673536 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0F11CC77B73 for ; Sat, 15 Apr 2023 20:11:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229961AbjDOULB (ORCPT ); Sat, 15 Apr 2023 16:11:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229760AbjDOULA (ORCPT ); Sat, 15 Apr 2023 16:11:00 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 321183599 for ; Sat, 15 Apr 2023 13:10:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589457; i=ps.report@gmx.net; bh=NM/C8G2lRBz0Gw0CGsVX9ntJubBtKRBkFtlFehYmRg4=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=XCYmKuzLRb1I2eUvixhvz17kS5AV+NLkp5p97DJ+xCXinksLPB2+M+GdsWMFYrFMm Hw1CtgVQ9selNpoU1/3a2DSMpt7kUz2G0MSYFcFTiJoVxywCRrd3pb/zvoiV/y4StQ FGJ1h47X+zxzNLI7FB51cz8+zQrZteb9WqM7QqLAv65pvI14hCsqFjYi4G8VVTr+0m xURAeJVESWrtceA0X66Y2JLmlvcrJN3R5pqXStgBmX5r0vgLDLP4RH2hw34+Bu0uAq WQRXWoXOMGEAmJZed5oKP2xAqe8NvcqOLmC1b/2PrL/04jTqAafZxQGj4wtaTzZXvI eTqLwaW98xUbQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.95]) by mail.gmx.net (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1Mw9UK-1qfsI91gLE-00s6zr for ; Sat, 15 Apr 2023 22:10:57 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 02/11] qv4l2: fix qmake project file Date: Sat, 15 Apr 2023 22:10:47 +0200 Message-Id: <20230415201056.31080-2-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230415201056.31080-1-ps.report@gmx.net> References: <20230415201056.31080-1-ps.report@gmx.net> MIME-Version: 1.0 X-Provags-ID: V03:K1:uEKAXQnwQ4YrEJVxIE+uh/sg0T3afDRLELTypvm9zfdsXSlVeAg HBSBCb1qAe4HWceLeMhJV9UxgWqeGuxCIbQ+vRjxckaqqekGTjHt+rNzdU1PuyVnXD+McEh ChqGnay5C8iDjORh9dS1mSCTZdEwGUZhK39o1snAK3jLRfOQTD2KhEXFuqiKfwXwqhYsq69 3iqnTr/SpD/wzYBJHEszQ== UI-OutboundReport: notjunk:1;M01:P0:YgE8dQH4PoU=;9i3UxWyXgnOEpa5ugamP2GANT4+ 7HBtb6Aq4XGQlsuRSNpLr5nMyedPK2MWNVhGaFpf/cIyo2cq6mtQU/SVh4y0B7v5POIZMSU4b p83dGzsim0E+8y8JAUQw6+jcv9kyF3YWG0YyShTJW8xU6zaXmA9hoT/53/kdn/Qq2OgL1CwAu hHKQTWYV+/Q8RnvFnSw+W3XMt/LNkQY5oFK6Q3O3QYZP2NxUHlax4O3ZuNGLesafK8BRL7uUt UI8IJ8/Ilu8jLL4lgwnNvObD82sVLEk1ONNVLg8II2qYBRKj1sz4qPHsFbauD+gFW3sXVqjFO 4Pv9bFxDYGt5yaLMiF35MozAop4nMgJjmOn4LailtuhV6SWiy2iOsrjlpE9OgeofqO/koEa2s DrQbdshaA1L+pvxHyC25Ei9SZcRy35wMUXYIeanMIxC8OF7PEw9TYROVDxaKnMzPRNLMW+2H5 zCYDU33kBic8rad3WSnv7n9q/qhhrxjLzz77zdmJjj7tp5Lk9E2pTOjhbONf9NZrJvwjyuSAY jOMa9ZpcoMHFDiAJF4rfUoqDQvF11I5M9WV4nIIUHMRtz9RF8q2OJntMlqtjk08py4G9hmhSd flQqXydQv3tiBV/bOHXPGNuMu6FbA9Q5qePwbQdM8hBDDSZX+tOPNItly7ggERUfaNGcK7d2Z XwnZsO7hp5purhFdRqVf+d1Mo9oeLkt2gj0GI18Gaal7QePcMa8xFQkw4fgfDKz64sHtyJ6FU JY8Di9jcr37G33CygmKyBadU6f9BcWoooNLEZpj6DsjZULMwh0NKzRLVx4feidkMWdaBk6ZRy /hwid0cKqOw+LtzvJhNrZuFDsLuHBeiVSZoQD79MAIyDqQRC3UHTxDAQbaeHs4sIg90nYszFJ XWSh63jeyoesXUC/mLefSlBh1PWbPM7+9+NgRAWT42mBoNJPoopJrlv693FvcPQ1LEgiuMhjg MtreZ1lzhAXavWR/h7Z57EWPfLA= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org - add MESON_BUILD_PATH variable (and customize hint) - add '-include' for config.h file (as the meson build does) - add alsa_stream.c source file - adjust local library file paths - add libasound dependency Signed-off-by: Peter Seiderer --- utils/qv4l2/qv4l2.pro | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/utils/qv4l2/qv4l2.pro b/utils/qv4l2/qv4l2.pro index 6420fa24..8697d554 100644 --- a/utils/qv4l2/qv4l2.pro +++ b/utils/qv4l2/qv4l2.pro @@ -8,10 +8,16 @@ CONFIG += debug greaterThan(QT_MAJOR_VERSION, 4): QT += widgets +# adjust to your local meson build path +MESON_BUILD_PATH = $$PWD/build-meson + # opengl: to disable opengl suppport comment out the following # line and the line '#define HAVE_QTGL 1' from ../../config.h QT += opengl +QMAKE_CFLAGS += -include $$MESON_BUILD_PATH/config.h +QMAKE_CXXFLAGS += -include $$MESON_BUILD_PATH/config.h + INCLUDEPATH += $$PWD/../.. INCLUDEPATH += $$PWD/../common INCLUDEPATH += $$PWD/../v4l2-ctl/ @@ -28,8 +34,9 @@ HEADERS += raw2sliced.h HEADERS += vbi-tab.h HEADERS += ../common/v4l2-tpg.h HEADERS += ../common/v4l2-tpg-colors.h -HEADERS += ../../config.h +HEADERS += $$MESON_BUILD_PATH/config.h +SOURCES += alsa_stream.c SOURCES += capture-win.cpp SOURCES += capture-win-gl.cpp SOURCES += capture-win-qt.cpp @@ -42,9 +49,11 @@ SOURCES += vbi-tab.cpp SOURCES += ../v4l2-ctl/v4l2-tpg-core.c SOURCES += ../v4l2-ctl/v4l2-tpg-colors.c -LIBS += -L$$PWD/../../lib/libv4l2/.libs -lv4l2 -LIBS += -L$$PWD/../../lib/libv4lconvert/.libs -lv4lconvert -LIBS += -L$$PWD/../libv4l2util/.libs -lv4l2util +LIBS += -L$$MESON_BUILD_PATH/lib/libv4l2 -lv4l2 +LIBS += -L$$MESON_BUILD_PATH/lib/libv4lconvert -lv4lconvert +LIBS += -L$$MESON_BUILD_PATH/utils/libv4l2util -lv4l2util +LIBS += -L$$MESON_BUILD_PATH/utils/libmedia_dev -lmedia_dev +LIBS += -lasound # comment out in case alsa sound support is disabled/not available LIBS += -lrt -ldl -ljpeg RESOURCES += qv4l2.qrc