From: taylanbayirli@gmail.com (Taylan Ulrich Bayırlı/Kammer)
To: guix-devel@gnu.org
Subject: [PATCH] gnu: mesa: Add libva input.
Date: Tue, 28 Apr 2015 15:14:39 +0200 [thread overview]
Message-ID: <87zj5se6o0.fsf@taylan.uni.cx> (raw)
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0002-gnu-mesa-Add-libva-input.patch --]
[-- Type: text/x-diff, Size: 1984 bytes --]
From 8bb21df5e4769797ba915a83643da57168f8dc9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
<taylanbayirli@gmail.com>
Date: Tue, 28 Apr 2015 15:08:47 +0200
Subject: [PATCH 2/3] 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 | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index a40749e..69dd8b7 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -21,6 +21,7 @@
(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)
@@ -37,6 +38,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 +161,12 @@ Polygon meshes, and Extruded polygon meshes")
also known as DXTn or DXTC) for Mesa.")
(license l:expat)))
+(define libva-for-mesa
+ (package
+ (inherit libva)
+ (inputs (alist-delete "mesa" (package-inputs libva)))
+ (arguments '(#:configure-flags '("--disable-glx" "--disable-egl")))))
+
(define-public mesa
(package
(name "mesa")
@@ -188,8 +196,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-for-mesa)
("libxml2" ,libxml2)
;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
("libxvmc" ,libxvmc)
--
2.2.1
next reply other threads:[~2015-04-28 13:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-28 13:14 Taylan Ulrich Bayırlı/Kammer [this message]
2015-04-28 14:14 ` [PATCH] gnu: mesa: Add libva input Taylan Ulrich Bayırlı/Kammer
2015-04-28 14:20 ` 宋文武
2015-04-28 20:21 ` Taylan Ulrich Bayırlı/Kammer
2015-04-29 8:59 ` 宋文武
2015-04-29 21:12 ` Andreas Enge
2015-04-29 21:52 ` Taylan Ulrich Bayırlı/Kammer
2015-04-30 7:29 ` Andreas Enge
2015-04-30 7:31 ` Andreas Enge
2015-04-30 7:52 ` Taylan Ulrich Bayırlı/Kammer
2015-04-30 13:26 ` Taylan Ulrich Bayırlı/Kammer
2015-04-30 22:18 ` Ludovic Courtès
2015-04-30 7:49 ` Taylan Ulrich Bayırlı/Kammer
2015-04-30 8:20 ` Taylan Ulrich Bayırlı/Kammer
2015-04-30 22:17 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zj5se6o0.fsf@taylan.uni.cx \
--to=taylanbayirli@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).