Add version check and update to use my fork for python bindings

Author: will-v-pi

README.md

@@ -11,6 +11,13 @@ pip install libcamera
 ```
 If you have an older release of libcamera on your system then you may need to use `libcamera==version` to install the correct release.
 
+### If you get a version error
+If you get the error `This package works with libcamera version ..., but you have version ... installed`, then this means the version strings are not matching. If you have built your own version of libcamera, then just pass `-C setup-args="-Dversion=unknown"` to skip this check and follow the instructions in the next section. If you have a system installed version of libcamera then you will need to check this table for the correct pip package version to install, based on the version of libcamera you have installed. These are the common versions found on Raspberry Pis.
+
+| system and date | libcamera reported version | pip package version |
+| --------------- | -------------------------- | ------------------- |
+| Raspberry Pi Bookworm Oct 2023 | v0.1.0+52-a858d20b | 0.1a1 |
+
 ### If that doesn't work...
 
 If you have built your own version of libcamera, or your system has a version which is not compatible with a release version, then you may need to pass the repository and revision to meson. The arguments to do this are `-C setup-args="-Drepository=https://my.repository.git"` for the repository and `-C setup-args="-Drevision=branch"` for the revision. These are passed directly into `git clone` and `git checkout` respectively, so and strings that work with those will work here. The `-C, --config-settings` argument require an up to date version of `pip>=23.1` so you may first need to run `pip install --upgrade pip`

check-version

@@ -0,0 +1,8 @@
+#include <iostream>
+#include <libcamera/camera_manager.h>
+
+
+int main()
+{
+    std::cout << libcamera::CameraManager::version() << "\n";
+}

check-version.cpp

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cc check-version.cpp -I libcamera/include -lcamera -lstdc++ -o check-version
+
+./check-version

check-version.sh

@@ -10,9 +10,24 @@ project('pylibcamera', 'c', 'cpp',
     ],
     license : 'LGPL 2.1+')
 
+if not get_option('pycamera').enabled()
+    error('pycamera must be enabled')
+endif
+
 message('Cloning from: @0@, revision @1@'.format(get_option('repository'), get_option('revision')))
 
-r = run_command('clone-libcamera.sh', get_option('repository'), get_option('revision'), get_option('patch'), check : true)
+run_command('clone-libcamera.sh', get_option('repository'), get_option('revision'), get_option('patch'), check : true)
+
+r = run_command('check-version.sh', capture : true)
+if r.returncode() == 0 and get_option('version') != 'unknown'
+    version = r.stdout()
+    message('libcamera version is @0@'.format(version))
+    if version.strip() != get_option('version').strip()
+        error('This package works with libcamera version @0@, but you have version @1@ installed. Please check the readme for help with this error'.format(get_option('version'), version))
+    endif
+else
+    message('Version Check Not Done')
+endif
 
 libcamera_includes = include_directories('libcamera/include')
 libcamera_private = dependency(

meson.build

@@ -10,7 +10,17 @@ option('revision',
         value : 'master',
         description : 'Git revision to checkout')
 
+option('version',
+        type : 'string',
+        value : 'unknown',
+        description : 'libcamera version')
+
 option('patch',
         type : 'string',
         value : 'pypatch',
         description : 'Patch to apply')
+
+option('pycamera',
+        type : 'feature',
+        value : 'enabled',
+        description : 'Enable libcamera Python bindings - must be enabled')

meson_options.txt

@@ -1,51 +1,20 @@
 diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build
-index f58c7198..c65fc044 100644
+index 128793aa..1df65c54 100644
 --- a/src/py/libcamera/meson.build
 +++ b/src/py/libcamera/meson.build
-@@ -1,13 +1,13 @@
- # SPDX-License-Identifier: CC0-1.0
- 
--py3_dep = dependency('python3', required : get_option('pycamera'))
-+py3_dep = py.dependency()
- 
- if not py3_dep.found()
-     pycamera_enabled = false
-     subdir_done()
- endif
- 
--pybind11_dep = dependency('pybind11', required : get_option('pycamera'))
-+pybind11_dep = dependency('pybind11', required : true)
- 
- if not pybind11_dep.found()
-     pycamera_enabled = false
-@@ -77,30 +77,3 @@ pycamera_args = [
+@@ -91,6 +91,7 @@ pycamera_args = [
+     '-fvisibility=hidden',
      '-Wno-shadow',
      '-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT',
++    '-DLIBCAMERA_BASE_PRIVATE',
  ]
--
--destdir = get_option('libdir') / ('python' + py3_dep.version()) / 'site-packages' / 'libcamera'
--
--pycamera = shared_module('_libcamera',
--                         pycamera_sources,
--                         install : true,
--                         install_dir : destdir,
--                         name_prefix : '',
--                         dependencies : pycamera_deps,
--                         cpp_args : pycamera_args)
--
--# Create symlinks from the build dir to the source dir so that we can use the
--# Python module directly from the build dir.
--
--run_command('ln', '-fsrT', files('__init__.py'),
--            meson.current_build_dir() / '__init__.py',
--            check : true)
--
--run_command('ln', '-fsrT', meson.current_source_dir() / 'utils',
--            meson.current_build_dir() / 'utils',
--            check : true)
--
--install_data(['__init__.py'], install_dir : destdir)
--
--# \todo Generate stubs when building. See https://peps.python.org/pep-0484/#stub-files
--# Note: Depends on pybind11-stubgen. To generate pylibcamera stubs:
--# $ PYTHONPATH=build/src/py pybind11-stubgen --no-setup-py -o build/src/py libcamera
+ 
+ if meson.is_cross_build()
+@@ -109,6 +110,7 @@ else
+                                    install : true,
+                                    subdir : 'libcamera',
+                                    dependencies : pycamera_deps,
++                                   include_directories : libcamera_includes,
+                                    cpp_args : pycamera_args)
+ endif
+ 

pypatch.patch

@@ -14,8 +14,9 @@ Source = "https://github.com/will-v-pi/pylibcamera"
 
 [tool.meson-python.args]
 setup = [
-    '-Drevision=release-v0.0.5+83-bde9b04f',
-    '-Drepository=https://github.com/raspberrypi/libcamera.git'
+    '-Drevision=17d88f4',
+    '-Drepository=https://github.com/will-v-pi/libcamera.git',
+    '-Dversion=v0.1.0+99-4a23664b'
 ]
 
 [tool.flit.module]