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

libcamera: rename public libcamera dependency

Browse source 
Now that we have a libcamera_private, make the public only dependency
libcamera_public so that it is clear which interface is being linked.

Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Kieran Bingham 2021-06-23 23:19:20 +01:00
parent ff7832d2cd
commit 5c01d54120
8 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cam/meson.build
View file

@ -21,7 +21,7 @@ cam_sources = files([
cam = executable('cam', cam_sources, cam = executable('cam', cam_sources,
dependencies : [ dependencies : [
libatomic, libatomic,
libcamera_dep, libcamera_public,
libevent, libevent,
], ],
install : true) install : true)

2
src/gstreamer/meson.build
View file

@ -42,7 +42,7 @@ endif
libcamera_gst = shared_library('gstlibcamera', libcamera_gst = shared_library('gstlibcamera',
libcamera_gst_sources, libcamera_gst_sources,
cpp_args : libcamera_gst_cpp_args, cpp_args : libcamera_gst_cpp_args,
dependencies : [libcamera_dep, gstvideo_dep, gstallocator_dep], dependencies : [libcamera_public, gstvideo_dep, gstallocator_dep],
install: true, install: true,
install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')), install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
) )

2
src/lc-compliance/meson.build
View file

@ -21,7 +21,7 @@ lc_compliance_sources = files([
lc_compliance = executable('lc-compliance', lc_compliance_sources, lc_compliance = executable('lc-compliance', lc_compliance_sources,
dependencies : [ dependencies : [
libatomic, libatomic,
libcamera_dep, libcamera_public,
libevent, libevent,
], ],
install : true) install : true)

16
src/libcamera/meson.build
View file

@ -132,20 +132,20 @@ libcamera = shared_library('libcamera',
build_rpath : '/', build_rpath : '/',
dependencies : libcamera_deps) dependencies : libcamera_deps)
libcamera_dep = declare_dependency(sources : [ libcamera_public = declare_dependency(sources : [
libcamera_ipa_headers, libcamera_ipa_headers,
libcamera_public_headers, libcamera_public_headers,
], ],
include_directories : libcamera_includes, include_directories : libcamera_includes,
dependencies : libcamera_base, dependencies : libcamera_base,
link_with : libcamera) link_with : libcamera)
# Internal dependency for components and plugins which can use private APIs # Internal dependency for components and plugins which can use private APIs
libcamera_private = declare_dependency(sources : [ libcamera_private = declare_dependency(sources : [
libcamera_generated_ipa_headers, libcamera_generated_ipa_headers,
], ],
dependencies : [ dependencies : [
libcamera_dep, libcamera_public,
libcamera_base_private, libcamera_base_private,
]) ])

2
src/qcam/meson.build
View file

@ -35,7 +35,7 @@ qcam_resources = files([
qcam_deps = [ qcam_deps = [
libatomic, libatomic,
libcamera_dep, libcamera_public,
qt5_dep, qt5_dep,
] ]

2
test/controls/meson.build
View file

@ -9,7 +9,7 @@ control_tests = [
foreach t : control_tests foreach t : control_tests
exe = executable(t[0], t[1], exe = executable(t[0], t[1],
dependencies : libcamera_dep, dependencies : libcamera_public,
link_with : test_libraries, link_with : test_libraries,
include_directories : test_includes_internal) include_directories : test_includes_internal)
test(t[0], exe, suite : 'controls', is_parallel : false) test(t[0], exe, suite : 'controls', is_parallel : false)

2
test/meson.build
View file

@ -55,7 +55,7 @@ internal_tests = [
foreach t : public_tests foreach t : public_tests
exe = executable(t[0], t[1], exe = executable(t[0], t[1],
dependencies : libcamera_dep, dependencies : libcamera_public,
link_with : test_libraries, link_with : test_libraries,
include_directories : test_includes_public) include_directories : test_includes_public)

2
test/stream/meson.build
View file

@ -6,7 +6,7 @@ stream_tests = [
foreach t : stream_tests foreach t : stream_tests
exe = executable(t[0], t[1], exe = executable(t[0], t[1],
dependencies : libcamera_dep, dependencies : libcamera_public,
link_with : test_libraries, link_with : test_libraries,
include_directories : test_includes_internal) include_directories : test_includes_internal)
test(t[0], exe, suite: 'stream') test(t[0], exe, suite: 'stream')