summary refs log tree commit diff
path: root/gnu/packages/gstreamer.scm
diff options
context:
space:
mode:
authorLiliana Marie Prikler <liliana.prikler@gmail.com>2024-03-02 12:22:34 +0100
committerLiliana Marie Prikler <liliana.prikler@gmail.com>2024-03-02 12:22:34 +0100
commit25c14c893f05019d746321285acf55d1aa65b943 (patch)
tree9c0a728b3c723fd171668713e0755a79a2034098 /gnu/packages/gstreamer.scm
parent71a3dca25cd25f63c8fc17498a9a729e545f1890 (diff)
parent4a0549be52f3f46fbce61342d8de30f7b83130c5 (diff)
downloadguix-25c14c893f05019d746321285acf55d1aa65b943.tar.gz
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/gstreamer.scm')
-rw-r--r--gnu/packages/gstreamer.scm19
1 files changed, 12 insertions, 7 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index bcbed68715..2c8ad12982 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
 ;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2015, 2018 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2016, 2017, 2022 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2022-2024 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2016, 2018 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2017, 2023 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -800,14 +800,19 @@ model to base your own plug-in on, here it is.")
                   ;; The 'elements_curlhttpsrc' test sometimes times out.
                   ((".*'elements/curlhttpsrc\\.c'.*") "")
 
+                  ;; TODO: Figure out why this test fails on riscv64-linux.
+                  #$@(if (target-riscv64?)
+                         `((("'elements/viewfinderbin\\.c'\\].*],")
+                            "'elements/viewfinderbin.c'], true, ],"))
+                         '())
+
                   ;; This test is flaky on at least some architectures.
                   ;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
-                  #$@(if (target-riscv64?)
-                       `((("'elements/camerabin\\.c'\\].*],")
-                          "'elements/camerabin.c'], true, ],")
-                         (("'elements/viewfinderbin\\.c'\\].*],")
-                          "'elements/viewfinderbin.c'], true, ],"))
-                       '())
+                  #$@(if (member (%current-system)
+                                 '("aarch64-linux" "riscv64-linux"))
+                         `((("'elements/camerabin\\.c'\\].*],")
+                            "'elements/camerabin.c'], true, ],"))
+                         '())
 
                   ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
                   ((".*elements/dtls\\.c.*") ""))