[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/08: PRELIMINARY: Orc fixes on MIPS.
From: |
Mark H. Weaver |
Subject: |
08/08: PRELIMINARY: Orc fixes on MIPS. |
Date: |
Thu, 18 Aug 2016 07:31:10 +0000 (UTC) |
mhw pushed a commit to branch wip-loongson2f
in repository guix.
commit 476cdbba3f65e3ba433da4853ffac3ee1fe2081f
Author: Mark H Weaver <address@hidden>
Date: Tue Aug 16 22:59:20 2016 -0400
PRELIMINARY: Orc fixes on MIPS.
---
gnu/packages/gstreamer.scm | 37 ++++++++++++++++++++++++++++++-------
1 file changed, 30 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index a39a3b4..b78c732 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -2,7 +2,7 @@
;;; Copyright © 2013, 2015 Andreas Enge <address@hidden>
;;; Copyright © 2014 John Darrington <address@hidden>
;;; Copyright © 2015, 2016 Sou Bunnbu <address@hidden>
-;;; Copyright © 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2015, 2016 Mark H Weaver <address@hidden>
;;; Copyright © 2016 Efraim Flashner <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -82,7 +82,15 @@
(substitute* '("testsuite/test-limits.c"
"testsuite/exec_opcodes_sys.c")
(("if \\(error\\) return 1;")
- "if (error) return 77;")))
+ "if (error) return 77;"))
+
+ ;; On MIPS, disable the 'test_parse' test, which assumes
+ ;; that compilation is supported. As of orc-0.4.25,
+ ;; compilation is not supported on MIPS.
+ ,@(if (string-prefix? "mips" (%current-system))
+ '((substitute* "testsuite/test_parse.c"
+ (("return 1;") "return 77;")))
+ '()))
%standard-phases)))
(home-page "http://code.entropywave.com/orc/")
(synopsis "Oil runtime compiler")
@@ -160,7 +168,10 @@ This package provides the core library and elements.")
`(("gstreamer" ,gstreamer))) ; required by gstreamer-plugins-base-1.0.pc
(inputs
`(("cdparanoia" ,cdparanoia)
- ("orc" ,orc)
+ ,@(if (not (string-prefix? "mips" (or (%current-target-system)
+ (%current-system))))
+ `(("orc" ,orc))
+ '())
("pango" ,pango)
("libogg" ,libogg)
("libtheora" ,libtheora)
@@ -225,7 +236,10 @@ for the GStreamer multimedia library.")
("libshout" ,libshout)
("libsoup" ,libsoup)
("libvpx" ,libvpx)
- ("orc" ,orc)
+ ,@(if (not (string-prefix? "mips" (or (%current-target-system)
+ (%current-system))))
+ `(("orc" ,orc))
+ '())
("pulseaudio" ,pulseaudio)
("speex" ,speex)
("taglib" ,taglib)
@@ -322,7 +336,10 @@ developers consider to have good quality code and correct
functionality.")
("openjpeg" ,openjpeg)
("openssl" ,openssl)
("opus" ,opus)
- ("orc" ,orc)
+ ,@(if (not (string-prefix? "mips" (or (%current-target-system)
+ (%current-system))))
+ `(("orc" ,orc))
+ '())
("qt" ,qt)
("soundtouch" ,soundtouch)
("wayland" ,wayland)))
@@ -359,7 +376,10 @@ par compared to the rest.")
;; TODO:
;; * opencore-amr (for the AMR-NB decoder and encoder and the
;; AMR-WB decoder) <http://sourceforge.net/projects/opencore-amr/>
- ("orc" ,orc)))
+ ,@(if (not (string-prefix? "mips" (or (%current-target-system)
+ (%current-system))))
+ `(("orc" ,orc))
+ '())))
(native-inputs
`(("glib:bin" ,glib "bin")
("pkg-config" ,pkg-config)
@@ -399,7 +419,10 @@ distribution problems in some jurisdictions, e.g. due to
patent threats.")
(inputs
`(("gst-plugins-base" ,gst-plugins-base)
("ffmpeg" ,ffmpeg)
- ("orc" ,orc)
+ ,@(if (not (string-prefix? "mips" (or (%current-target-system)
+ (%current-system))))
+ `(("orc" ,orc))
+ '())
("zlib" ,zlib)))
(home-page "http://gstreamer.freedesktop.org/")
(synopsis "Plugins for the GStreamer multimedia library")
- branch wip-loongson2f created (now 476cdbb), Mark H. Weaver, 2016/08/18
- 06/08: TEMPORARY_HACK: Revert "gnu: ao: Update to 1.2.0.", Mark H. Weaver, 2016/08/18
- 07/08: TEMPORARY_HACK: gnu: xfce4-session: On MIPS, remove polkit from inputs., Mark H. Weaver, 2016/08/18
- 08/08: PRELIMINARY: Orc fixes on MIPS.,
Mark H. Weaver <=
- 04/08: TEMPORARY_HACK: gnu: python-urwid: Disable tests on MIPS., Mark H. Weaver, 2016/08/18
- 03/08: NON_INTEL_ONLY: services: xorg: Remove xf86-video-intel., Mark H. Weaver, 2016/08/18
- 02/08: gnu: grub: Add support for Loongson-based machines., Mark H. Weaver, 2016/08/18
- 05/08: TEMPORARY_HACK: gnu: wget: Disable tests., Mark H. Weaver, 2016/08/18
- 01/08: gnu: Add linux-libre-loongson2f., Mark H. Weaver, 2016/08/18