diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-21 22:39:42 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-21 22:39:42 +0100 |
| commit | 8ed9be3faccb865204de46d2a8ed3e96e59281b6 (patch) | |
| tree | 77ba4c90cda569048bc9ce2e414ede1567130c88 /gnu/packages/gl.scm | |
| parent | 36930b2463fc933e7c5580f49413dbd14cf1df48 (diff) | |
| parent | 715110a8a2e9e4b1a89635950744eb5260b8ee7f (diff) | |
Merge branch 'staging' into core-updates
Diffstat (limited to 'gnu/packages/gl.scm')
| -rw-r--r-- | gnu/packages/gl.scm | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm index 077b009688..42bed5d623 100644 --- a/gnu/packages/gl.scm +++ b/gnu/packages/gl.scm @@ -96,7 +96,7 @@ as ASCII text.") (define-public freeglut (package (name "freeglut") - (version "3.0.0") + (version "3.2.1") (source (origin (method url-fetch) (uri (string-append @@ -104,16 +104,15 @@ as ASCII text.") version "/freeglut-" version ".tar.gz")) (sha256 (base32 - "18knkyczzwbmyg8hr4zh8a1i5ga01np2jzd1rwmsh7mh2n2vwhra")))) + "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l")))) (build-system cmake-build-system) - (arguments '(#:tests? #f)) ; no test target - (inputs `(("mesa" ,mesa) - ("libx11" ,libx11) + (arguments + '(#:tests? #f ;no test target + #:configure-flags '("-DFREEGLUT_BUILD_STATIC_LIBS=OFF"))) + (inputs `(("libx11" ,libx11) ("libxi" ,libxi) ("libxrandr" ,libxrandr) - ("libxxf86vm" ,libxxf86vm) - ("xorgproto" ,xorgproto) - ("xinput" ,xinput))) + ("libxxf86vm" ,libxxf86vm))) (propagated-inputs ;; Headers from Mesa and GLU are needed. `(("glu" ,glu) @@ -230,7 +229,7 @@ also known as DXTn or DXTC) for Mesa.") (define-public mesa (package (name "mesa") - (version "19.2.7") + (version "19.3.2") (source (origin (method url-fetch) @@ -242,7 +241,7 @@ also known as DXTn or DXTC) for Mesa.") version "/mesa-" version ".tar.xz"))) (sha256 (base32 - "17jp8ghipgz62vqqz5llskxypkcmgf8gnlgnj0pyvnbgi6vryyg3")) + "1hg1gvcwvayksrdh9z8rfz66h3z1ffspmm2qgyy2nd8n8qrfwfjf")) (patches (search-patches "mesa-skip-disk-cache-test.patch")))) (build-system meson-build-system) |