From e65bbb6e263d99212cd29a32d89e4c45d0c05353 Mon Sep 17 00:00:00 2001 From: Jordan Holt Date: Sat, 21 Jun 2025 18:38:38 +0100 Subject: [PATCH] libcamera installed --- src/libcamera/source_paths.cpp | 9 --------- src/py/libcamera/meson.build | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/libcamera/source_paths.cpp b/src/libcamera/source_paths.cpp index 1af5386a..3fc7d044 100644 --- a/src/libcamera/source_paths.cpp +++ b/src/libcamera/source_paths.cpp @@ -39,15 +39,6 @@ namespace { */ bool isLibcameraInstalled() { - /* - * DT_RUNPATH (DT_RPATH when the linker uses old dtags) is removed on - * install. - */ - for (const ElfW(Dyn) *dyn = _DYNAMIC; dyn->d_tag != DT_NULL; ++dyn) { - if (dyn->d_tag == DT_RUNPATH || dyn->d_tag == DT_RPATH) - return false; - } - return true; } diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build index 596a203c..c0b1db59 100644 --- a/src/py/libcamera/meson.build +++ b/src/py/libcamera/meson.build @@ -34,14 +34,14 @@ gen_py_controls = files('gen-py-controls.py') pycamera_sources += custom_target('py_gen_controls', input : controls_files, output : ['py_controls_generated.cpp'], - command : [gen_py_controls, '--mode', 'controls', '-o', '@OUTPUT@', + command : ['python3', gen_py_controls, '--mode', 'controls', '-o', '@OUTPUT@', '-t', gen_py_controls_template, '@INPUT@'], env : py_build_env) pycamera_sources += custom_target('py_gen_properties', input : properties_files, output : ['py_properties_generated.cpp'], - command : [gen_py_controls, '--mode', 'properties', '-o', '@OUTPUT@', + command : ['python3', gen_py_controls, '--mode', 'properties', '-o', '@OUTPUT@', '-t', gen_py_controls_template, '@INPUT@'], env : py_build_env) -- 2.49.0