Re: [ptxdist] [PATCH v3 1/1] libcamera: new package
On Wed, Sep 14, 2022 at 09:51:41PM +0200, Matthias Fend wrote:
> libcamera is an open source camera stack and framework for Linux, Android,
> and ChromeOS.
>
> Signed-off-by: Matthias Fend
> ---
> ...t-information-for-version-generation.patch | 29
> .../libcamera-2022-08-30-g68683d3811a8/series | 4 +
> rules/libcamera.in| 129
> rules/libcamera.make | 143 ++
> 4 files changed, 305 insertions(+)
> create mode 100644
> patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> create mode 100644 patches/libcamera-2022-08-30-g68683d3811a8/series
> create mode 100644 rules/libcamera.in
> create mode 100644 rules/libcamera.make
>
> diff --git
> a/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
>
> b/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> new file mode 100644
> index 0..3e5c5ce68
> --- /dev/null
> +++
> b/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> @@ -0,0 +1,29 @@
> +From: Matthias Fend
> +Date: Wed, 31 Aug 2022 16:54:20 +0200
> +Subject: [PATCH] do not use git information for version generation
> +
> +Since libcamera is checked out without a git repo, git version reports the
> +version of the BSP. Since this is obviously wrong, just use the project
> +version.
> +
> +Signed-off-by: Matthias Fend
> +---
> + meson.build | 5 ++---
> + 1 file changed, 2 insertions(+), 3 deletions(-)
> +
> +diff --git a/meson.build b/meson.build
> +index 72919102ad55..e333df59388d 100644
> +--- a/meson.build
> b/meson.build
> +@@ -20,9 +20,8 @@ libcamera_git_version = run_command('utils/gen-version.sh',
> + meson.project_build_root(),
> + meson.project_source_root(),
> + check: false).stdout().strip()
> +-if libcamera_git_version == ''
> +-libcamera_git_version = meson.project_version()
> +-endif
> ++
> ++libcamera_git_version = meson.project_version()
> +
> + libcamera_version = libcamera_git_version.split('+')[0]
> +
> diff --git a/patches/libcamera-2022-08-30-g68683d3811a8/series
> b/patches/libcamera-2022-08-30-g68683d3811a8/series
> new file mode 100644
> index 0..6ca42eafc
> --- /dev/null
> +++ b/patches/libcamera-2022-08-30-g68683d3811a8/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-do-not-use-git-information-for-version-generation.patch
> +# c3a57143ea9764ab95b84a7fb79896f4 - git-ptx-patches magic
> diff --git a/rules/libcamera.in b/rules/libcamera.in
> new file mode 100644
> index 0..4c320d0ab
> --- /dev/null
> +++ b/rules/libcamera.in
> @@ -0,0 +1,129 @@
> +## SECTION=multimedia_libs
> +
> +menuconfig LIBCAMERA
> + bool
> + select HOST_MESON
> + select HOST_SYSTEM_PYTHON3
> + select HOST_SYSTEM_PYTHON3_JINJA2
> + select HOST_SYSTEM_PYTHON3_PYYAML
> + select HOST_SYSTEM_PYTHON3_PLY
> + select HOST_OPENSSL
> + select GNUTLS if
> LIBCAMERA_IPA_MODULE_SIGN_GNUTLS
> + select OPENSSL if
> LIBCAMERA_IPA_MODULE_SIGN_OPENSSL
> + select UDEV_LIBUDEV
> + select LIBYAML
> + select LIBUNWINDif LIBCAMERA_BACKTRACE
> + select GSTREAMER1 if LIBCAMERA_GSTREAMER
> + select GST_PLUGINS_BASE1if LIBCAMERA_GSTREAMER
> + select LIBEVENT if LIBCAMERA_CAM
> + select LIBDRM if LIBCAMERA_CAM_KMS_SINK
> + select QT5 if LIBCAMERA_QCAM
> + select QT5_MODULE_QTBASEif LIBCAMERA_QCAM
> + select QT5_MODULE_QTBASE_GUIif LIBCAMERA_QCAM
> + select QT5_MODULE_QTBASE_WIDGETSif LIBCAMERA_QCAM
> + prompt "libcamera "
> + help
> + A complex camera support library for Linux, Android, and ChromeOS.
> +
> +if LIBCAMERA
> +
> +config LIBCAMERA_GSTREAMER
> + bool
> + prompt "Install GStreamer plugin"
> +
> +config LIBCAMERA_CAM
> + bool
> + prompt "Install cam test application"
> +
> +if LIBCAMERA_CAM
> +
> +config LIBCAMERA_CAM_KMS_SINK
> + bool
> + prompt "Enable KMS sink"
> +endif
> +
> +config LIBCAMERA_QCAM
> + bool
> + prompt "Install qcam test application"
> +
> +config LIBCAMERA_BACKTRACE
> + bool
> + prompt "Enable tracing support"
> +
> +menu "Platforms"
> +
> +config LIBCAMERA_PIPELINE_IPU3
> + bool
> + prompt "ipu3 pipeline"
> +
> +config LIBCAMERA_IPA_IPU3
> + bool
> + default y
> + prompt "ipu3 IPA"
> + depends on LIBCAMERA_PIPELINE_IPU3
> +
> +config LIBCAMERA_PIPELINE_RASPBERRYPI
> + bool
> + prompt "raspberrypi
Re: [ptxdist] [PATCH v3] libzmq: Add some conf env variables not automatically detected
Hei hei, Am Freitag, 2. September 2022, 12:21:30 CEST schrieb Alexander Dahl: > Follow up to the discussion on the last version bump. > zmq does not (try to) detect these features when cross compiling, > so we must assist. > Output of prepare stage contains this now: > > checking whether EFD_CLOEXEC is supported... (cached) yes > … > checking whether SOCK_CLOEXEC is supported... (cached) yes > checking whether O_CLOEXEC is supported... (cached) yes > checking whether SO_BINDTODEVICE is supported... (cached) yes > checking whether SO_KEEPALIVE is supported... (cached) yes > checking whether TCP_KEEPCNT is supported... (cached) yes > checking whether TCP_KEEPIDLE is supported... (cached) yes > checking whether TCP_KEEPINTVL is supported... (cached) yes > checking whether TCP_KEEPALIVE is supported... not during cross-compile > checking whether SO_PRIORITY is supported... (cached) yes > checking whether getrandom is supported... (cached) yes > > Link: > https://lore.ptxdist.org/ptxdist/20220708151537.gk20...@pengutronix.de/T/#m > 9b6e02442a30b09d25fe98258051ebd34ee4f94b Signed-off-by: Alexander Dahl > > --- > > Notes: > v3: > - Added s-o-b ping? Greets Alex > > v2: > - also enable getrandom(2) > - reorganize comments to reflect glibc follows kernel, > so years are not swapped > > rules/libzmq.make | 24 > 1 file changed, 24 insertions(+) > > diff --git a/rules/libzmq.make b/rules/libzmq.make > index d221ef6ac..94a5f84d8 100644 > --- a/rules/libzmq.make > +++ b/rules/libzmq.make > @@ -34,6 +34,30 @@ LIBZMQ_CONF_ENV:= \ > $(CROSS_ENV) \ > ac_cv_lib_sodium_sodium_init=no > > +# Assume these are always available: > +# - O_CLOEXEC(2007, kernel 2.6.23, glibc 2.7) > +# - EFD_CLOEXEC (2008, kernel 2.6.27, glibc 2.9) > +# - SOCK_CLOEXEC (2008, kernel 2.6.27, glibc 2.9) > +# - SO_BINDTODEVICE (2009, kernel 2.6.31) > +# - SO_KEEPALIVE (2009, kernel 2.6.31, glibc 1.x) > +# - SO_PRIORITY (2009, kernel 2.6.31) > +# - TCP_KEEPCNT (pre 2005/2013, pre kernel 2.6.12, glibc 2.18) > +# - TCP_KEEPIDLE (pre 2005/2013, pre kernel 2.6.12, glibc 2.18) > +# - TCP_KEEPINTVL(pre 2005/2013, pre kernel 2.6.12, glibc 2.18) > +# - getrandom(2014/2017, kernel 3.17, glibc 2.25) > +# Note: TCP_KEEPALIVE is not available in glibc/kernel. > +LIBZMQ_CONF_ENV += \ > + libzmq_cv_o_cloexec=yes \ > + libzmq_cv_efd_cloexec=yes \ > + libzmq_cv_sock_cloexec=yes \ > + libzmq_cv_so_bindtodevice=yes \ > + libzmq_cv_so_keepalive=yes \ > + libzmq_cv_so_priority=yes \ > + libzmq_cv_tcp_keepcnt=yes \ > + libzmq_cv_tcp_keepidle=yes \ > + libzmq_cv_tcp_keepintvl=yes \ > + libzmq_cv_getrandom=yes > + > # > # autoconf > # > > base-commit: 20275946c697076ca6f696276117daf08ca6f4d1
