Re: [Patch] gst-plugins-base

[Efraim Flashner <efraim@flashner.co.il>]

[-- Attachment #1.1: Type: text/plain, Size: 1641 bytes --]

On Wed, Mar 30, 2016 at 05:57:24PM -0400, Mark H Weaver wrote:
> Mark H Weaver <mhw@netris.org> writes:
> 
> > Here's one way to do it:
> >
> >     (inputs
> >      `(("cdparanoia" ,cdparanoia)
> >        ,@(if (any (cute string-prefix? <> (or (%current-target-system)
> >                                               (%current-system)))
> >                   '("arm" "mips"))

64-bit Arm is Aarch64 and not arm64, so this probably won't capture
64-bit Arm if/when we start to support it.

> >              '()
> >              `(("orc" ,orc)))
> >
> > You'll need to import (srfi srfi-1) for 'any' and (srfi srfi-26) for
> > 'cute'.
> >
> > What do you think?  Can you send an updated patch?
> 
> One more thing: please add a comment containing the string "FIXME",
> explaining that we are omitting "orc" on arm and mips, and the reason
> why.
> 
>      Thanks!
>        Mark

It turns out I didn't search gstreamer.scm well enough, so if this patch
looks good then I'll copy the syntax over to the other packages in
gstreamer and make patches for them too.

efraim@debian-netbook:~/workspace/guix$ grep \(\"orc\"\ \,orc\)
gnu/packages/*scm
gnu/packages/gstreamer.scm:           `(("orc" ,orc)))
gnu/packages/gstreamer.scm:       ("orc" ,orc)
gnu/packages/gstreamer.scm:       ("orc" ,orc)
gnu/packages/gstreamer.scm:       ("orc" ,orc)))
gnu/packages/gstreamer.scm:       ("orc" ,orc)

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #1.2: 0001-gnu-gst-plugins-base-Don-t-build-with-orc-on-arm-mip.patch --]
[-- Type: text/plain, Size: 1707 bytes --]

From b368c9c2c9948d32bb9167cd4e07aa4d49fa2d44 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Wed, 30 Mar 2016 18:03:53 +0300
Subject: [PATCH] gnu: gst-plugins-base: Don't build with orc on arm/mips
 architectures.

* gnu/packages/gstreamer.scm (gst-plugins-base)[inputs]: Only use orc as
an input on armhf or mips architectures.
---
 gnu/packages/gstreamer.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 5cf59cd..3694e6c 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -58,7 +58,9 @@
   #:use-module (gnu packages tls)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages yasm)
-  #:use-module (gnu packages xml))
+  #:use-module (gnu packages xml)
+  #:use-module (srfi srfi-1)
+  #:use-module (srfi srfi-26))
 
 (define-public orc
   (package
@@ -160,7 +162,14 @@ This package provides the core library and elements.")
      `(("gstreamer" ,gstreamer))) ; required by gstreamer-plugins-base-1.0.pc
     (inputs
      `(("cdparanoia" ,cdparanoia)
-       ("orc" ,orc)
+       ;; FIXME: On arm the orc related tests fail, and on mips "orc" fails to
+       ;; build.  For the time being we are disabling "orc" as an input on
+       ;; these architectures.
+       ,@(if (any (cute string-prefix? <> (or (%current-target-system)
+                                              (%current-system)))
+                  '("arm" "mips"))
+           '()
+           `(("orc" ,orc)))
        ("pango" ,pango)
        ("libogg" ,libogg)
        ("libtheora" ,libtheora)
-- 
2.8.0.rc3


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]