diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-15 00:09:46 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-15 00:09:46 +0100 |
| commit | 3cfe76bec06fbd8bb7e7cb3387866fefbcad674f (patch) | |
| tree | b66780d205fb50fd44d0bbb38f5df99cf3167ba1 /gnu/packages/gstreamer.scm | |
| parent | ec836b46bf52a5f86c61f50e3a2c3330a7ee3665 (diff) | |
| parent | 574a71a7a9668aa184661c58e1f18a4d4fccd792 (diff) | |
| download | guix-patches-3cfe76bec06fbd8bb7e7cb3387866fefbcad674f.tar guix-patches-3cfe76bec06fbd8bb7e7cb3387866fefbcad674f.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gstreamer.scm')
| -rw-r--r-- | gnu/packages/gstreamer.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 323e3ccfee..63b4179bc6 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -7,7 +7,7 @@ ;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name> ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com> +;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -168,7 +168,14 @@ This package provides the core library and elements.") (propagated-inputs `(("glib" ,glib) ;required by gstreamer-sdp-1.0.pc ("gstreamer" ,gstreamer) ;required by gstreamer-plugins-base-1.0.pc - ("orc" ,orc))) ;required by gstreamer-audio-1.0.pc + + ;; XXX: Do not enable Orc optimizations on ARM systems because + ;; it leads to two test failures. + ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/issues/683 + ,@(if (string-prefix? "arm" (or (%current-target-system) + (%current-system))) + '() + `(("orc" ,orc))))) ;required by gstreamer-audio-1.0.pc (inputs `(("cdparanoia" ,cdparanoia) ("pango" ,pango) |