[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/06: gnu: gst-libav: Delete bundled ffmpeg.
From: |
Marius Bakke |
Subject: |
06/06: gnu: gst-libav: Delete bundled ffmpeg. |
Date: |
Sun, 22 Jul 2018 12:24:48 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit 4b7e861b59f2088b15e5fa8ed520ecbc933f590d
Author: Marius Bakke <address@hidden>
Date: Fri Jul 20 18:22:14 2018 +0200
gnu: gst-libav: Delete bundled ffmpeg.
* gnu/packages/gstreamer.scm (gst-libav)[source](modules, snippet): New
fields.
[arguments]: Remove #:phases.
---
gnu/packages/gstreamer.scm | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 085d2df..63d18fc 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -386,18 +386,16 @@ distribution problems in some jurisdictions, e.g. due to
patent threats.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca"))))
+ "1pknqpjxq1l3vlprdsmxxwk0lwqa555fqd543k9vphngqlwiqdca"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Drop bundled ffmpeg.
+ (delete-file-recursively "gst-libs/ext/libav")
+ #t))))
(build-system gnu-build-system)
(arguments
- '(#:configure-flags '("--with-system-libav")
- #:phases
- (modify-phases %standard-phases
- (add-before 'configure 'patch-/bin/sh
- (lambda _
- (substitute* "gst-libs/ext/libav/configure"
- (("#! /bin/sh")
- (string-append "#! "(which "sh"))))
- #t)))))
+ '(#:configure-flags '("--with-system-libav")))
(native-inputs
`(("pkg-config" ,pkg-config)
("python" ,python)))
- branch staging updated (5a3bf25 -> 4b7e861), Marius Bakke, 2018/07/22
- 01/06: gnu: libpsl: Update to 0.20.2., Marius Bakke, 2018/07/22
- 03/06: gnu: double-conversion: Update home page., Marius Bakke, 2018/07/22
- 04/06: gnu: double-conversion: Update to 3.0.0., Marius Bakke, 2018/07/22
- 06/06: gnu: gst-libav: Delete bundled ffmpeg.,
Marius Bakke <=
- 05/06: gnu: gstreamer: Update to 1.14.2., Marius Bakke, 2018/07/22
- 02/06: gnu: libgsf: Update to 1.14.43., Marius Bakke, 2018/07/22