guix-commits
[Top][All Lists]
Advanced

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

02/07: gnu: gst-plugins-base: Build with Meson.


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

mbakke pushed a commit to branch staging
in repository guix.

commit 738923b6e3ac85c78b1e97a9a85979495ed8ba51
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Jan 20 21:40:02 2020 +0100

    gnu: gst-plugins-base: Build with Meson.
    
    * gnu/packages/gstreamer.scm (gst-plugins-base)[build-system]: Change to
    MESON-BUILD-SYSTEM.
    [outputs]: Remove.
    [arguments]: Enable parallel tests.  Disable doc generation and Mesa 
dependency.
---
 gnu/packages/gstreamer.scm | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 126972f..e78afda 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -171,8 +171,7 @@ This package provides the core library and elements.")
       (sha256
        (base32
         "0sl1hxlyq46r02k7z70v09vx1gi4rcypqmzra9jid93lzvi76gmi"))))
-    (build-system gnu-build-system)
-    (outputs '("out" "doc"))
+    (build-system meson-build-system)
     (propagated-inputs
      `(("glib" ,glib)              ;required by gstreamer-sdp-1.0.pc
        ("gstreamer" ,gstreamer)    ;required by gstreamer-plugins-base-1.0.pc
@@ -206,11 +205,10 @@ This package provides the core library and elements.")
         ("gobject-introspection" ,gobject-introspection)
         ("python-wrapper" ,python-wrapper)))
     (arguments
-     `(#:parallel-tests? #f ; 'pipelines/tcp' fails in parallel
-       #:configure-flags
-       (list (string-append "--with-html-dir="
-                            (assoc-ref %outputs "doc")
-                            "/share/gtk-doc/html"))
+     '(#:configure-flags '("-Dgl=disabled"
+                           ;; FIXME: Documentation fails to build without
+                           ;; enabling GL above, which causes other problems.
+                           "-Ddoc=false")
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'patch



reply via email to

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