From ec7afef665a87eb389a5a4cb9ff35e9c24bbcc29 Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Thu, 24 Jun 2021 16:33:59 +0100 Subject: libcamera: Rename libcamera pkg-config generation The libcamera library is moved to the first positional argument of the pkg-config generator to automatically populate the name and filebase values for the package. As part of this, the shared library name is adjusted to the full library name 'libcamera', without relying upon the automatic 'lib' prefix which better represents the component and naming of the library. As a result of this, the pkgconfig file is now named 'libcamera.pc' as opposed to 'camera.pc', and applications desiring to reference libcamera will need to search for 'libcamera' as a dependency rather than 'camera'. The library itself is still created and installed as 'libcamera.so'. An example meson.build file would need to be adjusted as the following: - dependency('camera', required : true), + dependency('libcamera', required : true), Reviewed-by: Paul Elder Reviewed-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Signed-off-by: Kieran Bingham --- src/libcamera/meson.build | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index e4c60e73..387d2084 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -135,8 +135,9 @@ libcamera_deps = [ # runtime if the library is running from an installed location by checking # for the presence or abscence of the dynamic tag. -libcamera = shared_library('camera', +libcamera = shared_library('libcamera', libcamera_sources, + name_prefix : '', install : true, include_directories : includes, build_rpath : '/', @@ -157,10 +158,8 @@ libcamera_dep = declare_dependency(sources : [ link_with : libcamera) pkg_mod = import('pkgconfig') -pkg_mod.generate(libraries: libcamera, +pkg_mod.generate(libcamera, version : '1.0', - name : 'libcamera', - filebase : 'camera', description : 'Complex Camera Support Library', subdirs : 'libcamera') -- cgit v1.2.1