[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: gnu: gstreamer: Build with Meson.
From: |
guix-commits |
Subject: |
01/07: gnu: gstreamer: Build with Meson. |
Date: |
Mon, 20 Jan 2020 17:19:24 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 9792adaa611e495ee1a53e5849a37fef7fa49edf
Author: Marius Bakke <address@hidden>
AuthorDate: Mon Jan 20 21:38:40 2020 +0100
gnu: gstreamer: Build with Meson.
The package fails to build with GNU Make 4.3, and upstream no longer
supports
autotools.
* gnu/packages/gstreamer.scm (gstreamer)[build-system]: Change to
MESON-BUILD-SYSTEM.
[arguments]: Remove #:configure-flags. Add #:phases.
[native-inputs]: Add GTK-DOC.
---
gnu/packages/gstreamer.scm | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 63b4179..126972f 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -116,19 +116,27 @@ arrays of data.")
(sha256
(base32
"0kp93622y29pck8asvil1fmzf55s2gx76wv475a6izc3cwj49w73"))))
- (build-system gnu-build-system)
+ (build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
- `(#:configure-flags
- (list (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html"))))
+ '(#:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'move-docs
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (mkdir-p (string-append doc "/share"))
+ (copy-recursively (string-append out "/share/gtk-doc")
+ (string-append doc "/share/gtk-doc"))
+ (delete-file-recursively (string-append out "/share/gtk-doc"))
+ #t))))))
(propagated-inputs `(("glib" ,glib))) ; required by gstreamer-1.0.pc.
(native-inputs
`(("bison" ,bison)
("flex" ,flex)
("glib" ,glib "bin")
("gobject-introspection" ,gobject-introspection)
+ ("gtk-doc" ,gtk-doc)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)))
- branch staging updated (25b8d67 -> c450ee9), guix-commits, 2020/01/20
- 01/07: gnu: gstreamer: Build with Meson.,
guix-commits <=
- 04/07: gnu: gst-plugins-bad: Build with Meson., guix-commits, 2020/01/20
- 02/07: gnu: gst-plugins-base: Build with Meson., guix-commits, 2020/01/20
- 03/07: gnu: gst-plugins-good: Build with Meson., guix-commits, 2020/01/20
- 07/07: gnu: python-gst: Build with Meson., guix-commits, 2020/01/20
- 05/07: gnu: gst-plugins-ugly: Build with Meson., guix-commits, 2020/01/20
- 06/07: gnu: gst-libav: Build with Meson., guix-commits, 2020/01/20