guix_mirror_bot pushed a commit to branch python-team
in repository guix.

commit eee1c15b26fbed6553618172cacd3fd3e0d25065
Author: Sergey Trofimov <[email protected]>
AuthorDate: Wed Jan 28 14:48:55 2026 +0100

    gnu: libcamera: Update to 0.6.0.
    
    * gnu/packages/networking.scm (libcamera): Update to 0.6.0.
    [arguments]<#:configure-flags>: Enable python bindings, remove obsolete
    flags.
    <#:phases>{'set-sphinx-theme}: New phase.
    {'disable-gstreamer-tests}: Disable tests requiring /dev/udmabuf.
    [native-inputs]: Add python-sphinxcontrib-doxylink.
    [inputs]: Add libjpeg-turbo, libyuv, pybind11.
    * 
gnu/packages/patches/libcamera-ipa_manager-disable-signature-verification.patch:
    Adjust to latest source.
    
    Fixes: guix/guix#6002
    Change-Id: I8618f58438de3569b7a54663f69ecaa7b1c6283c
    Signed-off-by: Sharlatan Hellseher <[email protected]>
---
 gnu/packages/networking.scm                        | 31 +++++++++++++---------
 ...pa_manager-disable-signature-verification.patch | 28 +++++++++----------
 2 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index d1562e1fd6..6fb36342be 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -444,7 +444,7 @@ them in order to efficiently transfer a minimal amount of 
data.")
 (define-public libcamera
   (package
     (name "libcamera")
-    (version "0.3.1")
+    (version "0.6.0")
     (source
      (origin
        (method git-fetch)
@@ -457,7 +457,7 @@ them in order to efficiently transfer a minimal amount of 
data.")
        (file-name
         (git-file-name name version))
        (sha256
-        (base32 "15wgy6dc56dwjyasw6w6x6d4j8475clbrxkgphc2zly6232ds7mw"))))
+        (base32 "0g6rphsa1hi9y22l2vw5cj75bf57clq3cggviwd1bnjhpp61nryc"))))
     (build-system meson-build-system)
     (outputs '("out" "doc" "gst" "tools"))
     (arguments
@@ -465,19 +465,22 @@ them in order to efficiently transfer a minimal amount of 
data.")
            #:configure-flags
            #~(list (string-append "-Dbindir="
                                   (assoc-ref %outputs "tools") "/bin")
-
-                   ;; In 0.3.1 release simple pipeline wasn't enabled for
-                   ;; x86_64 by mistake, it's enabled a couple commits later.
-                   ;; Remove this expression on the next release.
-                   #$@(if (target-x86-64?)
-                          '("-Dpipelines=ipu3,vimc,uvcvideo,simple")
-                          '())
                    "-Dudev=enabled"
-                   "-Dtest=true" "-Dv4l2=true"
-                   ;; XXX: Requires bundled pybind11.
-                   "-Dpycamera=disabled")
+                   "-Dv4l2=true"
+                   "-Dtest=true")
            #:phases
            #~(modify-phases %standard-phases
+               (add-after 'unpack 'set-sphinx-theme
+                 ;; sphinx_book_theme requires node for packaging
+                 ;; use the default sphinx theme instead
+                 (lambda _
+                   (substitute* "Documentation/conf.py.in"
+                     (("sphinx_book_theme") "alabaster"))))
+               (add-after 'unpack 'disable-gstreamer-tests
+                 ;; these require /dev/udmabuf
+                 (lambda _
+                   (substitute* "test/meson.build"
+                     (("subdir\\('gstreamer'\\)") ""))))
                #$@(if (target-aarch64?)
                       #~((add-after 'unpack 'disable-problematic-tests
                            (lambda _
@@ -511,14 +514,18 @@ them in order to efficiently transfer a minimal amount of 
data.")
            pkg-config
            python-wrapper
            python-sphinx
+           python-sphinxcontrib-doxylink
            python-pyyaml))
     (inputs
      (list eudev
            glib
            gst-plugins-base
            libevent
+           libjpeg-turbo
            libtiff
            libyaml
+           libyuv
+           pybind11
            python-jinja2
            python-ply
            qtbase))
diff --git 
a/gnu/packages/patches/libcamera-ipa_manager-disable-signature-verification.patch
 
b/gnu/packages/patches/libcamera-ipa_manager-disable-signature-verification.patch
index aa4dff3fe3..8d4ae5a51a 100644
--- 
a/gnu/packages/patches/libcamera-ipa_manager-disable-signature-verification.patch
+++ 
b/gnu/packages/patches/libcamera-ipa_manager-disable-signature-verification.patch
@@ -1,26 +1,25 @@
 From c99706475cde3d963a17f4f8871149711ce6c467 Mon Sep 17 00:00:00 2001
 From: Andrew Tropin <[email protected]>
-Date: Wed, 4 Sep 2024 21:36:16 +0400
+Date: Wed, 28 Jan 2026 12:23:20 +0100
 Subject: [PATCH] libcamera: ipa_manager: Disable signature verification
 
 ---
- src/libcamera/ipa_manager.cpp | 28 +++++-----------------------
- 1 file changed, 5 insertions(+), 23 deletions(-)
+ src/libcamera/ipa_manager.cpp | 27 +++------------------------
+ 1 file changed, 3 insertions(+), 24 deletions(-)
 
 diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp
-index cfc24d38..4fd3cf3e 100644
+index 35171d09..4ab394da 100644
 --- a/src/libcamera/ipa_manager.cpp
 +++ b/src/libcamera/ipa_manager.cpp
-@@ -284,33 +284,15 @@ IPAModule *IPAManager::module(PipelineHandler *pipe, 
uint32_t minVersion,
+@@ -288,32 +288,11 @@ IPAModule *IPAManager::module(PipelineHandler *pipe, 
uint32_t minVersion,
  
  bool IPAManager::isSignatureValid([[maybe_unused]] IPAModule *ipa) const
  {
 -#if HAVE_IPA_PUBKEY
--      char *force = utils::secure_getenv("LIBCAMERA_IPA_FORCE_ISOLATION");
--      if (force && force[0] != '\0') {
+-      if (forceIsolation_) {
 -              LOG(IPAManager, Debug)
 -                      << "Isolation of IPA module " << ipa->path()
--                      << " forced through environment variable";
+-                      << " forced through configuration";
 -              return false;
 -      }
 -
@@ -33,14 +32,12 @@ index cfc24d38..4fd3cf3e 100644
 -              return false;
 -
 -      bool valid = pubKey_.verify(data, ipa->signature());
-+      LOG(IPAManager, Debug)
-+              << "Signature verification is disabled by Guix. "
-+              << "See https://issues.guix.gnu.org/72828 for more details.";
- 
+-
        LOG(IPAManager, Debug)
-               << "IPA module " << ipa->path() << " signature is "
+-              << "IPA module " << ipa->path() << " signature is "
 -              << (valid ? "valid" : "not valid");
-+              << "not verified (verification skipped).";
++              << "Signature verification is disabled by Guix. "
++              << "See https://issues.guix.gnu.org/72828 for more details.";
  
 -      return valid;
 -#else
@@ -51,5 +48,4 @@ index cfc24d38..4fd3cf3e 100644
  
  } /* namespace libcamera */
 -- 
-2.45.2
-
+2.52.0

Reply via email to