package/libcamera: bump version to 0.5.1
Removed patches which are included in this release. Release notes: https://git.linuxtv.org/libcamera.git/tag/?h=v0.5.1 Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
committed by
Julien Olivain
Julien Olivain
parent
3142a7cf31
commit
0e1d85930f
@@ -1,51 +0,0 @@
|
||||
From ae2b6cb3cac6a38a6c96625915cea4b9cf3fc180 Mon Sep 17 00:00:00 2001
|
||||
From: Quentin Schulz <quentin.schulz@cherry.de>
|
||||
Date: Fri, 4 Apr 2025 18:12:35 +0200
|
||||
Subject: [PATCH] meson: Do not automatically build documentation if
|
||||
sphinx-build-3 is found
|
||||
|
||||
Commit aba567338b25 ("Documentation: Move all dependencies into
|
||||
features") did an incomplete migration of the documentation boolean
|
||||
option into a documentation feature.
|
||||
|
||||
If sphinx-build-3 binary is found on the host system, the documentation
|
||||
is built, regardless of the value of the feature option.
|
||||
|
||||
This makes sure that sphinx-build-3 presence is only checked if the
|
||||
documentation feature is not disabled (which is the default, as it's
|
||||
"auto" by default).
|
||||
|
||||
This is essential for reproducibility for build systems where
|
||||
sphinx-build-3 may or may not be present when libcamera is built, and
|
||||
also to declutter the generated package if documentation isn't desired.
|
||||
|
||||
Fixes: aba567338b25 ("Documentation: Move all dependencies into features")
|
||||
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
|
||||
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||||
Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
|
||||
Tested-by: Quentin Schulz <quentin.schulz@cherry.de>
|
||||
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
|
||||
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||||
Upstream: https://git.libcamera.org/libcamera/libcamera.git/commit/?id=ae2b6cb3cac6a38a6c96625915cea4b9cf3fc180
|
||||
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
|
||||
---
|
||||
Documentation/meson.build | 6 ++----
|
||||
1 file changed, 2 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Documentation/meson.build b/Documentation/meson.build
|
||||
index 6158320e..0fc5909d 100644
|
||||
--- a/Documentation/meson.build
|
||||
+++ b/Documentation/meson.build
|
||||
@@ -116,10 +116,8 @@ endif
|
||||
# Sphinx
|
||||
#
|
||||
|
||||
-sphinx = find_program('sphinx-build-3', required : false)
|
||||
-if not sphinx.found()
|
||||
- sphinx = find_program('sphinx-build', required : get_option('documentation'))
|
||||
-endif
|
||||
+sphinx = find_program('sphinx-build-3', 'sphinx-build',
|
||||
+ required : get_option('documentation'))
|
||||
|
||||
if sphinx.found()
|
||||
docs_sources = [
|
||||
@@ -1,113 +0,0 @@
|
||||
From 6e24360d3fc91cbeecb4f5cf432cd194bc098618 Mon Sep 17 00:00:00 2001
|
||||
From: Quentin Schulz <quentin.schulz@cherry.de>
|
||||
Date: Thu, 3 Apr 2025 20:09:00 +0200
|
||||
Subject: [PATCH] Revert "libcamera: rkisp1: Eliminate hard-coded resizer
|
||||
limits"
|
||||
|
||||
This reverts commit e85c7ddd38ce8456ab01c2a73baf9e788f6a462e.
|
||||
|
||||
Linux kernel predating 6.4 (specifically commit 7cfb35d3a800 ("media:
|
||||
rkisp1: Implement ENUM_FRAMESIZES") do not have the ioctl in rkisp1
|
||||
driver required to dynamically query the resizer limits.
|
||||
|
||||
Because of that, maxResolution and minResolution are both {0, 0}
|
||||
(default value for Size objects) which means filterSensorResolution()
|
||||
will create an entry for the sensor in sensorSizesMap_ but because the
|
||||
sensor resolution cannot fit inside the min and max resolution of the
|
||||
rkisp1, no size is put into this entry in sensorSizesMap_.
|
||||
On the next call to filterSensorResolution(),
|
||||
sensorSizesMap_.find(sensor) will return the entry but when attempting
|
||||
to call back() on iter->second, it'll trigger an assert because the size
|
||||
array is empty.
|
||||
|
||||
Linux kernel 6.1 is supported until December 2027, so it seems premature
|
||||
to get rid of those hard-coded resizer limits before this happens.
|
||||
|
||||
Let's restore the hard-coded resizer limits as fallbacks, actual limits
|
||||
are still queried from the driver on recent enough kernels.
|
||||
|
||||
Fixes: 761545407c76 ("pipeline: rkisp1: Filter out sensor sizes not supported by the pipeline")
|
||||
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
|
||||
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
|
||||
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||||
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
|
||||
Upstream: https://git.libcamera.org/libcamera/libcamera.git/commit/?id=6e24360d3fc91cbeecb4f5cf432cd194bc098618
|
||||
Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
|
||||
---
|
||||
src/libcamera/pipeline/rkisp1/rkisp1_path.cpp | 21 +++++++++++++------
|
||||
src/libcamera/pipeline/rkisp1/rkisp1_path.h | 3 ++-
|
||||
2 files changed, 17 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
|
||||
index eee5b09e..64018dc5 100644
|
||||
--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
|
||||
+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
|
||||
@@ -54,8 +54,11 @@ const std::map<PixelFormat, uint32_t> formatToMediaBus = {
|
||||
|
||||
} /* namespace */
|
||||
|
||||
-RkISP1Path::RkISP1Path(const char *name, const Span<const PixelFormat> &formats)
|
||||
- : name_(name), running_(false), formats_(formats), link_(nullptr)
|
||||
+RkISP1Path::RkISP1Path(const char *name, const Span<const PixelFormat> &formats,
|
||||
+ const Size &minResolution, const Size &maxResolution)
|
||||
+ : name_(name), running_(false), formats_(formats),
|
||||
+ minResolution_(minResolution), maxResolution_(maxResolution),
|
||||
+ link_(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -517,10 +520,12 @@ void RkISP1Path::stop()
|
||||
}
|
||||
|
||||
/*
|
||||
- * \todo Remove the hardcoded formats once all users will have migrated to a
|
||||
- * recent enough kernel.
|
||||
+ * \todo Remove the hardcoded resolutions and formats once kernels older than
|
||||
+ * v6.4 will stop receiving LTS support (scheduled for December 2027 for v6.1).
|
||||
*/
|
||||
namespace {
|
||||
+constexpr Size RKISP1_RSZ_MP_SRC_MIN{ 32, 16 };
|
||||
+constexpr Size RKISP1_RSZ_MP_SRC_MAX{ 4416, 3312 };
|
||||
constexpr std::array<PixelFormat, 18> RKISP1_RSZ_MP_FORMATS{
|
||||
formats::YUYV,
|
||||
formats::NV16,
|
||||
@@ -542,6 +547,8 @@ constexpr std::array<PixelFormat, 18> RKISP1_RSZ_MP_FORMATS{
|
||||
formats::SRGGB12,
|
||||
};
|
||||
|
||||
+constexpr Size RKISP1_RSZ_SP_SRC_MIN{ 32, 16 };
|
||||
+constexpr Size RKISP1_RSZ_SP_SRC_MAX{ 1920, 1920 };
|
||||
constexpr std::array<PixelFormat, 8> RKISP1_RSZ_SP_FORMATS{
|
||||
formats::YUYV,
|
||||
formats::NV16,
|
||||
@@ -555,12 +562,14 @@ constexpr std::array<PixelFormat, 8> RKISP1_RSZ_SP_FORMATS{
|
||||
} /* namespace */
|
||||
|
||||
RkISP1MainPath::RkISP1MainPath()
|
||||
- : RkISP1Path("main", RKISP1_RSZ_MP_FORMATS)
|
||||
+ : RkISP1Path("main", RKISP1_RSZ_MP_FORMATS,
|
||||
+ RKISP1_RSZ_MP_SRC_MIN, RKISP1_RSZ_MP_SRC_MAX)
|
||||
{
|
||||
}
|
||||
|
||||
RkISP1SelfPath::RkISP1SelfPath()
|
||||
- : RkISP1Path("self", RKISP1_RSZ_SP_FORMATS)
|
||||
+ : RkISP1Path("self", RKISP1_RSZ_SP_FORMATS,
|
||||
+ RKISP1_RSZ_SP_SRC_MIN, RKISP1_RSZ_SP_SRC_MAX)
|
||||
{
|
||||
}
|
||||
|
||||
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h
|
||||
index 2a1ef0ab..430181d3 100644
|
||||
--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h
|
||||
+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h
|
||||
@@ -34,7 +34,8 @@ struct V4L2SubdeviceFormat;
|
||||
class RkISP1Path
|
||||
{
|
||||
public:
|
||||
- RkISP1Path(const char *name, const Span<const PixelFormat> &formats);
|
||||
+ RkISP1Path(const char *name, const Span<const PixelFormat> &formats,
|
||||
+ const Size &minResolution, const Size &maxResolution);
|
||||
|
||||
bool init(MediaDevice *media);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
sha256 cea3b5eebc01aa97930ae64989447ca00bad42ff1e0ce71d90d337650dd9e374 libcamera-v0.5.0-git4.tar.gz
|
||||
# Locally computed
|
||||
sha256 ee2c7086b3c08133bba44856fb9b2ffd1132532150d14da7daecd99ab8a566c2 libcamera-v0.5.1-git4.tar.gz
|
||||
|
||||
# license files
|
||||
sha256 fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c LICENSES/BSD-2-Clause.txt
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git
|
||||
LIBCAMERA_VERSION = v0.5.0
|
||||
LIBCAMERA_VERSION = v0.5.1
|
||||
LIBCAMERA_SITE_METHOD = git
|
||||
LIBCAMERA_DEPENDENCIES = \
|
||||
host-openssl \
|
||||
|
||||
Reference in New Issue
Block a user