guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/04: gnu: libcamera: Update to 0.0.0-1.


From: guix-commits
Subject: 03/04: gnu: libcamera: Update to 0.0.0-1.
Date: Tue, 21 Jun 2022 17:54:28 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit b7279f1f0503e97aa23e91b5e74297def2d61f94
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Tue Jun 21 23:43:14 2022 +0200

    gnu: libcamera: Update to 0.0.0-1.
    
    * gnu/packages/networking.scm (libcamera): Update to 0.0.0-1.
    [arguments]: Disable Python bindings in #:configure-flags.  Disable 
gstreamer
    tests.
    [inputs]: Add LIBYAML, PYTHON-JINJA2, and PYTHON-PLY.
---
 gnu/packages/networking.scm | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index b308b7e595..8f1827c5aa 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -244,33 +244,37 @@ protocols.")
 (define-public libcamera
   (package
     (name "libcamera")
-    (version "0.0.0")
+    (version "0.0.0-1")
     (source
      (origin
        (method git-fetch)
        (uri
         (git-reference
          (url "git://linuxtv.org/libcamera.git")
-         (commit "74c8b508338ccdd0780aa1e067a1e8fcb9ee326b")))
+         (commit "10be87fa7c3bfb097b21ca3d469c67e40c333f7e")))
        (file-name
         (git-file-name name version))
        (sha256
-        (base32 "0d9lp8b9gyxh4jwfh55kp8zl1xyyg32z684v3y29378zpksncss1"))))
+        (base32 "0qgirhlalmk9f9v6piwz50dr2asb64rvbb9zb1vix7y9zh7m11by"))))
     (build-system meson-build-system)
     (outputs '("out" "doc"))
     (arguments
      `(#:glib-or-gtk? #t     ; To wrap binaries and/or compile schemas
        #:configure-flags
        (list
-        "-Dv4l2=true")
+        "-Dv4l2=true"
+        ;; XXX: Requires bundled pybind11.
+        "-Dpycamera=disabled")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'disable-failing-tests
            (lambda _
              (substitute* "test/meson.build"
                (("\\['list-cameras',                    
'list-cameras.cpp'\\],")
-                ""))
-             #t))
+                "")
+               ;; TODO: Why do the gstreamer tests fail.
+               (("^subdir\\('gstreamer'\\)")
+                ""))))
          (add-after 'install 'move-doc
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -278,8 +282,7 @@ protocols.")
                (mkdir-p (string-append doc "/share"))
                (rename-file
                 (string-append out "/share/doc")
-                (string-append doc "/share/doc"))
-               #t))))))
+                (string-append doc "/share/doc"))))))))
     (native-inputs
      `(("dot" ,graphviz)
        ("doxygen" ,doxygen)
@@ -294,8 +297,11 @@ protocols.")
        ("gnutls" ,gnutls)
        ("libtiff" ,libtiff)
        ("openssl" ,openssl)
+       ("python-jinja2" ,python-jinja2)
+       ("python-ply" ,python-ply)
        ("qt5" ,qtbase-5)
-       ("udev" ,eudev)))
+       ("udev" ,eudev)
+       ("yaml" ,libyaml)))
     (synopsis "Camera stack and framework")
     (description "LibCamera is a complex camera support library for GNU+Linux,
 Android, and ChromeOS.")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]