NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

meson: Use subdir_done() to reduce indentation

Browse source 
Reduce the indentation in the gstreamer and qcam meson.build with
subdir_done(). This follows similar patterns in cam and v4l2.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2021-03-20 23:28:43 +02:00
parent 787852a240
commit 976e01d59b
2 changed files with 80 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/gstreamer/meson.build
View file

@ -1,5 +1,17 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
glib_dep = dependency('glib-2.0', required : get_option('gstreamer'))
gst_dep_version = '>=1.14.0'
gstvideo_dep = dependency('gstreamer-video-1.0', version : gst_dep_version,
required : get_option('gstreamer'))
gstallocator_dep = dependency('gstreamer-allocators-1.0', version : gst_dep_version,
required : get_option('gstreamer'))
if not glib_dep.found() or not gstvideo_dep.found() or not gstallocator_dep.found()
subdir_done()
endif
libcamera_gst_sources = [ libcamera_gst_sources = [
'gstlibcamera-utils.cpp', 'gstlibcamera-utils.cpp',
'gstlibcamera.cpp', 'gstlibcamera.cpp',
@ -15,15 +27,6 @@ libcamera_gst_cpp_args = [
'-DPACKAGE="@0@"'.format(meson.project_name()), '-DPACKAGE="@0@"'.format(meson.project_name()),
] ]
glib_dep = dependency('glib-2.0', required : get_option('gstreamer'))
gst_dep_version = '>=1.14.0'
gstvideo_dep = dependency('gstreamer-video-1.0', version : gst_dep_version,
required : get_option('gstreamer'))
gstallocator_dep = dependency('gstreamer-allocators-1.0', version : gst_dep_version,
required : get_option('gstreamer'))
if glib_dep.found() and gstvideo_dep.found() and gstallocator_dep.found()
# The G_DECLARE_FINAL_TYPE macro creates static inline functions that were # The G_DECLARE_FINAL_TYPE macro creates static inline functions that were
# not marked as possibly unused prior to GLib v2.63.0. This causes clang to # not marked as possibly unused prior to GLib v2.63.0. This causes clang to
# complain about the ones we are not using. Silence the -Wunused-function # complain about the ones we are not using. Silence the -Wunused-function
@ -39,4 +42,3 @@ if glib_dep.found() and gstvideo_dep.found() and gstallocator_dep.found()
install: true, install: true,
install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')), install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
) )
endif

20
src/qcam/meson.build
View file

@ -1,5 +1,16 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
qt5 = import('qt5')
qt5_dep = dependency('qt5',
method : 'pkg-config',
modules : ['Core', 'Gui', 'Widgets'],
required : get_option('qcam'),
version : '>=5.4')
if not qt5_dep.found()
subdir_done()
endif
qcam_sources = files([ qcam_sources = files([
'../cam/options.cpp', '../cam/options.cpp',
'../cam/stream_options.cpp', '../cam/stream_options.cpp',
@ -19,14 +30,6 @@ qcam_resources = files([
'assets/feathericons/feathericons.qrc', 'assets/feathericons/feathericons.qrc',
]) ])
qt5 = import('qt5')
qt5_dep = dependency('qt5',
method : 'pkg-config',
modules : ['Core', 'Gui', 'Widgets'],
required : get_option('qcam'),
version : '>=5.4')
if qt5_dep.found()
qcam_deps = [ qcam_deps = [
libcamera_dep, libcamera_dep,
qt5_dep, qt5_dep,
@ -73,4 +76,3 @@ if qt5_dep.found()
install : true, install : true,
dependencies : qcam_deps, dependencies : qcam_deps,
cpp_args : qt5_cpp_args) cpp_args : qt5_cpp_args)
endif