[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] gnu: mesa: Add libva input.
From: |
Taylan Ulrich Bayırlı/Kammer |
Subject: |
Re: [PATCH] gnu: mesa: Add libva input. |
Date: |
Wed, 29 Apr 2015 23:52:30 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) |
Andreas Enge <address@hidden> writes:
> On Tue, Apr 28, 2015 at 10:21:25PM +0200, Taylan Ulrich Bayırlı/Kammer wrote:
>> notably I put the libva-without-mesa package into video.scm
>> because I was getting circular import problems:
>> +(define-public libva-no-mesa
>
> Is there no other solution that does not expose the package to the public?
> After all, it is not supposed to be installed explicitly by a user if I
> understood you correctly.
Right. I don't know what I did wrong before, but it actually seems to
work fine to put it in gl.scm. New patch:
>From 88befe34eb2d92fe81ac2a897934b9aad0b9a22d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<address@hidden>
Date: Tue, 28 Apr 2015 15:08:47 +0200
Subject: [PATCH 3/4] gnu: mesa: Add libva input.
There is a circular dependency between Mesa and libVA, so we use a
libva-for-mesa package that builds libVA without GLX and EGL support, and use
that for building Mesa.
* gnu/packages/gl.scm (libva-for-mesa): New variable.
(mesa): Add as input.
---
gnu/packages/gl.scm | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index a40749e..8159073 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -21,11 +21,13 @@
(define-module (gnu packages gl)
#:use-module (ice-9 match)
+ #:use-module (guix build utils)
#:use-module ((guix licenses) #:prefix l:)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (gnu packages autotools)
#:use-module (gnu packages bison)
#:use-module (gnu packages flex)
@@ -37,6 +39,7 @@
#:use-module (gnu packages xml)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages guile)
+ #:use-module (gnu packages video)
#:use-module (gnu packages xdisorg))
(define-public glu
@@ -159,6 +162,18 @@ Polygon meshes, and Extruded polygon meshes")
also known as DXTn or DXTC) for Mesa.")
(license l:expat)))
+(define libva-no-mesa
+ (package
+ (inherit libva)
+ (name "libva-no-mesa")
+ (inputs (alist-delete "mesa" (package-inputs libva)))
+ (arguments
+ (strip-keyword-arguments
+ '(#:make-flags)
+ (substitute-keyword-arguments (package-arguments libva)
+ ((#:configure-flags flags)
+ '(list "--disable-glx" "--disable-egl")))))))
+
(define-public mesa
(package
(name "mesa")
@@ -188,8 +203,7 @@ also known as DXTn or DXTC) for Mesa.")
("dri3proto" ,dri3proto)
("presentproto" ,presentproto)
("expat" ,expat)
- ;; TODO: Solve circular dependency with libva.
- ;; ("libva" ,libva)
+ ("libva" ,libva-no-mesa)
("libxml2" ,libxml2)
;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
("libxvmc" ,libxvmc)
--
2.2.1
- [PATCH] gnu: mesa: Add libva input., Taylan Ulrich Bayırlı/Kammer, 2015/04/28
- Re: [PATCH] gnu: mesa: Add libva input., Taylan Ulrich Bayırlı/Kammer, 2015/04/28
- Re: [PATCH] gnu: mesa: Add libva input., 宋文武, 2015/04/28
- Re: [PATCH] gnu: mesa: Add libva input., Taylan Ulrich Bayırlı/Kammer, 2015/04/28
- Re: [PATCH] gnu: mesa: Add libva input., 宋文武, 2015/04/29
- Re: [PATCH] gnu: mesa: Add libva input., Andreas Enge, 2015/04/29
- Re: [PATCH] gnu: mesa: Add libva input.,
Taylan Ulrich Bayırlı/Kammer <=
- Re: [PATCH] gnu: mesa: Add libva input., Andreas Enge, 2015/04/30
- Re: [PATCH] gnu: mesa: Add libva input., Andreas Enge, 2015/04/30
- Re: [PATCH] gnu: mesa: Add libva input., Taylan Ulrich Bayırlı/Kammer, 2015/04/30
- Re: [PATCH] gnu: mesa: Add libva input., Taylan Ulrich Bayırlı/Kammer, 2015/04/30
- Re: [PATCH] gnu: mesa: Add libva input., Ludovic Courtès, 2015/04/30
- Re: [PATCH] gnu: mesa: Add libva input., Taylan Ulrich Bayırlı/Kammer, 2015/04/30
- Re: [PATCH] gnu: mesa: Add libva input., Taylan Ulrich Bayırlı/Kammer, 2015/04/30
- Re: [PATCH] gnu: mesa: Add libva input., Ludovic Courtès, 2015/04/30