From patchwork Sun Apr 16 19:56:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 91361 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from vger.kernel.org ([23.128.96.18]) by www.linuxtv.org with esmtp (Exim 4.92) (envelope-from ) id 1po8Uk-002bmp-ET; Sun, 16 Apr 2023 19:57:09 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229598AbjDPT5E (ORCPT + 1 other); Sun, 16 Apr 2023 15:57:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229500AbjDPT5C (ORCPT ); Sun, 16 Apr 2023 15:57:02 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09BD9C5 for ; Sun, 16 Apr 2023 12:57:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1681675019; i=ps.report@gmx.net; bh=St6cVSrSvAM+z03XxuQ/FCuE53/YhYG9J3lOf1TmHCo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=qlEKW+VsS6Mw+NzGQwQTJ7oUyPm7d7SNetcov5isSFUrJbUhNS69IX/foxa5U8Rxh XQr/knyoml3ArYnsArJUY+GXmm4mcOp2K9K0sEcnUH3XthO3xkTPxz1nSaHtIOvff+ YuWVLDfztF/pIr5uk7NIYrzXGWiWW8R/iNsI1jCFavUWAwoWhxS2DwTZ8IMpmUfChU Qx3gVA05aZ1i98jX8S5Gvcoq1XfFdgFkBt1ZxENSIHnVTgAbY9XECfazVYzTrFBz4V qwsrRWNmsRgdj64MT+ETsO0tnVk8XLkmDZNGPj0cpr8J5yQbqsAA1T0IUqAXbfiZD2 G5CLuRgEOBgMQ== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.47]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MV67o-1pwLzJ0kRa-00S8mO; Sun, 16 Apr 2023 21:56:59 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Cc: Peter Seiderer Subject: [PATCH v4l-utils v2] meson: re-enable qv4l2 without Qt OpenGL support Date: Sun, 16 Apr 2023 21:56:53 +0200 Message-Id: <20230416195653.23099-1-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:oYLrPGRkPx+VBayhcY2X3RJcp1XqoRBSBDzmqyHflPVxw0s9SAN PXXJIvOVfImv+cNXzZnRKHXtcdHMAmJ6E4boPt2dN4QyUz/gS2ymrZifLqNimnOQQGirGsg FgDl1D6lW6pPRH/Six2qW7UbX2If3WVKQNdCwvb2K5GHKfKNKuG3BcoD+ciXPT0uu0VHXn2 LDa0OdAt9Fi/t+XKZNgIQ== UI-OutboundReport: notjunk:1;M01:P0:BFVbnNmhKwA=;iokPC36UHU6DJzO89UuMU6RjOhf e5Mc5ymxz+iriwnSLYLn81xcV5HbMb5hRTq+sbw8l/yQZ7a19X28WHiMvJ8ViRz6EwNjmeXM3 FuaHKfwe5JqnSTs8QdRm83o16OEbn0D4ZfLObDGe5V2uZqIy30wz/7pTSt7BQ3P2HuDKjjGm6 VgL1IWjCRZ1mJkrxb351Dl6VvZoHObSPSUyW7WPkwAUxByyLfhaznaiHDrSHLhjn0wvJtu0B5 LwgsJ4NCjKB5li5et8/wMaxBEIPVf60/gkR3KOLriE5zmYhbK8NwgtOzTWe2vrQflDl9oFGyK hW12l7P3k00rTOdyefyyx8Vloj5ryZDNIDXKo4N2jjLne+DQK5j6x5yiMBJTcuFSEUJoHMR/c WJFIF0COmx3Ipus8i2jW2nKwrlTYqHr8HujB3gJkG0Eu1aOWI+OUN2zRedz7VVsxyNzu3P47J 1SRRvNvt6aK17oAKuWdv2kjGWvMptAhpwhAa5vIMz+wXztT1M2wP2fGMyWRpRA4YqKXbKF51Q z3HGH02PtMBj7u1T2haVDkxogQ59QxVgAJtqSlCNU+ghJH2MQhhlW/jE3uAZFhD8n3OoSmzlk Xw9hP+DriqXx81Hq7RLt6GaDYk9xfOqatZPWsNTm4laoXELdEswzuvtglmpaNie/NR2iqRGY0 3fAfnyIRuCxJYHBrOjXZNm2YLYCr2eYZV8RcrL0Yh9nTUoTd21a1tqaIOPKGTn51qbZAuNHS/ 2JaoU2W54i9tRuVYbNT+q6e4GF0+WokyaBGVGABaz5tu8bhzkO0ql+arLXIKwdTm2qP5ZUdSU p+dO+XR60xXYLtGT27U43oCFzLSMib7ChRdNB1Bd2tvk94v+1Hwa3lLwsMn3J9IWIhrMgQ23O rCBh2aQnNXWWa1BSuIiaPjguf96ttUy6qjwzAKqQpoCc3ABju6TfdMQONwthfzXbff2PASTW5 sEFmKw== X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,MIME_BASE64_TEXT, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-LSpam-Score: -0.8 (/) X-LSpam-Report: No, score=-0.8 required=5.0 tests=BAYES_00=-1.9,DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1,FREEMAIL_FORGED_FROMDOMAIN=0.001,FREEMAIL_FROM=0.001,HEADER_FROM_DIFFERENT_DOMAINS=0.5,MAILING_LIST_MULTI=-1,MIME_BASE64_TEXT=1.741 autolearn=ham autolearn_force=no Re-enable qv4l2 without Qt OpenGL support (as possible with the legacy autoconf/automake build system). Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - add qvidcap missing additional dep_qt5_opengl dependency --- meson.build | 10 ++++++---- utils/qv4l2/meson.build | 3 ++- utils/qvidcap/meson.build | 3 ++- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 1e76b0f4..b27450ea 100644 --- a/meson.build +++ b/meson.build @@ -70,8 +70,7 @@ if dep_alsa.found() conf.set('HAVE_ALSA', 1) endif -dep_gl = dependency('gl', required : get_option('qvidcap').enabled() or - get_option('qv4l2').enabled()) +dep_gl = dependency('gl', required : get_option('qvidcap').enabled()) dep_glu = dependency('glu', required : false) dep_jsonc = dependency('json-c', required : get_option('v4l2-tracer'), version : '>=0.15') @@ -80,9 +79,12 @@ dep_libdl = cc.find_library('dl') dep_libelf = cc.find_library('elf', required : get_option('bpf')) dep_libm = cc.find_library('m') dep_librt = cc.find_library('rt') -dep_qt5 = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGL'], +dep_qt5 = dependency('qt5', modules: ['Core', 'Gui', 'Widgets'], required : get_option('qvidcap').enabled() or get_option('qv4l2').enabled()) +dep_qt5_opengl = dependency('qt5', modules: ['OpenGL'], + required : get_option('qvidcap').enabled()) + dep_libbpf = dependency('libbpf', required : get_option('bpf'), version : '>=0.7') dep_sdl = dependency('SDL2', required: false) @@ -291,7 +293,7 @@ qt5_opengl_test = ''' #endif ''' have_qt5_opengl = cpp.compiles(qt5_opengl_test, - dependencies : [dep_gl, dep_qt5], + dependencies : [dep_gl, dep_qt5, dep_qt5_opengl], args : '-fPIC') if have_qt5_opengl conf.set('HAVE_QTGL', 1) diff --git a/utils/qv4l2/meson.build b/utils/qv4l2/meson.build index 54676be8..4860e331 100644 --- a/utils/qv4l2/meson.build +++ b/utils/qv4l2/meson.build @@ -1,4 +1,4 @@ -if get_option('qv4l2').disabled() or not dep_gl.found() or not dep_qt5.found() +if get_option('qv4l2').disabled() or not dep_qt5.found() subdir_done() endif @@ -33,6 +33,7 @@ qv4l2_deps = [ dep_libv4l2util, dep_libv4lconvert, dep_qt5, + dep_qt5_opengl, dep_threads, ] diff --git a/utils/qvidcap/meson.build b/utils/qvidcap/meson.build index faae18fb..63d76f29 100644 --- a/utils/qvidcap/meson.build +++ b/utils/qvidcap/meson.build @@ -4,7 +4,7 @@ if qvidcap_option.enabled() and not have_qt5_opengl error('qvidcap enabled but Qt5 is missing OpenGL support') endif -if qvidcap_option.disabled() or not dep_gl.found() or not dep_qt5.found() or not have_qt5_opengl +if qvidcap_option.disabled() or not dep_gl.found() or not dep_qt5_opengl.found() or not have_qt5_opengl subdir_done() endif @@ -30,6 +30,7 @@ qvidcap_deps = [ dep_libv4l2util, dep_libv4lconvert, dep_qt5, + dep_qt5_opengl, dep_threads, ]