From patchwork Sat Apr 15 20:10:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 674337 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 CE7B1C77B77 for ; Sat, 15 Apr 2023 20:11:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229983AbjDOULK (ORCPT ); Sat, 15 Apr 2023 16:11:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229989AbjDOULC (ORCPT ); Sat, 15 Apr 2023 16:11:02 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0B657358C for ; Sat, 15 Apr 2023 13:11:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681589459; i=ps.report@gmx.net; bh=SuqFgEJBS4/g+fquOfTJmRrju+9Qbv5Vu67JidAudAw=; h=X-UI-Sender-Class:From:To:Subject:Date:In-Reply-To:References; b=PgE2EZ4HdoB0qypAIB0iNeqGE7C0ON0OI7LtolnnY6pCq9c523BgjSAMVPTnq22pj ZXyOyAxu2yc7iYggjjeZYdWfmMN0kRgtbTkJIQUdUifbv/oz+pISYJrsOTpHcGEUgM 2Juih8UzEzNVDMnv3UCIMXHA2Uh3uy3Nz+0WFhA1MnYS1rY6SdBq3LuDsNhX4JgoBI pGgL8CV+mL+bV6EEw0lyQ2at7yj0tQPJm2YGhFHEvk4tem/AFPfR9HcQM6j5WkmxCF MJBv/pLd9augn7QVkkn8q5yDKRmfQfQ/YOWV82XQUxLKKfEDPsGGELUnX7hepinYd1 omlLO0/cEoDQA== 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 1N6bjy-1qPzK90apK-0186cz for ; Sat, 15 Apr 2023 22:10:59 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1 11/11] qvidcap: fix qmake project file Date: Sat, 15 Apr 2023 22:10:56 +0200 Message-Id: <20230415201056.31080-11-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:dpohvC94XOYNsUQQSukolWJNxcBfbhhDclk1uq+FGCnVHEJMxqo Anci/bH+mz+qLtZUuFTUCyxuZXtUZnvdMxICwLAIJ5nbxsF1CV4B8ET10/b25IuiWGvgxhX aoaU4nMAELlkBhHjveIgOgSB04dInSCgsacW26V1aelO2nMntVHzkrOFC4ngvNQj9VX94Iq mjZXlwjiaw1C1lnNgIf2g== UI-OutboundReport: notjunk:1;M01:P0:yxe4hkjaGQw=;31MNsKcXzjVz2pRhk2HKqp9eau0 dhSkT8lBuJPs/P3npCrk8Gyl0o5DTR9kLkySP1zTRdkmu8eJql2iXF1u7TX9N3kr8Vnh8TZOK QmxiuLq8tIMi7Dox7mZWjbKZc1Jl9lsqgRMlagvXVcxS/H71U0lczdueDXRRx+ZW5Mk6uaHHk l3XQAyoJmzWrJylaAuhotSPnBVkNrY8nNmUOLHUdDU+n64fclU1WimoNBiEMQPMPkqYZVzOej WG8WAw/mdoBiGsReyJ1AlIk5wvUj0tqXSjys6Ua9XIGZ7cSIzbaVYWzifL10hsgsjH8NCSuaF N/UzQy068GwrfNB+Yg07Cpe7SVEXPE5lnDV6HUuLJAO3qz/YUmacA3SX0H8uuM8eWoAvxyTb7 KmsRVY3OlMTznS6NN8QjAAn5ceXRgwdAu0RsdbhaibYDooOwixbjMc2EpWnIob7yBVvNsI1/h LvA4rtoLF+o1gcxNACwVxaMcnx621SF3tHNrs9xH+IuAVe7GJE1XiuFoRnF7x+Ee4DCgN6oNy VE7adPnP79DZTFEqkeKk+ecveZ+7PuMKDqJ3RP+arRzte6RHSs7EqQ88WOaU6JoR+NdZOhJAU 7EDNZoj0OuVdZcYDsopjKe711w6eTZ5L7sF3MH+A4CEizvvRlPzZe5S/hGq8BqDLteOT0GoOp M3J4M8P+fp1Bxa9fOndMa3mnrIhC3CwGngNisUod++9Mj0Gr76UvB22/vjrqEdvPNfvKzfqq7 7CTvgI/K8KDXgSK+bE1xpA3niGd9hVIeT3LM3FVecAvdxRhq/2i63syRPq5cLLHcSbUn0n2Qq 9yJl6aZYFxhSR3Un0TynEgJNulUtRGcKftCJzan1GkzxzMq73zbRlUMWxmP0Us04tryhIdDe3 CUw8TTGRXNW6SciXcXTtp7J9k2lYlCfyeiN8G34oskD9Rsfu2ZM1wKeyHHntvnTFpYXBmL9Lw VsfDOw== 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 v4l2-convert.pl call to generate v4l2-convert.h - add missing common/codec-v4l2-fwht.c and common/v4l2-info.cpp dependency - adjust local library file paths Signed-off-by: Peter Seiderer --- utils/qvidcap/qvidcap.pro | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/utils/qvidcap/qvidcap.pro b/utils/qvidcap/qvidcap.pro index e9eaf7c2..db948611 100644 --- a/utils/qvidcap/qvidcap.pro +++ b/utils/qvidcap/qvidcap.pro @@ -8,29 +8,41 @@ 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-compliance +v4l2_convert_hook.depends = $$PWD/v4l2-convert.pl $$PWD/v4l2-convert.glsl +v4l2_convert_hook.commands = perl $$PWD/v4l2-convert.pl < $$PWD/v4l2-convert.glsl > v4l2-convert.h +QMAKE_EXTRA_TARGETS += v4l2_convert_hook + # Input HEADERS += capture.h HEADERS += qvidcap.h -HEADERS += ../../config.h +HEADERS += $$MESON_BUILD_PATH/config.h SOURCES += capture.cpp paint.cpp SOURCES += qvidcap.cpp SOURCES += ../common/v4l-stream.c SOURCES += ../common/codec-fwht.c +SOURCES += ../common/codec-v4l2-fwht.c +SOURCES += ../common/v4l2-info.cpp SOURCES += ../common/v4l2-tpg-core.c SOURCES += ../common/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 += -lrt -ldl -ljpeg RESOURCES += qvidcap.qrc