diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-08-13 20:42:06 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-08-13 20:42:06 +0200 |
| commit | 462ad9f56b9665b8d22960acee73ad91f1052c9c (patch) | |
| tree | 814be463d6d0517e7db9b9e6f15dbc7516955674 /gnu/packages/gl.scm | |
| parent | 7f5f61ae99321a7a6e08b0100cd428e11ce6a837 (diff) | |
| parent | 1b1b006afd31c5526f34d157baef492c7dde2e9c (diff) | |
| download | gnu-guix-462ad9f56b9665b8d22960acee73ad91f1052c9c.tar gnu-guix-462ad9f56b9665b8d22960acee73ad91f1052c9c.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gl.scm')
| -rw-r--r-- | gnu/packages/gl.scm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index e7d50a5b8a..9aaeab6e2c 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -64,14 +64,14 @@ (define-public glu (package (name "glu") - (version "9.0.0") + (version "9.0.1") (source (origin (method url-fetch) (uri (string-append "ftp://ftp.freedesktop.org/pub/mesa/glu/glu-" version ".tar.gz")) (sha256 (base32 - "0r72yyhj09x3krn3kn629jqbwyq50ji8w5ri2pn6zwrk35m4g1s3")))) + "1xqhk9bn10nbvffw3r4p4rjslwz1l7gaycc0x2pqkr2irp7q9x7n")))) (build-system gnu-build-system) (propagated-inputs `(("mesa" ,mesa))) ; according to glu.pc @@ -227,7 +227,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.1.1") + (version "19.1.4") (source (origin (method url-fetch) @@ -239,7 +239,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "10amy5sdmpjbskr3xazgk0jyli8xpgi0y1nsmjr76hx8nhb4n4bj")) + "1yvb7ja09i36zjifpyrf8jmbm9z0wqs2w3x8dlmxkkzdv6knilm6")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) @@ -291,7 +291,7 @@ also known as DXTn or DXTC) for Mesa.") ;; TODO: Fix svga driver for aarch64 and armhf. '("-Dgallium-drivers=etnaviv,freedreno,nouveau,r300,r600,swrast,tegra,v3d,vc4,virgl")) (_ - '("-Dgallium-drivers=nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) + '("-Dgallium-drivers=iris,nouveau,r300,r600,radeonsi,svga,swrast,virgl"))) ;; Enable various optional features. TODO: opencl requires libclc, ;; omx requires libomxil-bellagio "-Dplatforms=x11,drm,surfaceless,wayland" @@ -308,11 +308,8 @@ also known as DXTn or DXTC) for Mesa.") ;; Enable Vulkan on i686-linux and x86-64-linux. ,@(match (%current-system) - ("x86_64-linux" + ((or "i686-linux" "x86_64-linux") '("-Dvulkan-drivers=intel,amd")) - ;; TODO: Fix intel driver on i686-linux. - ("i686-linux" - '("-Dvulkan-drivers=amd")) (_ '("-Dvulkan-drivers=auto"))) |