nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: mesa: Update to 10.4.0. 

* gnu/packages/gl.scm (mesa): Update to 10.4.0.  Use current libdrm.  Add
  eudev, dri3proto, presentproto, and libxshmfence to inputs.  Add gnu-gettext
  to native-inputs.  Add --enable-xa configure flag.  Add new phases
  'add-missing-m4-files' and 'patch-create_test_cases'.
This commit is contained in:
Mark H Weaver 2014-12-16 17:22:47 -05:00
parent 31157f8e52
commit ce4d7abf02
1 changed files with 36 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gnu/packages/gl.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2013 Joshua Grant <tadni@riseup.net> ;;; Copyright © 2013 Joshua Grant <tadni@riseup.net>
;;; Copyright © 2014 David Thompson <davet@gnu.org> ;;; Copyright © 2014 David Thompson <davet@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -27,6 +28,8 @@
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages flex) #:use-module (gnu packages flex)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages gettext)
#:use-module (gnu packages linux)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
@ -122,49 +125,60 @@ Polygon meshes, and Extruded polygon meshes")
(define-public mesa (define-public mesa
(package (package
(name "mesa") (name "mesa")
;; In newer versions (9.0.5, 9.1 and 9.2 tested), "make" results in an (version "10.4.0")
;; infinite configure loop, see
;; https://bugs.freedesktop.org/show_bug.cgi?id=58812
(version "8.0.5")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/"
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/" version "/MesaLib-" version ".tar.bz2"))
version
"/MesaLib-" version
".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si")))) "069j4ck51hc70gryhw3z0rkyhhl0bnhbks4xg1wqqw56l7rxz9wq"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(propagated-inputs (propagated-inputs
`(("glproto" ,glproto) `(("glproto" ,glproto)
("libdrm" ,libdrm-2.4.33) ("libdrm" ,libdrm)
("libx11" ,libx11) ("libx11" ,libx11)
("libxdamage" ,libxdamage) ("libxdamage" ,libxdamage)
("libxxf86vm" ,libxxf86vm))) ("libxxf86vm" ,libxxf86vm)))
(inputs (inputs
`(("dri2proto" ,dri2proto) `(("udev" ,eudev)
("dri2proto" ,dri2proto)
("dri3proto" ,dri3proto)
("presentproto" ,presentproto)
("libxshmfence" ,libxshmfence)
("expat" ,expat) ("expat" ,expat)
("libxfixes" ,libxfixes) ("libxfixes" ,libxfixes)
("libxml2" ,libxml2) ("libxml2" ,libxml2)
;; TODO: Add 'libva'
;; TODO: Add 'libxml2-python' for OpenGL ES 1.1 and 2.0 support
("makedepend" ,makedepend))) ("makedepend" ,makedepend)))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)
("gettext" ,gnu-gettext)
("flex" ,flex) ("flex" ,flex)
("bison" ,bison) ("bison" ,bison)
("python" ,python-2))) ; incompatible with Python 3 (print syntax) ("python" ,python-2))) ; incompatible with Python 3 (print syntax)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
`("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm `(;; drop r300 from default gallium drivers, as it requires llvm
#:phases "--with-gallium-drivers=r600,svga,swrast"
(alist-cons-after "--enable-xa")
'unpack 'remove-symlink #:phases (alist-cons-after
'unpack 'add-missing-m4-files
(lambda _ (lambda _
;; remove dangling symlink to /usr/include/wine/windows ;; When these files are missing, make tries to rebuild
(delete-file "src/gallium/state_trackers/d3d1x/w32api")) ;; several parts of the build system.
%standard-phases))) (zero? (system* "touch" "--date=@0"
"m4/libtool.m4" "m4/ltoptions.m4"
"m4/ltsugar.m4" "m4/ltversion.m4"
"m4/lt~obsolete.m4")))
(alist-cons-after
'unpack 'patch-create_test_cases
(lambda _
(substitute* "src/glsl/tests/lower_jumps/create_test_cases.py"
(("/usr/bin/env bash") (which "bash"))))
%standard-phases))))
(home-page "http://mesa3d.org/") (home-page "http://mesa3d.org/")
(synopsis "OpenGL implementation") (synopsis "OpenGL implementation")
(description "Mesa is a free implementation of the OpenGL specification - (description "Mesa is a free implementation of the OpenGL specification -