NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/libcamera: pipeline option 'raspberrypi' changed to 'rpi/vc4'

Browse Source 
With upstram commit [1] (since version v0.1.0) the pipeline option 'raspberrypi'
was renamed to 'rpi/vc4'.

Change the buildroot option name from BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI
to BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4 (and add Config.in.legacy entry
accordingly) and move handling in Config.in/libcamer.mk to follow alphabetic
ordering.

Fixes:

  .../build/libcamera-v0.1.0/meson.build:3:0: ERROR: Options "raspberrypi" are not in allowed choices: "all, auto, imx8-isi, ipu3, rkisp1, rpi/vc4, simple, uvcvideo, vimc"

[1] https://git.libcamera.org/libcamera/libcamera.git/commit/?id=726e9274ea95fa46352556d340c5793a8da51fcd

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 782d268aba)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Peter Seiderer 2023-11-09 22:28:58 +01:00 committed by Peter Korsgaard
parent 773db648fb
commit a2c303136f
3 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Config.in.legacy
View File

@ -146,6 +146,16 @@ endif
comment "Legacy options removed in 2023.11"
config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI
bool "libcamera pipeline 'raspberrypi' was renamed to 'rpi/vc4'"
depends on BR2_arm || BR2_aarch64
depends on BR2_USE_WCHAR
select BR2_LEGACY
select BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4
help
Since version 0.1.0 the libcamera pipeline option
'raspberrypi' was renamed to 'rpi/vc4'.
config BR2_PACKAGE_PYTHON_PYXB
bool "python-pyxb removed"
select BR2_LEGACY

18
package/libcamera/Config.in
View File

@ -40,15 +40,6 @@ config BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3
help
Pipeline for Intel IPU3.
config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI
bool "raspberrypi pipeline"
depends on BR2_arm || BR2_aarch64
depends on BR2_USE_WCHAR # boost (already enforced for gnutls)
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE
help
Pipeline for Raspberry Pi devices.
config BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1
bool "rkisp1 pipeline"
depends on BR2_arm || BR2_aarch64
@ -56,6 +47,15 @@ config BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1
help
Pipeline for Rockchip ISP1.
config BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4
bool "rpi/vc4 pipeline"
depends on BR2_arm || BR2_aarch64
depends on BR2_USE_WCHAR # boost (already enforced for gnutls)
select BR2_PACKAGE_BOOST
select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE
help
Pipeline for Raspberry Pi devices.
config BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE
bool "simple pipeline"
select BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE

6
package/libcamera/libcamera.mk
View File

@ -51,11 +51,11 @@ LIBCAMERA_CONF_OPTS += -Dv4l2=false
endif
LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3) += ipu3
ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI),y)
LIBCAMERA_PIPELINES-y += raspberrypi
LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1) += rkisp1
ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RPI_VC4),y)
LIBCAMERA_PIPELINES-y += rpi/vc4
LIBCAMERA_DEPENDENCIES += boost
endif
LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1) += rkisp1
LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE) += simple
LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO) += uvcvideo
LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC) += vimc