[master/kirkstone][PATCH v2 1/3] libcamera: Add recipe for v0.0.5

[master/kirkstone][PATCH v2 1/3] libcamera: Add recipe for v0.0.5

[Jai Luthra]

For kirkstone, an older recipe is present in meta-oe which is using
libcamera from December 2021 with many missing features.

TI's 6.1 based kernel can support the simple pipeline of libcamera, and
benefit from the latest features in release v0.0.5, so we override the
recipe here for arago.

The new recipe here is taken as-is from meta-oe master.

Signed-off-by: Jai Luthra <j-luthra@ti.com>
---

v2: No changes
Link to v1: https://lore.kernel.org/all/20230705130928.1201894-1-j-luthra@ti.com/

 .../libcamera/libcamera_0.0.5.bb              | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb

diff --git a/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb b/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb
new file mode 100644
index 00000000..6ad376f2
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb
@@ -0,0 +1,72 @@
+SUMMARY = "Linux libcamera framework"
+SECTION = "libs"
+
+LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later"
+
+LIC_FILES_CHKSUM = "\
+    file://LICENSES/GPL-2.0-or-later.txt;md5=fed54355545ffd980b814dab4a3b312c \
+    file://LICENSES/LGPL-2.1-or-later.txt;md5=2a4f4fd2128ea2f65047ee63fbca9f68 \
+"
+
+SRC_URI = " \
+        git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \
+"
+
+SRCREV = "fb44403f1c5571549ac128c21daee9761eb9249c"
+
+PE = "1"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml"
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}"
+
+PACKAGES =+ "${PN}-gst"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base"
+
+LIBCAMERA_PIPELINES ??= "auto"
+
+EXTRA_OEMESON = " \
+    -Dpipelines=${LIBCAMERA_PIPELINES} \
+    -Dv4l2=true \
+    -Dcam=enabled \
+    -Dlc-compliance=disabled \
+    -Dtest=false \
+    -Ddocumentation=disabled \
+"
+
+RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland qt', 'qtwayland', '', d)}"
+
+inherit meson pkgconfig python3native
+
+do_configure:prepend() {
+    sed -i -e 's|py_compile=True,||' ${S}/utils/ipc/mojo/public/tools/mojom/mojom/generate/template_expander.py
+}
+
+do_install:append() {
+    chrpath -d ${D}${libdir}/libcamera.so
+    chrpath -d ${D}${libdir}/v4l2-compat.so
+}
+
+addtask do_recalculate_ipa_signatures_package after do_package before do_packagedata
+do_recalculate_ipa_signatures_package() {
+    local modules
+    for module in $(find ${PKGD}/usr/lib/libcamera -name "*.so.sign"); do
+        module="${module%.sign}"
+        if [ -f "${module}" ] ; then
+            modules="${modules} ${module}"
+        fi
+    done
+
+    ${S}/src/ipa/ipa-sign-install.sh ${B}/src/ipa-priv-key.pem "${modules}"
+}
+
+FILES:${PN} += " ${libdir}/v4l2-compat.so"
+FILES:${PN}-gst = "${libdir}/gstreamer-1.0"
+
+# libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to
+# both 32 and 64 bit file APIs.
+GLIBC_64BIT_TIME_FLAGS = ""
+
-- 
2.41.0

[master/kirkstone][PATCH v2 2/3] libcamera: Add support for TI CSI-RX

[Jai Luthra]

TI's CSI-RX driver is not yet upstream, so the libcamera simple pipeline
does not recognize it.

Apply a patch to the simple pipeline so that it can recognize the media
entity for TI's CSI-RX driver.

Signed-off-by: Jai Luthra <j-luthra@ti.com>
---

v2: Add upstream information in the patch
Link to v1: https://lore.kernel.org/all/20230705130928.1201894-2-j-luthra@ti.com/

 .../0001-simple-Support-TI-CSI-RX.patch       | 32 +++++++++++++++++++
 .../libcamera/libcamera_0.0.5.bb              |  1 +
 2 files changed, 33 insertions(+)
 create mode 100644 meta-arago-extras/recipes-multimedia/libcamera/libcamera/0001-simple-Support-TI-CSI-RX.patch

diff --git a/meta-arago-extras/recipes-multimedia/libcamera/libcamera/0001-simple-Support-TI-CSI-RX.patch b/meta-arago-extras/recipes-multimedia/libcamera/libcamera/0001-simple-Support-TI-CSI-RX.patch
new file mode 100644
index 00000000..f35b3613
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/libcamera/libcamera/0001-simple-Support-TI-CSI-RX.patch
@@ -0,0 +1,32 @@
+From d0e4f4f224671e9fc992d39e7beb9c486303ede1 Mon Sep 17 00:00:00 2001
+From: Jai Luthra <j-luthra@ti.com>
+Date: Thu, 23 Mar 2023 11:38:46 +0530
+Subject: [PATCH] simple: Support TI CSI-RX
+
+Add support for TI's CSI-RX pixel grabber device for the simple
+pipeline.
+
+The driver is not yet merged, but v7 is posted [1] upstream.
+
+Link: https://lore.kernel.org/all/20230314115516.667-1-vaishnav.a@ti.com/ [1]
+Signed-off-by: Jai Luthra <j-luthra@ti.com>
+---
+ src/libcamera/pipeline/simple/simple.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
+index e1f8b989..520405a1 100644
+--- a/src/libcamera/pipeline/simple/simple.cpp
++++ b/src/libcamera/pipeline/simple/simple.cpp
+@@ -194,6 +194,8 @@ static const SimplePipelineInfo supportedDevices[] = {
+ 	{ "mxc-isi", {} },
+ 	{ "qcom-camss", {} },
+ 	{ "sun6i-csi", {} },
++	{ "j721e-csi2rx", {} },
++
+ };
+ 
+ } /* namespace */
+-- 
+2.41.0
+
diff --git a/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb b/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb
index 6ad376f2..b2eb5fac 100644
--- a/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb
+++ b/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "\
 
 SRC_URI = " \
         git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \
+        file://0001-simple-Support-TI-CSI-RX.patch \
 "
 
 SRCREV = "fb44403f1c5571549ac128c21daee9761eb9249c"
-- 
2.41.0

[master/kirkstone][PATCH v2 3/3] meta-arago-distro: Package libcamera in tisdk

[Jai Luthra]

Libcamera is useful for testing simple camera pipelines, without
requiring manual configuration of media graph for all v4l2-subdevs.

Enable it for TISDK images, along with the optional package for the
libcamerasrc gstreamer element [1]

Link: https://github.com/libcamera-org/libcamera/blob/master/src/gstreamer/gstlibcamerasrc.cpp [1]
Signed-off-by: Jai Luthra <j-luthra@ti.com>
---

v2: Add link to the gstreamer element
Link to v1: https://lore.kernel.org/all/20230705130928.1201894-3-j-luthra@ti.com/

 meta-arago-distro/conf/distro/arago.conf                       | 3 +++
 .../packagegroups/packagegroup-arago-tisdk-multimedia.bb       | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index e0087ab7..bb074478 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -128,6 +128,9 @@ PACKAGECONFIG:append:pn-gstreamer1.0 = " tracer-hooks"
 # Enable kmssink in gstreamer
 PACKAGECONFIG:append:pn-gstreamer1.0-plugins-bad = " kms"
 
+# Enable gstreamer plugin for libcamera
+PACKAGECONFIG:append:pn-libcamera = " gst"
+
 # Disable pulseaudio routing in alsa by default
 PACKAGECONFIG:remove:pn-alsa-plugins = "pulseaudio"
 RDEPENDS:pulseaudio-server:remove = "alsa-plugins-pulseaudio-conf"
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
index d06fbb6f..b4148882 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-multimedia.bb
@@ -8,6 +8,8 @@ inherit packagegroup
 
 MULTIMEDIA = " \
     amsdk-av-files \
+    libcamera \
+    libcamera-gst \
 "
 
 MULTIMEDIA:omapl138 = ""
-- 
2.41.0

Re: [meta-arago] [master/kirkstone][PATCH v2 2/3] libcamera: Add support for TI CSI-RX

[Denys Dmytriyenko]

On Thu, Jul 06, 2023 at 09:25:21AM +0530, Jai Luthra via lists.yoctoproject.org wrote:
> TI's CSI-RX driver is not yet upstream, so the libcamera simple pipeline
> does not recognize it.
> 
> Apply a patch to the simple pipeline so that it can recognize the media
> entity for TI's CSI-RX driver.
> 
> Signed-off-by: Jai Luthra <j-luthra@ti.com>
> ---
> 
> v2: Add upstream information in the patch
> Link to v1: https://lore.kernel.org/all/20230705130928.1201894-2-j-luthra@ti.com/
> 
>  .../0001-simple-Support-TI-CSI-RX.patch       | 32 +++++++++++++++++++
>  .../libcamera/libcamera_0.0.5.bb              |  1 +
>  2 files changed, 33 insertions(+)
>  create mode 100644 meta-arago-extras/recipes-multimedia/libcamera/libcamera/0001-simple-Support-TI-CSI-RX.patch
> 
> diff --git a/meta-arago-extras/recipes-multimedia/libcamera/libcamera/0001-simple-Support-TI-CSI-RX.patch b/meta-arago-extras/recipes-multimedia/libcamera/libcamera/0001-simple-Support-TI-CSI-RX.patch
> new file mode 100644
> index 00000000..f35b3613
> --- /dev/null
> +++ b/meta-arago-extras/recipes-multimedia/libcamera/libcamera/0001-simple-Support-TI-CSI-RX.patch
> @@ -0,0 +1,32 @@
> +From d0e4f4f224671e9fc992d39e7beb9c486303ede1 Mon Sep 17 00:00:00 2001
> +From: Jai Luthra <j-luthra@ti.com>
> +Date: Thu, 23 Mar 2023 11:38:46 +0530
> +Subject: [PATCH] simple: Support TI CSI-RX
> +
> +Add support for TI's CSI-RX pixel grabber device for the simple
> +pipeline.
> +
> +The driver is not yet merged, but v7 is posted [1] upstream.
> +
> +Link: https://lore.kernel.org/all/20230314115516.667-1-vaishnav.a@ti.com/ [1]

No, that is not a required Upstream-Status tag. See here:
https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines#Patch_Header_Recommendations:_Upstream-Status


> +Signed-off-by: Jai Luthra <j-luthra@ti.com>
> +---
> + src/libcamera/pipeline/simple/simple.cpp | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
> +index e1f8b989..520405a1 100644
> +--- a/src/libcamera/pipeline/simple/simple.cpp
> ++++ b/src/libcamera/pipeline/simple/simple.cpp
> +@@ -194,6 +194,8 @@ static const SimplePipelineInfo supportedDevices[] = {
> + 	{ "mxc-isi", {} },
> + 	{ "qcom-camss", {} },
> + 	{ "sun6i-csi", {} },
> ++	{ "j721e-csi2rx", {} },
> ++
> + };
> + 
> + } /* namespace */
> +-- 
> +2.41.0
> +
> diff --git a/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb b/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb
> index 6ad376f2..b2eb5fac 100644
> --- a/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb
> +++ b/meta-arago-extras/recipes-multimedia/libcamera/libcamera_0.0.5.bb
> @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "\
>  
>  SRC_URI = " \
>          git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \
> +        file://0001-simple-Support-TI-CSI-RX.patch \
>  "
>  
>  SRCREV = "fb44403f1c5571549ac128c21daee9761eb9249c"
> -- 
> 2.41.0