[{"id":5276,"web_url":"https://patchwork.libcamera.org/comment/5276/","msgid":"<20200618201146.GQ2351@scaer>","date":"2020-06-18T20:11:46","subject":"Re: [libcamera-devel] [PATCH v4 1/2] package/libcamera: bump\n\tversion to 96fab38","submitter":{"id":11,"url":"https://patchwork.libcamera.org/api/people/11/","name":"Yann E. MORIN","email":"yann.morin.1998@free.fr"},"content":"Peter, All,\n\nOn 2020-06-16 20:59 +0200, Peter Seiderer spake thusly:\n> - add host dependencies: openssl, pkgconf, python3-pyyaml\n> - add dependencies: gnutls\n> - changed from mandatory to optional dependency: udev\n> - add dedicated pipeline configure options\n> - add optional dependencies: boost, gstreamer1/gst1-plugins-base,\n>   qt5base, tiff\n> - update license info (Apache-2.0 omitted - applies only for android code)\n> \n> Signed-off-by: Peter Seiderer <ps.report@gmx.net>\n> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\nApplied to master, after simplifying the qt5 widgets and qt5 linguist\nconditions. Thanks!\n\nRegards,\nYann E. MORIN.\n\n> ---\n> Changes v1 -> v2:\n>   - re-add LIBCAMERA_LICENSE_FILES list (Kieran Bingham)\n>   - fix typo in commit message (Kieran Bingham)\n>   - add Reviewed-by from Kieran Bingham\n> \n> Changes v2 -> v3:\n>   - add dedicated pipeline configure options to reduce default\n>     dependencies (boost)\n>   - fix another typo in commit message (Kieran Bingham)\n>   - bump version to 96fab38\n> \n> Changes v3 -> v4:\n>   - use menuconfig\n>   - force at least one default pipeline (uvcvideo)\n>   - remove repetitive libcamera from options/help text\n>   - remove spurios empty line\n>   - add reviewd-by from Kieran\n> ---\n>  package/libcamera/Config.in      | 58 ++++++++++++++++++++++++---\n>  package/libcamera/libcamera.hash | 15 +++++--\n>  package/libcamera/libcamera.mk   | 67 +++++++++++++++++++++++++++++---\n>  3 files changed, 125 insertions(+), 15 deletions(-)\n> \n> diff --git a/package/libcamera/Config.in b/package/libcamera/Config.in\n> index 0b3540a657..56ca5aaf18 100644\n> --- a/package/libcamera/Config.in\n> +++ b/package/libcamera/Config.in\n> @@ -1,10 +1,12 @@\n> -config BR2_PACKAGE_LIBCAMERA\n> +menuconfig BR2_PACKAGE_LIBCAMERA\n>  \tbool \"libcamera\"\n>  \tdepends on BR2_INSTALL_LIBSTDCPP\n>  \tdepends on BR2_TOOLCHAIN_HAS_THREADS\n> -\t# C++11 + https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54316\n> -\tdepends on BR2_TOOLCHAIN_GCC_AT_LEAST_5\n> -\tdepends on BR2_PACKAGE_HAS_UDEV\n> +\tdepends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14\n> +\tdepends on !BR2_STATIC_LIBS # gnutls\n> +\tdepends on BR2_USE_WCHAR # gnutls\n> +\tselect BR2_PACKAGE_GNUTLS\n> +\tselect BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO if !BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE\n>  \thelp\n>  \t  libcamera provides a software stack to support\n>  \t  complex devices that need heavy hardware image\n> @@ -12,6 +14,50 @@ config BR2_PACKAGE_LIBCAMERA\n>  \n>  \t  http://www.libcamera.org/\n>  \n> -comment \"libcamera needs udev and a toolchain w/ C++, threads, gcc >= 5\"\n> +if BR2_PACKAGE_LIBCAMERA\n> +\n> +config BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE\n> +\tbool\n> +\n> +config BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3\n> +\tbool \"ipu3 pipeline\"\n> +\tselect BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE\n> +\thelp\n> +\t  Pipeline for Intel IPU3.\n> +\n> +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI\n> +\tbool \"raspberrypi pipeline\"\n> +\tdepends on BR2_USE_WCHAR # boost (already enforced for gnutls)\n> +\tselect BR2_PACKAGE_BOOST\n> +\tselect BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE\n> +\thelp\n> +\t  Pipeline for Raspberry Pi devices.\n> +\n> +config BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1\n> +\tbool \"rkisp1 pipeline\"\n> +\tselect BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE\n> +\thelp\n> +\t  Pipeline for Rockchip ISP1.\n> +\n> +config BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE\n> +\tbool \"simple pipeline\"\n> +\tselect BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE\n> +\thelp\n> +\t  Pipeline for simple pipelines.\n> +\n> +config BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO\n> +\tbool \"uvcvideo pipeline\"\n> +\thelp\n> +\t  Pipeline for uvcvideo devices.\n> +\n> +config BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC\n> +\tbool \"vimc pipeline\"\n> +\tselect BR2_PACKAGE_LIBCAMERA_HAS_PIPELINE\n> +\thelp\n> +\t  Pipeline for the vimc device.\n> +\n> +endif # BR2_PACKAGE_LIBCAMERA\n> +\n> +comment \"libcamera needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 5\"\n>  \tdepends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \\\n> -\t\t!BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_PACKAGE_HAS_UDEV\n> +\t\t!BR2_TOOLCHAIN_GCC_AT_LEAST_5 || BR2_STATIC_LIBS || !BR2_USE_WCHAR\n> diff --git a/package/libcamera/libcamera.hash b/package/libcamera/libcamera.hash\n> index 6f721d87ee..907764de63 100644\n> --- a/package/libcamera/libcamera.hash\n> +++ b/package/libcamera/libcamera.hash\n> @@ -1,3 +1,12 @@\n> -sha256 cbaa7e06059717f71b57f9c20135c86d5f121d9aab10bfc20513ba5d04478756  libcamera-448393f77ec9e37cb807e8e8d35c1a4877d253d4.tar.gz\n> -sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  licenses/gnu-gpl-2.0.txt\n> -sha256 592987e8510228d546540b84a22444bde98e48d03078d3b2eefcd889bec5ce8c  licenses/gnu-lgpl-2.1.txt\n> +sha256  6995be9d707ba3bcbe7a79bad894484561ee686f68b6523943ada7c0f6607e86  libcamera-96fab38e02792a109c0d35ca2154e95a7b4c8fcb.tar.gz\n> +\n> +# license files\n> +sha256  fd38b2c053c0cce46d9c5ef3545a6e34d157a240ba99c9b8dca5d37a8147da6c  LICENSES/BSD-2-Clause.txt\n> +sha256  e11af671c491efac2f94c1d752bea92f4308ca2450c7d11e582e4b48c40e4de1  LICENSES/BSD-3-Clause.txt\n> +sha256  6a573fb2f9082662978cf21fb153096df0a1981deaea7dbc10a11046fe005d9f  LICENSES/CC0-1.0.txt\n> +sha256  ec3732087acf8c52429a020d6bba362ff578705bdb53365a21744485ec15b0e6  LICENSES/CC-BY-SA-4.0.txt\n> +sha256  8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643  LICENSES/GPL-2.0-only.txt\n> +sha256  606aa26338f69ce178f1cbc648b7574aec4b5bbaeb20f4df36ff49010cb8fbbd  LICENSES/GPL-2.0-or-later.txt\n> +sha256  1ccf09bf2f598308df4bed9cd8e9657dc5cd0973d2800318f2e241486e2edf3f  LICENSES/LGPL-2.1-or-later.txt\n> +sha256  3f9e477523febab58de8b716ccfbcf02e6ef1c8e7728953905e8558637abe2a9  LICENSES/Linux-syscall-note.txt\n> +sha256  8f25018489d6fe0dec34a352314c38dc146247b7de65735790f4398a92afa84b  LICENSES/MIT.txt\n> diff --git a/package/libcamera/libcamera.mk b/package/libcamera/libcamera.mk\n> index d209a38df3..c7513d2e68 100644\n> --- a/package/libcamera/libcamera.mk\n> +++ b/package/libcamera/libcamera.mk\n> @@ -5,14 +5,69 @@\n>  ################################################################################\n>  \n>  LIBCAMERA_SITE = https://git.linuxtv.org/libcamera.git\n> -LIBCAMERA_VERSION = 448393f77ec9e37cb807e8e8d35c1a4877d253d4\n> +LIBCAMERA_VERSION = 96fab38e02792a109c0d35ca2154e95a7b4c8fcb\n>  LIBCAMERA_SITE_METHOD = git\n> -LIBCAMERA_DEPENDENCIES = udev\n> -LIBCAMERA_CONF_OPTS = -Dtest=false -Ddocumentation=false\n> +LIBCAMERA_DEPENDENCIES = \\\n> +\thost-openssl \\\n> +\thost-pkgconf \\\n> +\thost-python3-pyyaml \\\n> +\tgnutls\n> +LIBCAMERA_CONF_OPTS = \\\n> +\t-Dandroid=false \\\n> +\t-Ddocumentation=false \\\n> +\t-Dtest=false \\\n> +\t-Dv4l2=false\n>  LIBCAMERA_INSTALL_STAGING = yes\n> -LIBCAMERA_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (utils)\n> +LIBCAMERA_LICENSE = \\\n> +\tLGPL-2.1+ (library), \\\n> +\tGPL-2.0+ (utils), \\\n> +\tMIT (qcam/assets/feathericons), \\\n> +\tBSD-2-Clause (raspberrypi), \\\n> +\tGPL-2.0 with Linux-syscall-note or BSD-3-Clause (linux kernel headers), \\\n> +\tCC0-1.0 (meson build system), \\\n> +\tCC-BY-SA-4.0 (doc)\n>  LIBCAMERA_LICENSE_FILES = \\\n> -\tlicenses/gnu-gpl-2.0.txt \\\n> -\tlicenses/gnu-lgpl-2.1.txt\n> +\tLICENSES/LGPL-2.1-or-later.txt \\\n> +\tLICENSES/GPL-2.0-or-later.txt \\\n> +\tLICENSES/MIT.txt \\\n> +\tLICENSES/BSD-2-Clause.txt \\\n> +\tLICENSES/GPL-2.0-only.txt \\\n> +\tLICENSES/Linux-syscall-note.txt \\\n> +\tLICENSES/BSD-3-Clause.txt \\\n> +\tLICENSES/CC0-1.0.txt \\\n> +\tLICENSES/CC-BY-SA-4.0.txt\n> +\n> +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_IPU3) += ipu3\n> +ifeq ($(BR2_PACKAGE_LIBCAMERA_PIPELINE_RASPBERRYPI),y)\n> +LIBCAMERA_PIPELINES-y += raspberrypi\n> +LIBCAMERA_DEPENDENCIES += boost\n> +endif\n> +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_RKISP1) += rkisp1\n> +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_SIMPLE) += simple\n> +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_UVCVIDEO) += uvcvideo\n> +LIBCAMERA_PIPELINES-$(BR2_PACKAGE_LIBCAMERA_PIPELINE_VIMC) += vimc\n> +\n> +LIBCAMERA_CONF_OPTS += -Dpipelines=$(subst $(space),$(comma),$(LIBCAMERA_PIPELINES-y))\n> +\n> +# gstreamer-video-1.0, gstreamer-allocators-1.0\n> +ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy)\n> +LIBCAMERA_CONF_OPTS += -Dgstreamer=enabled\n> +LIBCAMERA_DEPENDENCIES += gstreamer1 gst1-plugins-base\n> +endif\n> +\n> +ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy)\n> +LIBCAMERA_DEPENDENCIES += qt5base\n> +ifeq ($(BR2_PACKAGE_QT5TOOLS)$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS),yy)\n> +LIBCAMERA_DEPENDENCIES += qt5tools\n> +endif\n> +endif\n> +\n> +ifeq ($(BR2_PACKAGE_TIFF),y)\n> +LIBCAMERA_DEPENDENCIES += tiff\n> +endif\n> +\n> +ifeq ($(BR2_PACKAGE_HAS_UDEV),y)\n> +LIBCAMERA_DEPENDENCIES += udev\n> +endif\n>  \n>  $(eval $(meson-package))\n> -- \n> 2.27.0\n>","headers":{"Return-Path":"<yann.morin.1998@free.fr>","Received":["from smtp4-g21.free.fr (smtp4-g21.free.fr\n\t[IPv6:2a01:e0c:1:1599::13])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A6C1D60430\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 18 Jun 2020 22:11:55 +0200 (CEST)","from ymorin.is-a-geek.org (unknown\n\t[IPv6:2a01:cb19:8b51:cb00:85b5:e221:cd83:64a9])\n\t(Authenticated sender: yann.morin.1998)\n\tby smtp4-g21.free.fr (Postfix) with ESMTPSA id C1B3D19F55C;\n\tThu, 18 Jun 2020 22:11:46 +0200 (CEST)","by ymorin.is-a-geek.org (sSMTP sendmail emulation);\n\tThu, 18 Jun 2020 22:11:46 +0200"],"Date":"Thu, 18 Jun 2020 22:11:46 +0200","From":"\"Yann E. MORIN\" <yann.morin.1998@free.fr>","To":"Peter Seiderer <ps.report@gmx.net>","Cc":"buildroot@busybox.net, Kieran Bingham <kieran.bingham@ideasonboard.com>, \n\tlibcamera-devel@lists.libcamera.org","Message-ID":"<20200618201146.GQ2351@scaer>","References":"<20200616185951.30319-1-ps.report@gmx.net>\n\t<20200616185951.30319-2-ps.report@gmx.net>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20200616185951.30319-2-ps.report@gmx.net>","User-Agent":"Mutt/1.5.22 (2013-10-16)","X-Mailman-Approved-At":"Fri, 19 Jun 2020 00:59:21 +0200","Subject":"Re: [libcamera-devel] [PATCH v4 1/2] package/libcamera: bump\n\tversion to 96fab38","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Thu, 18 Jun 2020 20:11:55 -0000"}}]