From 9948eb64d1d0a96c175114cfb2069cd301df740d Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 17 Mar 2024 16:11:22 +0200
Subject: chore(users/flokli/ipu6-softisp): refresh libcamera patches

Refresh them with the patches from
https://patchwork.libcamera.org/cover/19663/.

This is still based off v0.2.0.

Change-Id: I875fd64e3bb71a95c92af1108a23d27c0f3494e0
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11179
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: flokli <flokli@flokli.de>
---
 ...nternal-Document-the-SharedMemObject-clas.patch | 139 ---------------------
 1 file changed, 139 deletions(-)
 delete mode 100644 users/flokli/ipu6-softisp/libcamera/0005-libcamera-internal-Document-the-SharedMemObject-clas.patch

(limited to 'users/flokli/ipu6-softisp/libcamera/0005-libcamera-internal-Document-the-SharedMemObject-clas.patch')

diff --git a/users/flokli/ipu6-softisp/libcamera/0005-libcamera-internal-Document-the-SharedMemObject-clas.patch b/users/flokli/ipu6-softisp/libcamera/0005-libcamera-internal-Document-the-SharedMemObject-clas.patch
deleted file mode 100644
index a20d27059db0..000000000000
--- a/users/flokli/ipu6-softisp/libcamera/0005-libcamera-internal-Document-the-SharedMemObject-clas.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-From cb9ff82efd82af8ae26b2aca4183928c74f7ef34 Mon Sep 17 00:00:00 2001
-From: Dennis Bonke <admin@dennisbonke.com>
-Date: Wed, 20 Dec 2023 16:22:29 +0100
-Subject: [PATCH 05/25] libcamera: internal: Document the SharedMemObject class
-
-Document the SharedMemObject class.
-
-Signed-off-by: Dennis Bonke <admin@dennisbonke.com>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
-Tested-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> # sc8280xp Lenovo x13s
-Tested-by: Pavel Machek <pavel@ucw.cz>
----
- .../libcamera/internal/shared_mem_object.h    | 53 +++++++++++++++++++
- 1 file changed, 53 insertions(+)
-
-diff --git a/include/libcamera/internal/shared_mem_object.h b/include/libcamera/internal/shared_mem_object.h
-index bfb639ee..e862ce48 100644
---- a/include/libcamera/internal/shared_mem_object.h
-+++ b/include/libcamera/internal/shared_mem_object.h
-@@ -19,10 +19,20 @@
- 
- namespace libcamera {
- 
-+/**
-+ * \class SharedMemObject
-+ * \brief Helper class for shared memory allocations.
-+ *
-+ * Takes a template T which is used to indicate the
-+ * data type of the object stored.
-+ */
- template<class T>
- class SharedMemObject
- {
- public:
-+	/**
-+	 * \brief The size of the object that is going to be stored here.
-+	 */
- 	static constexpr std::size_t SIZE = sizeof(T);
- 
- 	SharedMemObject()
-@@ -30,6 +40,11 @@ public:
- 	{
- 	}
- 
-+	/**
-+	 * \brief Contstructor for the SharedMemObject.
-+	 * \param[in] name The requested name.
-+	 * \param[in] args Any additional args.
-+	 */
- 	template<class... Args>
- 	SharedMemObject(const std::string &name, Args &&...args)
- 		: name_(name), obj_(nullptr)
-@@ -57,6 +72,10 @@ public:
- 		obj_ = new (mem) T(std::forward<Args>(args)...);
- 	}
- 
-+	/**
-+	 * \brief Move constructor for SharedMemObject.
-+	 * \param[in] rhs The object to move.
-+	 */
- 	SharedMemObject(SharedMemObject<T> &&rhs)
- 	{
- 		this->name_ = std::move(rhs.name_);
-@@ -76,6 +95,10 @@ public:
- 	/* Make SharedMemObject non-copyable for now. */
- 	LIBCAMERA_DISABLE_COPY(SharedMemObject)
- 
-+	/**
-+	 * \brief Operator= for SharedMemObject.
-+	 * \param[in] rhs The SharedMemObject object to take the data from.
-+	 */
- 	SharedMemObject<T> &operator=(SharedMemObject<T> &&rhs)
- 	{
- 		this->name_ = std::move(rhs.name_);
-@@ -85,31 +108,61 @@ public:
- 		return *this;
- 	}
- 
-+	/**
-+	 * \brief Operator-> for SharedMemObject.
-+	 *
-+	 * \return the object.
-+	 */
- 	T *operator->()
- 	{
- 		return obj_;
- 	}
- 
-+	/**
-+	 * \brief Operator-> for SharedMemObject.
-+	 *
-+	 * \return the object.
-+	 */
- 	const T *operator->() const
- 	{
- 		return obj_;
- 	}
- 
-+	/**
-+	 * \brief Operator* for SharedMemObject.
-+	 *
-+	 * \return the object.
-+	 */
- 	T &operator*()
- 	{
- 		return *obj_;
- 	}
- 
-+	/**
-+	 * \brief Operator* for SharedMemObject.
-+	 *
-+	 * \return the object.
-+	 */
- 	const T &operator*() const
- 	{
- 		return *obj_;
- 	}
- 
-+	/**
-+	 * \brief Gets the file descriptor for the underlaying storage file.
-+	 *
-+	 * \return the file descriptor.
-+	 */
- 	const SharedFD &fd() const
- 	{
- 		return fd_;
- 	}
- 
-+	/**
-+	 * \brief Operator bool() for SharedMemObject.
-+	 *
-+	 * \return true if the object is not null, false otherwise.
-+	 */
- 	explicit operator bool() const
- 	{
- 		return !!obj_;
--- 
-2.43.0
-
-- 
cgit 1.4.1