[libcamera-ci] Install libyuv instead of relying on wrap
diff mbox series

Message ID 20251102153746.8459-1-laurent.pinchart@ideasonboard.com
State New
Headers show
Series
  • [libcamera-ci] Install libyuv instead of relying on wrap
Related show

Commit Message

Laurent Pinchart Nov. 2, 2025, 3:37 p.m. UTC 
Debian Bookworm and Trixie ship libyuv. Use the distribution package
instead of relying on meson wraps. This better matches how libcamera is
packaged on Debian, and shortens the compilation time.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
Successful CI run: https://gitlab.freedesktop.org/pinchartl/libcamera/-/pipelines/1539181

Compilation on armhf reduces the number of build steps from 629
(https://gitlab.freedesktop.org/pinchartl/libcamera/-/jobs/87115344#L348)
to 584 (https://gitlab.freedesktop.org/pinchartl/libcamera/-/jobs/87115378).
---
 .gitlab-ci/setup-container.sh | 4 ++++
 gitlab-ci.yml                 | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)


base-commit: 9e09d8787ad4ca30b392351f4cf8fdccdd450c7a

Comments

Kieran Bingham Nov. 2, 2025, 3:53 p.m. UTC | #1 
Quoting Laurent Pinchart (2025-11-02 15:37:46)
> Debian Bookworm and Trixie ship libyuv. Use the distribution package
> instead of relying on meson wraps. This better matches how libcamera is
> packaged on Debian, and shortens the compilation time.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> Successful CI run: https://gitlab.freedesktop.org/pinchartl/libcamera/-/pipelines/1539181
> 
> Compilation on armhf reduces the number of build steps from 629
> (https://gitlab.freedesktop.org/pinchartl/libcamera/-/jobs/87115344#L348)
> to 584 (https://gitlab.freedesktop.org/pinchartl/libcamera/-/jobs/87115378).

excellent! \o/


Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

> ---
>  .gitlab-ci/setup-container.sh | 4 ++++
>  gitlab-ci.yml                 | 4 ++--
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> index 9d8319c9779b..2ba94bbefca3 100755
> --- a/.gitlab-ci/setup-container.sh
> +++ b/.gitlab-ci/setup-container.sh
> @@ -130,6 +130,8 @@ case $FDO_DISTRIBUTION_VERSION in
>         PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
>         # libclang-rt-dev for the clang ASan runtime.
>         PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
> +       # For the Android camera HAL and the virtual pipeline handler.
> +       PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libyuv-dev )
>         # For cam and lc-compliance
>         # libevent-dev cannot be used here, see build-libcamera-common.sh
>         PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libevent-2.1-7 libevent-pthreads-2.1-7 )
> @@ -141,6 +143,8 @@ case $FDO_DISTRIBUTION_VERSION in
>         PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
>         # libclang-rt-dev for the clang ASan runtime.
>         PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
> +       # For the Android camera HAL and the virtual pipeline handler.
> +       PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libyuv-dev )
>         ;;
>  esac
>  
> diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> index d18460534da2..a67618dd4ada 100644
> --- a/gitlab-ci.yml
> +++ b/gitlab-ci.yml
> @@ -64,12 +64,12 @@ include:
>  .libcamera-ci.debian:12:
>    variables:
>      FDO_DISTRIBUTION_VERSION: 'bookworm'
> -    FDO_DISTRIBUTION_TAG: '2025-09-12.2'
> +    FDO_DISTRIBUTION_TAG: '2025-11-02.0'
>  
>  .libcamera-ci.debian:13:
>    variables:
>      FDO_DISTRIBUTION_VERSION: 'trixie'
> -    FDO_DISTRIBUTION_TAG: '2025-09-12.2'
> +    FDO_DISTRIBUTION_TAG: '2025-11-02.0'
>  
>  .container-debian:
>    extends:
> 
> base-commit: 9e09d8787ad4ca30b392351f4cf8fdccdd450c7a
> -- 
> Regards,
> 
> Laurent Pinchart
>
Barnabás Pőcze Nov. 3, 2025, 8:27 a.m. UTC | #2 
2025. 11. 02. 16:37 keltezéssel, Laurent Pinchart írta:
> Debian Bookworm and Trixie ship libyuv. Use the distribution package
> instead of relying on meson wraps. This better matches how libcamera is
> packaged on Debian, and shortens the compilation time.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> Successful CI run: https://gitlab.freedesktop.org/pinchartl/libcamera/-/pipelines/1539181
> 
> Compilation on armhf reduces the number of build steps from 629
> (https://gitlab.freedesktop.org/pinchartl/libcamera/-/jobs/87115344#L348)
> to 584 (https://gitlab.freedesktop.org/pinchartl/libcamera/-/jobs/87115378).
> ---


If it is packaged, this is probably makes the most sense.
The wrap file is still used on debian 11, correct?

Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>


>   .gitlab-ci/setup-container.sh | 4 ++++
>   gitlab-ci.yml                 | 4 ++--
>   2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> index 9d8319c9779b..2ba94bbefca3 100755
> --- a/.gitlab-ci/setup-container.sh
> +++ b/.gitlab-ci/setup-container.sh
> @@ -130,6 +130,8 @@ case $FDO_DISTRIBUTION_VERSION in
>   	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
>   	# libclang-rt-dev for the clang ASan runtime.
>   	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
> +	# For the Android camera HAL and the virtual pipeline handler.
> +	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libyuv-dev )
>   	# For cam and lc-compliance
>   	# libevent-dev cannot be used here, see build-libcamera-common.sh
>   	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libevent-2.1-7 libevent-pthreads-2.1-7 )
> @@ -141,6 +143,8 @@ case $FDO_DISTRIBUTION_VERSION in
>   	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
>   	# libclang-rt-dev for the clang ASan runtime.
>   	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
> +	# For the Android camera HAL and the virtual pipeline handler.
> +	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libyuv-dev )
>   	;;
>   esac
>   
> diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> index d18460534da2..a67618dd4ada 100644
> --- a/gitlab-ci.yml
> +++ b/gitlab-ci.yml
> @@ -64,12 +64,12 @@ include:
>   .libcamera-ci.debian:12:
>     variables:
>       FDO_DISTRIBUTION_VERSION: 'bookworm'
> -    FDO_DISTRIBUTION_TAG: '2025-09-12.2'
> +    FDO_DISTRIBUTION_TAG: '2025-11-02.0'
>   
>   .libcamera-ci.debian:13:
>     variables:
>       FDO_DISTRIBUTION_VERSION: 'trixie'
> -    FDO_DISTRIBUTION_TAG: '2025-09-12.2'
> +    FDO_DISTRIBUTION_TAG: '2025-11-02.0'
>   
>   .container-debian:
>     extends:
> 
> base-commit: 9e09d8787ad4ca30b392351f4cf8fdccdd450c7a
Laurent Pinchart Nov. 3, 2025, 10:05 a.m. UTC | #3 
On Mon, Nov 03, 2025 at 09:27:00AM +0100, Barnabás Pőcze wrote:
> 2025. 11. 02. 16:37 keltezéssel, Laurent Pinchart írta:
> > Debian Bookworm and Trixie ship libyuv. Use the distribution package
> > instead of relying on meson wraps. This better matches how libcamera is
> > packaged on Debian, and shortens the compilation time.
> > 
> > Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> > Successful CI run: https://gitlab.freedesktop.org/pinchartl/libcamera/-/pipelines/1539181
> > 
> > Compilation on armhf reduces the number of build steps from 629
> > (https://gitlab.freedesktop.org/pinchartl/libcamera/-/jobs/87115344#L348)
> > to 584 (https://gitlab.freedesktop.org/pinchartl/libcamera/-/jobs/87115378).
> > ---
> 
> If it is packaged, this is probably makes the most sense.
> The wrap file is still used on debian 11, correct?

Correct.

> Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
> 
> >   .gitlab-ci/setup-container.sh | 4 ++++
> >   gitlab-ci.yml                 | 4 ++--
> >   2 files changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
> > index 9d8319c9779b..2ba94bbefca3 100755
> > --- a/.gitlab-ci/setup-container.sh
> > +++ b/.gitlab-ci/setup-container.sh
> > @@ -130,6 +130,8 @@ case $FDO_DISTRIBUTION_VERSION in
> >   	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
> >   	# libclang-rt-dev for the clang ASan runtime.
> >   	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
> > +	# For the Android camera HAL and the virtual pipeline handler.
> > +	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libyuv-dev )
> >   	# For cam and lc-compliance
> >   	# libevent-dev cannot be used here, see build-libcamera-common.sh
> >   	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libevent-2.1-7 libevent-pthreads-2.1-7 )
> > @@ -141,6 +143,8 @@ case $FDO_DISTRIBUTION_VERSION in
> >   	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
> >   	# libclang-rt-dev for the clang ASan runtime.
> >   	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
> > +	# For the Android camera HAL and the virtual pipeline handler.
> > +	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libyuv-dev )
> >   	;;
> >   esac
> >   
> > diff --git a/gitlab-ci.yml b/gitlab-ci.yml
> > index d18460534da2..a67618dd4ada 100644
> > --- a/gitlab-ci.yml
> > +++ b/gitlab-ci.yml
> > @@ -64,12 +64,12 @@ include:
> >   .libcamera-ci.debian:12:
> >     variables:
> >       FDO_DISTRIBUTION_VERSION: 'bookworm'
> > -    FDO_DISTRIBUTION_TAG: '2025-09-12.2'
> > +    FDO_DISTRIBUTION_TAG: '2025-11-02.0'
> >   
> >   .libcamera-ci.debian:13:
> >     variables:
> >       FDO_DISTRIBUTION_VERSION: 'trixie'
> > -    FDO_DISTRIBUTION_TAG: '2025-09-12.2'
> > +    FDO_DISTRIBUTION_TAG: '2025-11-02.0'
> >   
> >   .container-debian:
> >     extends:
> > 
> > base-commit: 9e09d8787ad4ca30b392351f4cf8fdccdd450c7a

Patch
diff mbox series 

diff --git a/.gitlab-ci/setup-container.sh b/.gitlab-ci/setup-container.sh
index 9d8319c9779b..2ba94bbefca3 100755
--- a/.gitlab-ci/setup-container.sh
+++ b/.gitlab-ci/setup-container.sh
@@ -130,6 +130,8 @@  case $FDO_DISTRIBUTION_VERSION in
 	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
 	# libclang-rt-dev for the clang ASan runtime.
 	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
+	# For the Android camera HAL and the virtual pipeline handler.
+	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libyuv-dev )
 	# For cam and lc-compliance
 	# libevent-dev cannot be used here, see build-libcamera-common.sh
 	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libevent-2.1-7 libevent-pthreads-2.1-7 )
@@ -141,6 +143,8 @@  case $FDO_DISTRIBUTION_VERSION in
 	PKGS_LIBCAMERA_RUNTIME+=( python3-sphinx-book-theme )
 	# libclang-rt-dev for the clang ASan runtime.
 	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libclang-rt-dev )
+	# For the Android camera HAL and the virtual pipeline handler.
+	PKGS_LIBCAMERA_RUNTIME_MULTIARCH+=( libyuv-dev )
 	;;
 esac
 
diff --git a/gitlab-ci.yml b/gitlab-ci.yml
index d18460534da2..a67618dd4ada 100644
--- a/gitlab-ci.yml
+++ b/gitlab-ci.yml
@@ -64,12 +64,12 @@  include:
 .libcamera-ci.debian:12:
   variables:
     FDO_DISTRIBUTION_VERSION: 'bookworm'
-    FDO_DISTRIBUTION_TAG: '2025-09-12.2'
+    FDO_DISTRIBUTION_TAG: '2025-11-02.0'
 
 .libcamera-ci.debian:13:
   variables:
     FDO_DISTRIBUTION_VERSION: 'trixie'
-    FDO_DISTRIBUTION_TAG: '2025-09-12.2'
+    FDO_DISTRIBUTION_TAG: '2025-11-02.0'
 
 .container-debian:
   extends: