From c26da4256031989df1d4a11c2dc2028e16c95fcc Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Thu, 26 Dec 2024 13:13:14 +0100 Subject: [PATCH] package/libcamera: bump to version 0.4.0 For change log since 0.3.2, see: https://git.libcamera.org/libcamera/libcamera.git/tag/?h=v0.4.0 libcamera dropped the gcc 8 support in [1] and increased the minimal version to 9. This commit updates that requirement in the package Config.in and in reverse dependency (in libcamera-apps). This commit also updates the libcamera runtime test to the new format of the "cam --list-properties" output. [1] https://git.libcamera.org/libcamera/libcamera.git/commit/?id=9f513439b6896d1a33c91a400bd02b7b8829feb6 Cc: Kieran Bingham Cc: Marcus Folkesson Reviewed-by: Kieran Bingham Signed-off-by: Julien Olivain --- package/libcamera-apps/Config.in | 2 +- package/libcamera/Config.in | 2 +- package/libcamera/libcamera.hash | 2 +- package/libcamera/libcamera.mk | 2 +- support/testing/tests/package/test_libcamera.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/libcamera-apps/Config.in b/package/libcamera-apps/Config.in index f169d8c52e..fa41d1be2d 100644 --- a/package/libcamera-apps/Config.in +++ b/package/libcamera-apps/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_LIBCAMERA_APPS depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS # libcamera depends on BR2_INSTALL_LIBSTDCPP # libcamera/boost depends on BR2_TOOLCHAIN_HAS_THREADS # libcamera/boost - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # libcamera + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 # libcamera depends on !BR2_STATIC_LIBS # gnutls/libcamera depends on BR2_USE_WCHAR # gnutls/libcamera/boost depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_5 diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index 4699e382c7..1df97edc41 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -9,7 +9,7 @@ menuconfig BR2_PACKAGE_LIBCAMERA depends on BR2_PACKAGE_LIBCAMERA_ARCH_SUPPORTS depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C++17 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_9 depends on !BR2_STATIC_LIBS # gnutls depends on BR2_USE_WCHAR # gnutls select BR2_PACKAGE_GNUTLS diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index d4554af190..8c845d0e21 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -1,4 +1,4 @@ -sha256 d396bebe49aa7f605403594be3a9e970173d4c98061033c75f816946ff907eb8 libcamera-v0.3.2-git4.tar.gz +sha256 0b45861dc0430074bf10aaa78a69439b319e9df4ed041496fd5f95e546c8f575 libcamera-v0.4.0-git4.tar.gz # license files sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index 3367eb60b2..dcfa54e5dd 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,7 +5,7 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = v0.3.2 +LIBCAMERA_VERSION = v0.4.0 LIBCAMERA_SITE_METHOD = git LIBCAMERA_DEPENDENCIES = \ host-openssl \ diff --git a/support/testing/tests/package/test_libcamera.py b/support/testing/tests/package/test_libcamera.py index 8953021b82..91df427b6f 100644 --- a/support/testing/tests/package/test_libcamera.py +++ b/support/testing/tests/package/test_libcamera.py @@ -64,7 +64,7 @@ class TestLibCamera(infra.basetest.BRTest): cmd = f"cam --camera {cam_idx} --list-controls" out, ret = self.emulator.run(cmd) self.assertEqual(ret, 0) - self.assertIn("Control: Brightness:", "\n".join(out)) + self.assertIn("Control: [inout] libcamera::Brightness:", "\n".join(out)) # List the camera properties and check we have a camera # "Model" property.