Skip to contentSkip to conversation

package/libcamera: bump version to 8823461

PATCH Superseded Peter Seiderer 3 participants 4 messages Jun 10, 2020 – Jun 11, 2020

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/libcamera: bump version to 8823461

- add host dependencies: openssl, pkgconf, pyhton3-pyyaml
- add dependencies: boost, gnutls
- changed from mandatory to optional dependency: udev
- add optional dependencies: gstreamer1/gst1-plugins-base, qt5base, tiff
- update license info (Apache-2.0 omitted - applies only for android code)

---
Changes v1 -> v2:
- re-add LIBCAMERA_LICENSE_FILES list (Kieran Bingham)
- fix typo in commit message (Kieran Bingham)
- add Reviewed-by from Kieran Bingham

---
 package/libcamera/Config.in      | 12 ++++---
 package/libcamera/libcamera.hash | 15 +++++++--
 package/libcamera/libcamera.mk   | 56 ++++++++++++++++++++++++++++----
 3 files changed, 69 insertions(+), 14 deletions(-)
package/libcamera/Config.in +7 -5
index 0b3540a657..5253c14cf1 100644
@@ -2,9 +2,11 @@ config BR2_PACKAGE_LIBCAMERA
 	bool "libcamera"
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	# C++11 + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54316
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5
-	depends on BR2_PACKAGE_HAS_UDEV
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14
+	depends on !BR2_STATIC_LIBS # gnutls
+	depends on BR2_USE_WCHAR # boost, gnutls
+	select BR2_PACKAGE_BOOST
+	select BR2_PACKAGE_GNUTLS
 	help
 	  libcamera provides a software stack to support
 	  complex devices that need heavy hardware image
@@ -12,6 +14,6 @@ config BR2_PACKAGE_LIBCAMERA
 
 	  http://www.libcamera.org/
 
-comment "libcamera needs udev and a toolchain w/ C++, threads, gcc >= 5"
+comment "libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 5"
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_PACKAGE_HAS_UDEV
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_5 || BR2_STATIC_LIBS || !BR2_USE_WCHAR
package/libcamera/libcamera.hash +12 -3
index 6f721d87ee..48c90587d3 100644
@@ -1,3 +1,12 @@
-sha256 cbaa7e06059717f71b57f9c20135c86d5f121d9aab10bfc20513ba5d04478756  libcamera-448393f77ec9e37cb807e8e8d35c1a4877d253d4.tar.gz
-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  licenses/gnu-gpl-2.0.txt
-sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c  licenses/gnu-lgpl-2.1.txt
+sha256  a7ee893f16f789b5b4c7ffdf3346b887f21b3ead91a544e6a25a9c798f5f3e67  libcamera-8823461d80ad64b972bc6d568c47aba50bed26a4.tar.gz
+
+# license files
+sha256  fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c  LICENSES/BSD-2-Clause.txt
+sha256  e11af671c491efac2f94c1d752bea92f4308ca2450c7d11e582e4b48c40e4de1  LICENSES/BSD-3-Clause.txt
+sha256  6a573fb2f9082662978cf21fb153096df0a1981deaea7dbc10a11046fe005d9f  LICENSES/CC0-1.0.txt
+sha256  ec3732087acf8c52429a020d6bba362ff578705bdb53365a21744485ec15b0e6  LICENSES/CC-BY-SA-4.0.txt
+sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSES/GPL-2.0-only.txt
+sha256  606aa26338f69ce178f1cbc648b7574aec4b5bbaeb20f4df36ff49010cb8fbbd  LICENSES/GPL-2.0-or-later.txt
+sha256  1ccf09bf2f598308df4bed9cd8e9657dc5cd0973d2800318f2e241486e2edf3f  LICENSES/LGPL-2.1-or-later.txt
+sha256  3f9e477523febab58de8b716ccfbcf02e6ef1c8e7728953905e8558637abe2a9  LICENSES/Linux-syscall-note.txt
+sha256  8f25018489d6fe0dec34a352314c38dc146247b7de65735790f4398a92afa84b  LICENSES/MIT.txt
package/libcamera/libcamera.mk +50 -6

64 lines not on this page · raw message

Signature · 1 line
2.26.2
#1 lore raw

PATCH v2 1/1 package/libcamera: bump version to 8823461

Quoted 2 lines · On Wed, 10 Jun 2020 23:18:11 +0200 Peter Seiderer <[email protected]> wrote:

- add host dependencies: openssl, pkgconf, pyhton3-pyyaml
- add dependencies: boost, gnutls

Nooooo, it really unconditionally needs boost and gnutls? Why so? This really seems like an odd choice from upstream. Kieran, do you confirm this is really what you guys are doing?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH v2 1/1 package/libcamera: bump version to 8823461

Hello Thomas,

Quoted 9 lines · Thomas Petazzoni
Quoted 2 lines · On Wed, 10 Jun 2020 23:18:11 +0200 Peter Seiderer <[email protected]> wrote:

- add host dependencies: openssl, pkgconf, pyhton3-pyyaml
- add dependencies: boost, gnutls

Nooooo, it really unconditionally needs boost and gnutls? Why so? This really seems like an odd choice from upstream. Kieran, do you confirm this is really what you guys are doing?

According to [1] (and tested) gnutls is required...

The Boost dependency is only needed for the raspberrypi part and can
be avoided by adding 'LIBCAMERA_CONF_OPTS += Dpipelines=ipu3,rkisp1,simple,uvcvideo,vimc' (all but raspberrypi)

Regards,
Peter

Quoted 2 lines

Thomas

#3 lore raw

PATCH v2 1/1 package/libcamera: bump version to 8823461

Hi Peter, Thomas,

Quoted 8 lines · Peter Seiderer

Hello Thomas,

Quoted 4 lines · Thomas Petazzoni
Quoted 1 line · On Wed, 10 Jun 2020 23:18:11 +0200 Peter Seiderer <[email protected]> wrote:

- add host dependencies: openssl, pkgconf, pyhton3-pyyaml

s/pyhton3-pyyaml/python3-pyyaml/

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

- add dependencies: boost, gnutls

Nooooo, it really unconditionally needs boost and gnutls? Why so? This really seems like an odd choice from upstream. Kieran, do you confirm this is really what you guys are doing?

According to [1] (and tested) gnutls is required...

The module signing process requires openssl on the host to 'sign' the IPA modules during the build process.

On the target, gnutls is used to validate and verify IPA modules as having been built at the same time. If so, then those modules are permitted to be included in the same process space as libcamera and are 'trusted'.

Otherwise - if they are 'external' modules, they are forced to be external and run in the sand-box environment. If gnutls is not available, the module signing process will declare all modules to be 'untrusted'.

Quoted 3 lines

The Boost dependency is only needed for the raspberrypi part and can
be avoided by adding 'LIBCAMERA_CONF_OPTS += Dpipelines=ipu3,rkisp1,simple,uvcvideo,vimc' (all but raspberrypi)

Boost is unfortunate at the moment, and indeed is required to build the RPi IPA.

Technically it only uses headers from boost I think for JSON parsing ... and we do want to remove that dependency - as it ends up pulling in a huge dependency for ... a very small part of that. :S

Ok - so grepping shows it uses the following headers:

#include <boost/property_tree/ptree.hpp>
#include <boost/property_tree/json_parser.hpp>
#include <boost/any.hpp>

Anyone know if it's feasible to extract just the json_parser/ptree headers from boost? I fear a never ending entanglement of required headers if we tried to pull just those components out.

Hrm ... and std::any doesn't get in C++ until C++17 .. so we do still need that one too ...

You could disable the RPi pipeline in buildroot, but I would expect that RPi is probably the main target for anyone using buildroot to play with libcamera at the moment ... (perhaps along with the rockchip targets)

We probably need to work on making the pipeline configurations smarter to only build for the current architecture - but that should probably be handled in libcamera. (with a compile test pipelines=all option).

--
Kieran

Quoted 5 lines

Regards,
Peter

Quoted 2 lines

Thomas

Signature · 3 lines
Regards
--
Kieran