[Buildroot] [PATCH] package/libcamera: update patch with merged commit

[Buildroot] [PATCH] package/libcamera: update patch with merged commit

[Quentin Schulz]

From: Quentin Schulz <quentin.schulz@cherry.de>

The v1 of the patch that is in Buildroot ended up being reworked and
merged from a v2, therefore let's update the patch by using the merged
commit instead.

Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
---
 ...t-automatically-build-documentation-if-sp.patch | 33 ++++++++++++++--------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/package/libcamera/0001-meson-do-not-automatically-build-documentation-if-sp.patch b/package/libcamera/0001-meson-do-not-automatically-build-documentation-if-sp.patch
index d8975a86cb431ea44b19e168904157dda8a4b018..c75ff1ce9dc1c17258f962465ece69b09868e0ed 100644
--- a/package/libcamera/0001-meson-do-not-automatically-build-documentation-if-sp.patch
+++ b/package/libcamera/0001-meson-do-not-automatically-build-documentation-if-sp.patch
@@ -1,7 +1,7 @@
-From 1e4db1f9792e4343231a1cf36aa553404a534828 Mon Sep 17 00:00:00 2001
+From ae2b6cb3cac6a38a6c96625915cea4b9cf3fc180 Mon Sep 17 00:00:00 2001
 From: Quentin Schulz <quentin.schulz@cherry.de>
-Date: Fri, 4 Apr 2025 18:01:33 +0200
-Subject: [PATCH] meson: do not automatically build documentation if
+Date: Fri, 4 Apr 2025 18:12:35 +0200
+Subject: [PATCH] meson: Do not automatically build documentation if
  sphinx-build-3 is found
 
 Commit aba567338b25 ("Documentation: Move all dependencies into
@@ -21,22 +21,31 @@ also to declutter the generated package if documentation isn't desired.
 
 Fixes: aba567338b25 ("Documentation: Move all dependencies into features")
 Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
-Upstream: https://lists.libcamera.org/pipermail/libcamera-devel/2025-April/049705.html
+Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
+Tested-by: Quentin Schulz <quentin.schulz@cherry.de>
+Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
+Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Upstream: https://git.libcamera.org/libcamera/libcamera.git/commit/?id=ae2b6cb3cac6a38a6c96625915cea4b9cf3fc180
 Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
 ---
- Documentation/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Documentation/meson.build | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/Documentation/meson.build b/Documentation/meson.build
-index 6158320e..c59849f6 100644
+index 6158320e..0fc5909d 100644
 --- a/Documentation/meson.build
 +++ b/Documentation/meson.build
-@@ -116,7 +116,7 @@ endif
+@@ -116,10 +116,8 @@ endif
  # Sphinx
  #
  
 -sphinx = find_program('sphinx-build-3', required : false)
-+sphinx = find_program('sphinx-build-3', required : get_option('documentation'))
- if not sphinx.found()
-     sphinx = find_program('sphinx-build', required : get_option('documentation'))
- endif
+-if not sphinx.found()
+-    sphinx = find_program('sphinx-build', required : get_option('documentation'))
+-endif
++sphinx = find_program('sphinx-build-3', 'sphinx-build',
++                      required : get_option('documentation'))
+ 
+ if sphinx.found()
+     docs_sources = [

---
base-commit: 3ffdcc5b9db2a703259f900fdc8251c4e0d14dfb
change-id: 20250422-libcamera-meson-doc-merged-e34c56293a18

Best regards,
-- 
Quentin Schulz <quentin.schulz@cherry.de>

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/libcamera: update patch with merged commit

[Thomas Petazzoni via buildroot]

On Tue, 22 Apr 2025 12:16:32 +0200
Quentin Schulz <foss+buildroot@0leil.net> wrote:

> From: Quentin Schulz <quentin.schulz@cherry.de>
> 
> The v1 of the patch that is in Buildroot ended up being reworked and
> merged from a v2, therefore let's update the patch by using the merged
> commit instead.
> 
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> ---
>  ...t-automatically-build-documentation-if-sp.patch | 33 ++++++++++++++--------
>  1 file changed, 21 insertions(+), 12 deletions(-)

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH] package/libcamera: update patch with merged commit

[Arnout Vandecappelle via buildroot]

On 22/04/2025 12:16, Quentin Schulz wrote:
> From: Quentin Schulz <quentin.schulz@cherry.de>
> 
> The v1 of the patch that is in Buildroot ended up being reworked and
> merged from a v2, therefore let's update the patch by using the merged
> commit instead.
> 
> Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>

  Applied to 2025.02.x, thanks.

  Regards,
  Arnout

> ---
>   ...t-automatically-build-documentation-if-sp.patch | 33 ++++++++++++++--------
>   1 file changed, 21 insertions(+), 12 deletions(-)
> 
> diff --git a/package/libcamera/0001-meson-do-not-automatically-build-documentation-if-sp.patch b/package/libcamera/0001-meson-do-not-automatically-build-documentation-if-sp.patch
> index d8975a86cb431ea44b19e168904157dda8a4b018..c75ff1ce9dc1c17258f962465ece69b09868e0ed 100644
> --- a/package/libcamera/0001-meson-do-not-automatically-build-documentation-if-sp.patch
> +++ b/package/libcamera/0001-meson-do-not-automatically-build-documentation-if-sp.patch
> @@ -1,7 +1,7 @@
> -From 1e4db1f9792e4343231a1cf36aa553404a534828 Mon Sep 17 00:00:00 2001
> +From ae2b6cb3cac6a38a6c96625915cea4b9cf3fc180 Mon Sep 17 00:00:00 2001
>   From: Quentin Schulz <quentin.schulz@cherry.de>
> -Date: Fri, 4 Apr 2025 18:01:33 +0200
> -Subject: [PATCH] meson: do not automatically build documentation if
> +Date: Fri, 4 Apr 2025 18:12:35 +0200
> +Subject: [PATCH] meson: Do not automatically build documentation if
>    sphinx-build-3 is found
>   
>   Commit aba567338b25 ("Documentation: Move all dependencies into
> @@ -21,22 +21,31 @@ also to declutter the generated package if documentation isn't desired.
>   
>   Fixes: aba567338b25 ("Documentation: Move all dependencies into features")
>   Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
> -Upstream: https://lists.libcamera.org/pipermail/libcamera-devel/2025-April/049705.html
> +Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> +Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
> +Tested-by: Quentin Schulz <quentin.schulz@cherry.de>
> +Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
> +Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> +Upstream: https://git.libcamera.org/libcamera/libcamera.git/commit/?id=ae2b6cb3cac6a38a6c96625915cea4b9cf3fc180
>   Signed-off-by: Quentin Schulz <quentin.schulz@cherry.de>
>   ---
> - Documentation/meson.build | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> + Documentation/meson.build | 6 ++----
> + 1 file changed, 2 insertions(+), 4 deletions(-)
>   
>   diff --git a/Documentation/meson.build b/Documentation/meson.build
> -index 6158320e..c59849f6 100644
> +index 6158320e..0fc5909d 100644
>   --- a/Documentation/meson.build
>   +++ b/Documentation/meson.build
> -@@ -116,7 +116,7 @@ endif
> +@@ -116,10 +116,8 @@ endif
>    # Sphinx
>    #
>    
>   -sphinx = find_program('sphinx-build-3', required : false)
> -+sphinx = find_program('sphinx-build-3', required : get_option('documentation'))
> - if not sphinx.found()
> -     sphinx = find_program('sphinx-build', required : get_option('documentation'))
> - endif
> +-if not sphinx.found()
> +-    sphinx = find_program('sphinx-build', required : get_option('documentation'))
> +-endif
> ++sphinx = find_program('sphinx-build-3', 'sphinx-build',
> ++                      required : get_option('documentation'))
> +
> + if sphinx.found()
> +     docs_sources = [
> 
> ---
> base-commit: 3ffdcc5b9db2a703259f900fdc8251c4e0d14dfb
> change-id: 20250422-libcamera-meson-doc-merged-e34c56293a18
> 
> Best regards,

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot