From patchwork Thu Jun 11 09:42:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 1307398 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=gmx.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=ZuTWQy44; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49jJmv2M9vz9sRW for ; Thu, 11 Jun 2020 19:42:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8DE5D8809E; Thu, 11 Jun 2020 09:42:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YAM6mCdrF0tk; Thu, 11 Jun 2020 09:42:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 70A468951D; Thu, 11 Jun 2020 09:42:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 8616F1BF869 for ; Thu, 11 Jun 2020 09:42:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 824E8886E5 for ; Thu, 11 Jun 2020 09:42:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ciqm4qyYHRdI for ; Thu, 11 Jun 2020 09:42:34 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by whitealder.osuosl.org (Postfix) with ESMTPS id AD517886D1 for ; Thu, 11 Jun 2020 09:42:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1591868549; bh=DtJiuyrPYB2ToPPjwOYMyh1Wr6PaIwaVNG4dGqQMs9s=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date; b=ZuTWQy44oCUx1trNBfbE02CmglcEeFZWaJuP8sbSL/OyAKQric9yw+BGXUW8mwLQ0 Dr78zMG8TizVHhnaN24qhDheqXfEe6WpnAx/2i8ciFIds6mPmDd20rSZ7X2xeMo1du Wi5MZHrFYKjgfIUodOru2bmMUqLN2YUuQiFL7/lM= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.fritz.box ([62.216.209.72]) by mail.gmx.com (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MOiHf-1jZb6w2LPD-00QA4W; Thu, 11 Jun 2020 11:42:29 +0200 From: Peter Seiderer To: buildroot@busybox.net Date: Thu, 11 Jun 2020 11:42:28 +0200 Message-Id: <20200611094228.14887-1-ps.report@gmx.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-Provags-ID: V03:K1:4VxpQDIizzv3LLgSwfdcOkwDFRk6ln6mcWuOqfIPidZS01d/Dcv eXj47u/mJNjLcv/jnI+It5+O/9Y/MlhB+t3frtwaoR2LM4TO2Pcxn7Sxm+DP2Pdaq5Hbr3N 5QAMzEtoKJx7Z0rCnUicwlXVFcttNjxBc5ulHMGc/3TydTI+OYcPvJ0rw28S5cSnbsd28O5 bVc4nl7hH/sQZwbVguVAw== X-UI-Out-Filterresults: notjunk:1;V03:K0:USRqPs32MTw=:Phwa2RZdwyLyPvf4Fwi/oI sZ8QTrbO8zEdrplmcR5DSoSJBreMddPdnXR7TSaY+XlCZw5gs0IkJiVQ1JGnKB8WWhFLn5sz1 7brOrYBaxK1CUs8s7EjNiCs+PqK4e8XRi1xIF/wL5MUQSTCn1WCyx+U9DsbLW1c2PgSs8PuSP 8jEH4p4x2RaWKUoGMj27nW6BzDemI4xnEpa3lubEpMz8m247wXJYRHQsN5U84CJTM7G7sQVoo 56FRLmopDI+oPmjslFrVPcWpeZH5vWIqiTcnVtCvTuiRBDH+5lMbSKD1EQ9g7y/XLonort9KC NQtjPxHuaH+8mSs73HaVlrrU14jAeU6q6bvTnWzVy4fOGjrvcyh5sE9wbCRdRoo+poJvEV5kK GsiPoCAibpqCXKXXRM+fsqTA9ppdj6q6g7XudgfAKiZlfjSotSkpI/Gkji1T42I4uL7+hdwHz WMNZaKgnAh3pNqz2nykxRski7kR2G8GZPvgx8JBAnQgRb03Grv9oiCV/kVbvCp9DnQVxR/z40 ZgGmOdgnFhSVw+OnJyVa4NdjqGXolGqxtNpF7NSVPQp6tD8gFeKuI5UodQj+4PLxbKeTUIij6 d1Eb0nX2QfuvUqTr/k86YXAB7IC9SXHJ9UvdV83a0Av4SJhyvYLUsD/r0y3SPEipc6MWYHjDV bwJebm9y5R0SnCq5jcR0KklT6wplEOIgeOwVvaxa7W1X7LmGt9HcDO7sXL6zUUEi8hb0bmjJz T2yCyDmPDaGu0sGgYrkkhUTBBFEKO79fZRvkKugiLj4X8mQQlfY1PL9sETl8TNn59iOUXSJsi LN4h7O7U99nM0aqOmvcqF1SQP0X/Ms/N3pV7sR0xukMFPT9N+IZ1AJ6Es+EDOFCan0XXdsAC1 TGwJ6DWzR5RlxP9kpht5ZeFHYzDyX8wiesZbL9FkvfLuTzO1wkWWL4HRaWfiUD4nbl9X4bio+ Q1+is0u5bN7uNp7HUFanz1RgFn5aoDQvVCr5aQPlReV+WXNuGf93nlAiazCqdCvMMI3sv+Z4C +nQuzI7JrqIO562LBqwiYg4YBRsKprW3BN38zFCQ2DlThuOLGn2lSX+U8XXQQygjm25AAou1z 3qS+8I6IkrNirieAFuBldbsDdZBbb0NpKrJzcYRqsT2K5K2zQGUsSjNhubVT8nFbdHEc3gDWJ wb7GZFfDyfy98jGNHone7RI1I9lBef8BT6vhVUZwqp4we1y57oxk85iIZ6XWFfeGiq/Z1gCTO ShETw9RtgF3k9IAK9 Subject: [Buildroot] [PATCH v3] package/libcamera: bump version to 96fab38 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kieran Bingham Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - add host dependencies: openssl, pkgconf, python3-pyyaml - add dependencies: gnutls - changed from mandatory to optional dependency: udev - add dedicated pipeline configure options - add optional dependencies: boost, gstreamer1/gst1-plugins-base, qt5base, tiff - update license info (Apache-2.0 omitted - applies only for android code) Signed-off-by: Peter Seiderer --- Changes v1 -> v2: - re-add LIBCAMERA_LICENSE_FILES list (Kieran Bingham) - fix typo in commit message (Kieran Bingham) - add Reviewed-by from Kieran Bingham Changes v2 -> v3: - add dedicated pipeline configure options to reduce default dependencies (boost) - fix another typo in commit message (Kieran Bingham) - bump version to 96fab38 --- package/libcamera/Config.in | 48 ++++++++++++++++++++--- package/libcamera/libcamera.hash | 15 +++++-- package/libcamera/libcamera.mk | 67 +++++++++++++++++++++++++++++--- 3 files changed, 116 insertions(+), 14 deletions(-) diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in index 0b3540a657..0940bf09f0 100644 --- a/package/libcamera/Config.in +++ b/package/libcamera/Config.in @@ -2,9 +2,10 @@ 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 # gnutls + select BR2_PACKAGE_GNUTLS help libcamera provides a software stack to support complex devices that need heavy hardware image @@ -12,6 +13,43 @@ config BR2_PACKAGE_LIBCAMERA http://www.libcamera.org/ -comment "libcamera needs udev and a toolchain w/ C++, threads, gcc >= 5" +if BR2_PACKAGE_LIBCAMERA + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3 + bool "libcamera ipu3 pipeline" + help + libcamera ipu3 pipeline + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI + bool "libcamera raspberrypi pipeline" + depends on BR2_USE_WCHAR # boost (already enforced for gnutls) + select BR2_PACKAGE_BOOST + help + libcamera raspberrypi pipeline + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1 + bool "libcamera rkisp1 pipeline" + help + libcamera rkips1 pipeline + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE + bool "libcamera simple pipeline" + help + libcamera simple pipeline + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO + bool "libcamera uvcvideo pipeline" + help + libcamera uvcvideo pipeline + + +config BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC + bool "libcamera vimc pipeline" + help + libcamera vimc pipeline + +endif # BR2_PACKAGE_LIBCAMERA + +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 diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash index 6f721d87ee..907764de63 100644 --- a/package/libcamera/libcamera.hash +++ b/package/libcamera/libcamera.hash @@ -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 6995be9d707ba3bcbe7a79bad894484561ee686f68b6523943ada7c0f6607e86 libcamera-96fab38e02792a109c0d35ca2154e95a7b4c8fcb.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 diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk index d209a38df3..c7513d2e68 100644 --- a/package/libcamera/libcamera.mk +++ b/package/libcamera/libcamera.mk @@ -5,14 +5,69 @@ ################################################################################ LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git -LIBCAMERA_VERSION = 448393f77ec9e37cb807e8e8d35c1a4877d253d4 +LIBCAMERA_VERSION = 96fab38e02792a109c0d35ca2154e95a7b4c8fcb LIBCAMERA_SITE_METHOD = git -LIBCAMERA_DEPENDENCIES = udev -LIBCAMERA_CONF_OPTS = -Dtest=false -Ddocumentation=false +LIBCAMERA_DEPENDENCIES = \ + host-openssl \ + host-pkgconf \ + host-python3-pyyaml \ + gnutls +LIBCAMERA_CONF_OPTS = \ + -Dandroid=false \ + -Ddocumentation=false \ + -Dtest=false \ + -Dv4l2=false LIBCAMERA_INSTALL_STAGING = yes -LIBCAMERA_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (utils) +LIBCAMERA_LICENSE = \ + LGPL-2.1+ (library), \ + GPL-2.0+ (utils), \ + MIT (qcam/assets/feathericons), \ + BSD-2-Clause (raspberrypi), \ + GPL-2.0 with Linux-syscall-note or BSD-3-Clause (linux kernel headers), \ + CC0-1.0 (meson build system), \ + CC-BY-SA-4.0 (doc) LIBCAMERA_LICENSE_FILES = \ - licenses/gnu-gpl-2.0.txt \ - licenses/gnu-lgpl-2.1.txt + LICENSES/LGPL-2.1-or-later.txt \ + LICENSES/GPL-2.0-or-later.txt \ + LICENSES/MIT.txt \ + LICENSES/BSD-2-Clause.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/Linux-syscall-note.txt \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/CC0-1.0.txt \ + LICENSES/CC-BY-SA-4.0.txt + +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3) += ipu3 +ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI),y) +LIBCAMERA_PIPELINES-y += raspberrypi +LIBCAMERA_DEPENDENCIES += boost +endif +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1) += rkisp1 +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE) += simple +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO) += uvcvideo +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC) += vimc + +LIBCAMERA_CONF_OPTS += -Dpipelines=$(subst $(space),$(comma),$(LIBCAMERA_PIPELINES-y)) + +# gstreamer-video-1.0, gstreamer-allocators-1.0 +ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy) +LIBCAMERA_CONF_OPTS += -Dgstreamer=enabled +LIBCAMERA_DEPENDENCIES += gstreamer1 gst1-plugins-base +endif + +ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy) +LIBCAMERA_DEPENDENCIES += qt5base +ifeq ($(BR2_PACKAGE_QT5TOOLS)$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS),yy) +LIBCAMERA_DEPENDENCIES += qt5tools +endif +endif + +ifeq ($(BR2_PACKAGE_TIFF),y) +LIBCAMERA_DEPENDENCIES += tiff +endif + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +LIBCAMERA_DEPENDENCIES += udev +endif $(eval $(meson-package))