From 64136870445f15242a75fca317fc8af35c4a8cee Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 4 Jan 2020 01:06:51 +0100
Subject: gnu: freeglut: Update to 3.2.1.

* gnu/packages/gl.scm (freeglut): Update to 3.2.1.
[inputs]: Remove MESA, XORGPROTO and XINPUT.
---
 gnu/packages/gl.scm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'gnu/packages/gl.scm')

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 077b009688..ad1b845b6f 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,13 @@ 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)
+    (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)
-- 
cgit v1.2.3


From 5f6130473788c074536cee2d29dcb052c3140182 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sat, 4 Jan 2020 01:09:59 +0100
Subject: gnu: freeglut: Do not build static libraries.

* gnu/packages/gl.scm (freeglut)[arguments]: Add #:configure-flags.
---
 gnu/packages/gl.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'gnu/packages/gl.scm')

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index ad1b845b6f..23904a556b 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -106,7 +106,9 @@ as ASCII text.")
                (base32
                 "0s6sk49q8ijgbsrrryb7dzqx2fa744jhx1wck5cz5jia2010w06l"))))
     (build-system cmake-build-system)
-    (arguments '(#:tests? #f)) ; no test target
+    (arguments
+     '(#:tests? #f                      ;no test target
+       #:configure-flags '("-DFREEGLUT_BUILD_STATIC_LIBS=OFF")))
     (inputs `(("libx11" ,libx11)
               ("libxi" ,libxi)
               ("libxrandr" ,libxrandr)
-- 
cgit v1.2.3


From 289d66d0cf2894146095030ccfcf3dcec352669e Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sun, 19 Jan 2020 10:42:12 +0100
Subject: gnu: mesa: Update to 19.3.2.

* gnu/packages/gl.scm (mesa): Update to 19.3.2.
---
 gnu/packages/gl.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/gl.scm')

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 23904a556b..42bed5d623 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -229,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)
@@ -241,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)
-- 
cgit v1.2.3