gnu: mesa: Move out of xorg.scm and into gl.scm
* gnu/packages/xorg.scm (mesa): Move to... * gnu/packages/gl.scm (mesa): ... here. New variable. * gnu/packages/gnome.scm, gnu/packages/gnuzilla.scm, gnu/packages/qemu.scm, gnu/packages/qt.scm: Adjust accordingly. Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
4d1a2b50a6
commit
200726ed09
@ -23,7 +23,12 @@
|
|||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
|
#:use-module (gnu packages bison)
|
||||||
|
#:use-module (gnu packages flex)
|
||||||
|
#:use-module (gnu packages pkg-config)
|
||||||
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (gnu packages xml)
|
||||||
#:use-module (gnu packages fontutils))
|
#:use-module (gnu packages fontutils))
|
||||||
|
|
||||||
(define-public glu
|
(define-public glu
|
||||||
@ -110,3 +115,57 @@ the X-Consortium license.")
|
|||||||
rendering modes are: Bitmaps, Anti-aliased pixmaps, Texture maps, Outlines,
|
rendering modes are: Bitmaps, Anti-aliased pixmaps, Texture maps, Outlines,
|
||||||
Polygon meshes, and Extruded polygon meshes")
|
Polygon meshes, and Extruded polygon meshes")
|
||||||
(license l:x11)))
|
(license l:x11)))
|
||||||
|
|
||||||
|
(define-public mesa
|
||||||
|
(package
|
||||||
|
(name "mesa")
|
||||||
|
;; In newer versions (9.0.5, 9.1 and 9.2 tested), "make" results in an
|
||||||
|
;; infinite configure loop, see
|
||||||
|
;; https://bugs.freedesktop.org/show_bug.cgi?id=58812
|
||||||
|
(version "8.0.5")
|
||||||
|
(source
|
||||||
|
(origin
|
||||||
|
(method url-fetch)
|
||||||
|
(uri (string-append
|
||||||
|
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/"
|
||||||
|
version
|
||||||
|
"/MesaLib-" version
|
||||||
|
".tar.bz2"))
|
||||||
|
(sha256
|
||||||
|
(base32
|
||||||
|
"0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si"))))
|
||||||
|
(build-system gnu-build-system)
|
||||||
|
(propagated-inputs
|
||||||
|
`(("glproto" ,glproto)
|
||||||
|
("libdrm" ,libdrm-2.4.33)
|
||||||
|
("libxdamage" ,libxdamage)
|
||||||
|
("libxxf86vm" ,libxxf86vm)))
|
||||||
|
(inputs
|
||||||
|
`(("dri2proto" ,dri2proto)
|
||||||
|
("expat" ,expat)
|
||||||
|
("libx11" ,libx11)
|
||||||
|
("libxfixes" ,libxfixes)
|
||||||
|
("libxml2" ,libxml2)
|
||||||
|
("makedepend" ,makedepend)))
|
||||||
|
(native-inputs
|
||||||
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("flex" ,flex)
|
||||||
|
("bison" ,bison)
|
||||||
|
("python" ,python-2))) ; incompatible with Python 3 (print syntax)
|
||||||
|
(arguments
|
||||||
|
`(#:configure-flags
|
||||||
|
`("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm
|
||||||
|
#:phases
|
||||||
|
(alist-cons-after
|
||||||
|
'unpack 'remove-symlink
|
||||||
|
(lambda* (#:key #:allow-other-keys)
|
||||||
|
;; remove dangling symlink to /usr/include/wine/windows
|
||||||
|
(delete-file "src/gallium/state_trackers/d3d1x/w32api"))
|
||||||
|
%standard-phases)))
|
||||||
|
(home-page "http://mesa3d.org/")
|
||||||
|
(synopsis "Mesa, an OpenGL implementation")
|
||||||
|
(description "Mesa is a free implementation of the OpenGL specification -
|
||||||
|
a system for rendering interactive 3D graphics. A variety of device drivers
|
||||||
|
allows Mesa to be used in many different environments ranging from software
|
||||||
|
emulation to complete hardware acceleration for modern GPUs.")
|
||||||
|
(license l:x11)))
|
||||||
|
@ -35,6 +35,7 @@
|
|||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages xml)
|
#:use-module (gnu packages xml)
|
||||||
|
#:use-module (gnu packages gl)
|
||||||
#:use-module (gnu packages xorg))
|
#:use-module (gnu packages xorg))
|
||||||
|
|
||||||
(define-public brasero
|
(define-public brasero
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#:use-module (gnu packages libffi)
|
#:use-module (gnu packages libffi)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (gnu packages gl)
|
||||||
#:use-module (gnu packages yasm)
|
#:use-module (gnu packages yasm)
|
||||||
#:use-module (gnu packages zip))
|
#:use-module (gnu packages zip))
|
||||||
|
|
||||||
|
@ -36,6 +36,7 @@
|
|||||||
#:use-module (gnu packages linux)
|
#:use-module (gnu packages linux)
|
||||||
#:use-module (gnu packages samba)
|
#:use-module (gnu packages samba)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
|
#:use-module (gnu packages gl)
|
||||||
#:use-module (gnu packages sdl)
|
#:use-module (gnu packages sdl)
|
||||||
#:use-module (gnu packages perl))
|
#:use-module (gnu packages perl))
|
||||||
|
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages pulseaudio)
|
#:use-module (gnu packages pulseaudio)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
|
#:use-module (gnu packages gl)
|
||||||
#:use-module (gnu packages xorg))
|
#:use-module (gnu packages xorg))
|
||||||
|
|
||||||
(define-public libxkbcommon
|
(define-public libxkbcommon
|
||||||
|
@ -31,6 +31,7 @@
|
|||||||
#:use-module (gnu packages oggvorbis)
|
#:use-module (gnu packages oggvorbis)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages pulseaudio)
|
#:use-module (gnu packages pulseaudio)
|
||||||
|
#:use-module (gnu packages gl)
|
||||||
#:use-module (gnu packages xorg)
|
#:use-module (gnu packages xorg)
|
||||||
#:export (sdl
|
#:export (sdl
|
||||||
sdl2
|
sdl2
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
#:use-module (gnu packages flex)
|
#:use-module (gnu packages flex)
|
||||||
#:use-module (gnu packages fontutils)
|
#:use-module (gnu packages fontutils)
|
||||||
#:use-module (gnu packages gettext)
|
#:use-module (gnu packages gettext)
|
||||||
|
#:use-module (gnu packages gl)
|
||||||
#:use-module (gnu packages glib)
|
#:use-module (gnu packages glib)
|
||||||
#:use-module (gnu packages gnupg)
|
#:use-module (gnu packages gnupg)
|
||||||
#:use-module (gnu packages gperf)
|
#:use-module (gnu packages gperf)
|
||||||
@ -4267,64 +4268,6 @@ tracking.")
|
|||||||
(license license:x11)))
|
(license license:x11)))
|
||||||
|
|
||||||
|
|
||||||
;; package outside the x.org system proper of height 3
|
|
||||||
|
|
||||||
(define-public mesa
|
|
||||||
(package
|
|
||||||
(name "mesa")
|
|
||||||
;; In newer versions (9.0.5, 9.1 and 9.2 tested), "make" results in an
|
|
||||||
;; infinite configure loop, see
|
|
||||||
;; https://bugs.freedesktop.org/show_bug.cgi?id=58812
|
|
||||||
(version "8.0.5")
|
|
||||||
(source
|
|
||||||
(origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append
|
|
||||||
"ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/"
|
|
||||||
version
|
|
||||||
"/MesaLib-" version
|
|
||||||
".tar.bz2"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"0pjs8x51c0i6mawgd4w03lxpyx5fnx7rc8plr8jfsscf9yiqs6si"))))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(propagated-inputs
|
|
||||||
`(("glproto" ,glproto)
|
|
||||||
("libdrm" ,libdrm-2.4.33)
|
|
||||||
("libxdamage" ,libxdamage)
|
|
||||||
("libxxf86vm" ,libxxf86vm)))
|
|
||||||
(inputs
|
|
||||||
`(("dri2proto" ,dri2proto)
|
|
||||||
("expat" ,expat)
|
|
||||||
("libx11" ,libx11)
|
|
||||||
("libxfixes" ,libxfixes)
|
|
||||||
("libxml2" ,libxml2)
|
|
||||||
("makedepend" ,makedepend)))
|
|
||||||
(native-inputs
|
|
||||||
`(("pkg-config" ,pkg-config)
|
|
||||||
("flex" ,flex)
|
|
||||||
("bison" ,bison)
|
|
||||||
("python" ,python-2))) ; incompatible with Python 3 (print syntax)
|
|
||||||
(arguments
|
|
||||||
`(#:configure-flags
|
|
||||||
`("--with-gallium-drivers=r600,svga,swrast") ; drop r300 from the default list as it requires llvm
|
|
||||||
#:phases
|
|
||||||
(alist-cons-after
|
|
||||||
'unpack 'remove-symlink
|
|
||||||
(lambda* (#:key #:allow-other-keys)
|
|
||||||
;; remove dangling symlink to /usr/include/wine/windows
|
|
||||||
(delete-file "src/gallium/state_trackers/d3d1x/w32api"))
|
|
||||||
%standard-phases)))
|
|
||||||
(home-page "http://mesa3d.org/")
|
|
||||||
(synopsis "Mesa, an OpenGL implementation")
|
|
||||||
(description "Mesa is a free implementation of the OpenGL specification -
|
|
||||||
a system for rendering interactive 3D graphics. A variety of device drivers
|
|
||||||
allows Mesa to be used in many different environments ranging from software
|
|
||||||
emulation to complete hardware acceleration for modern GPUs.")
|
|
||||||
(license license:x11)))
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
;; packages of height 3 in the propagated-inputs tree
|
;; packages of height 3 in the propagated-inputs tree
|
||||||
|
|
||||||
(define-public libxcb
|
(define-public libxcb
|
||||||
|
Loading…
Reference in New Issue
Block a user