From mboxrd@z Thu Jan 1 00:00:00 1970 From: taylanbayirli@gmail.com (Taylan Ulrich =?utf-8?Q?Bay=C4=B1rl=C4=B1?= =?utf-8?Q?=2FKammer?=) Subject: [PATCH] gnu: mesa: Add libva input. Date: Tue, 28 Apr 2015 15:14:39 +0200 Message-ID: <87zj5se6o0.fsf@taylan.uni.cx> Mime-Version: 1.0 Content-Type: text/x-diff Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:56352) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn5LX-0002JG-Ow for guix-devel@gnu.org; Tue, 28 Apr 2015 09:14:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yn5LW-0001VM-JF for guix-devel@gnu.org; Tue, 28 Apr 2015 09:14:43 -0400 Received: from mail-wg0-x22c.google.com ([2a00:1450:400c:c00::22c]:33535) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yn5LW-0001VG-9C for guix-devel@gnu.org; Tue, 28 Apr 2015 09:14:42 -0400 Received: by wgin8 with SMTP id n8so150920894wgi.0 for ; Tue, 28 Apr 2015 06:14:41 -0700 (PDT) Received: from taylan.uni.cx (p2003007A0A2BDCAD0213E8FFFEED36FB.dip0.t-ipconnect.de. [2003:7a:a2b:dcad:213:e8ff:feed:36fb]) by mx.google.com with ESMTPSA id yr1sm34187612wjc.37.2015.04.28.06.14.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Apr 2015 06:14:40 -0700 (PDT) Content-Disposition: inline; filename=0002-gnu-mesa-Add-libva-input.patch List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org >From 8bb21df5e4769797ba915a83643da57168f8dc9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?= 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