guix-commits
[Top][All Lists]
Advanced

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

04/07: gnu: gst-plugins-bad: Build with Meson.


From: guix-commits
Subject: 04/07: gnu: gst-plugins-bad: Build with Meson.
Date: Mon, 20 Jan 2020 17:19:25 -0500 (EST)

mbakke pushed a commit to branch staging
in repository guix.

commit 2dc277dd997da8ada68349ea321192719edc814c
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Jan 20 21:41:41 2020 +0100

    gnu: gst-plugins-bad: Build with Meson.
    
    * gnu/packages/gstreamer.scm (gst-plugins-bad)[outputs]: Remove.
    [build-system]: Change to MESON-BUILD-SYSTEM.
    [arguments]: Enable tests, except for one.  Disable documentation 
generation.
---
 gnu/packages/gstreamer.scm | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 310f538..7bbb564 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -297,19 +297,24 @@ developers consider to have good quality code and correct 
functionality.")
               (sha256
                (base32
                 "0x0y0hm0ga3zqi5q4090hw5sjh59y1ry9ak16qsaascm72i7mjzi"))))
-    (outputs '("out" "doc"))
-    (build-system gnu-build-system)
+    (build-system meson-build-system)
     (arguments
-     '(#:tests? #f ; XXX: 13 of 53 tests fail
-       #:configure-flags
-       (list (string-append "--with-html-dir="
-                            (assoc-ref %outputs "doc")
-                            "/share/gtk-doc/html"))))
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'disable-failing-test
+           (lambda _
+             ;; FIXME: Why is this failing.
+             (substitute* "tests/check/meson.build"
+               ((".*elements/dash_mpd\\.c.*")
+                ""))
+             #t)))))
     (propagated-inputs
      `(("gst-plugins-base" ,gst-plugins-base)))
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc.
        ("gobject-introspection" ,gobject-introspection)
+       ;; TODO: Enable documentation for 1.18.
+       ;;("gtk-doc" ,gtk-doc)
        ("pkg-config" ,pkg-config)
        ("python" ,python)))
     (inputs



reply via email to

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