From patchwork Thu Mar 30 20:01:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 668732 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 9B871C6FD1D for ; Thu, 30 Mar 2023 20:01:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229613AbjC3UBS (ORCPT ); Thu, 30 Mar 2023 16:01:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229491AbjC3UBK (ORCPT ); Thu, 30 Mar 2023 16:01:10 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 141861024E for ; Thu, 30 Mar 2023 13:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=s31663417; t=1680206461; i=ps.report@gmx.net; bh=dsTOcrG0G0qHAXL5u31LdiSEcypvWwBcVuNvFlK9TEQ=; h=X-UI-Sender-Class:From:To:Subject:Date; b=gB7izNYn8UmkAkuqw02chX42rOE9v8TkLhFuiX/x9VV2rB3AoljrnXbzQ5ZsjefLw prRdUMJjv4bgCV++s88UHSK9BHUNsTyGtMNB48SNvszWZ/r/S0CWGf7rQg4NP/Qhl/ V1jF24QQWVnCVMWnTloonyvFBBMPNBLh0PpQm/EIGUL+dhovFTaga89mZzb2006Yvw t57Ayjf9CXt4oFnabF/Yrqn2DKr8S3/AiLAm1/wC+ONw8+6Si+nw/uuNDzPL/3xgk2 t2RF36xsDIo2LrWIXbDm83atLB6AZ1lXPYB65P+APCAnqViMzOSNLhlkh9JWogN//V ylWQtXIslNVdg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from localhost.fritz.box ([62.216.208.135]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MMXUD-1pygME0iyF-00JdrU for ; Thu, 30 Mar 2023 22:01:01 +0200 From: Peter Seiderer To: linux-media@vger.kernel.org Subject: [PATCH v4l-utils v1] meson: re-enable qv4l2 without Qt OpenGL support Date: Thu, 30 Mar 2023 22:01:00 +0200 Message-Id: <20230330200100.4363-1-ps.report@gmx.net> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:u/VTeQ0y2hRlREl50QE2Ut8jhYquKSbSmGCuD2WQufI94p0Q06s PzRZwENg0juZuOzbL9EbB2ZF+OFDB9LC6HIK3Z5CP2YCcH+UxVlEx5q9vgpPS3CZiv/yS+L yFeBIZpe/qNY2XrCCYD012ij4wlM1xQbj5j3TjfD0OT/YDn5/Ef6VgsMkNYINK2lqOqL7Z5 dTOsaL/hy72FfwTAoE1kw== UI-OutboundReport: notjunk:1;M01:P0:MAu5/0nQVSU=;5ly0n1SNQCW/dxGKr5m75rJeHyu or0nVsAuX3Yrfs1s8zMbf1CnBlNY1E6prnxZKMGRHnGJfH5goKG/mh19bAT0hq2+3wFhJ3Vs5 YSzLmjBGuHytyNAvBZ2AxPEwoVPaA3HBNDtOd35unnwj/fMbiwMp+U2Q8nMQHJPZWj+tOt6bF A3/2k9finOR3rzAgh/fkbnkGTKOcRujqfnsN10LiHjyS0ddWFaoBWgi4tLkeFbn3oHlPuhuwV RWGgX/c+1IAC9/+YFc95711MfUZqeMLzvjMU2xg39pR31nFTXU+QBf3S4rqPOh2ZlLradHh8R CNqRaryN6h7J/qZmPQ7VXThxNxB1vIOSnWI6XI4dy5VgI9/l1i53FNAlRdAeYZ5N6Il5D7hZI nhQD3C6+TX057pu0x7wE/hngp5NHt2TDsTQHPg+F1ntH1l34Jz8qnhGCnp3sLNrdEHdOkMCtu Cy+Ht8fmoPKqa8/D6ZTIZIj2dqJpT3j34A7yR3sP+dPmvt4fwRXodhj7mVpUMsfaqe+ICjQvs pm/7jnyAG1zZYwa17cE7ei8ywXOjzJNtcKFEirPE790Y/Ur0NKdsoh3WUgrvhP3ZxLwEBJbks MhWZOpmszaeZnIp2s1BBquC84viTdMAkEICz1a6FC2qUweq3NDI48DVI4dXXUTZVnYjFR8aJ2 WPmBwEp+d45bO0Gt91vEnQRUQHyfTx4UG3xb8+cNTf3fQNTAAq+y1DDx+WPR8zcTgaQNCY+Ez snJxSvJQZernF83VtGX0r3DAfH7na81HS04YVe2h2/8Dc7r0T9P0awLf0l0SFyOY9UGnQwUo3 4RtwqOii3sOOIFYT227caSNAw1IzOm6whehmfmF550GEoFKjhp7T6VqJyDj8Qs0WNWtkLxAuY kJKSMxfvt4eRDIEJd/daVqAf1rcrojy2RvI+dAa1+7bTK1kNi63PblSwPOm9FichH4VzY64Ha HlgyYGbElhuSYhQv4r7JDJPBbEk= Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Re-enable qv4l2 without Qt OpenGL support (as possible with the legacy autoconf/automake build system). Signed-off-by: Peter Seiderer --- meson.build | 10 ++++++---- utils/qv4l2/meson.build | 3 ++- utils/qvidcap/meson.build | 2 +- 3 files changed, 9 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..044d8297 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