From 6fe808f4c3272cbf5329054aacfb1bafc302c4bc Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sun, 7 Jul 2019 22:05:34 +0200
Subject: gnu: mesa: Use the "release" Meson build type.

* gnu/packages/gl.scm (mesa)[arguments]: Add <#:build-type>.
---
 gnu/packages/gl.scm | 5 +++++
 1 file changed, 5 insertions(+)

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

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 9ed043c7ae..f615ebd71c 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -331,6 +331,11 @@ (define-public mesa
                 "-Dllvm=true"))         ; default is x86/x86_64 only
              (_
               '("-Ddri-drivers=nouveau,r200,r100"))))
+
+       ;; XXX: 'debugoptimized' causes LTO link failures on some drivers.  The
+       ;; documentation recommends using 'release' for performance anyway.
+       #:build-type "release"
+
        #:modules ((ice-9 match)
                   (srfi srfi-1)
                   (guix build utils)
-- 
cgit v1.2.3


From c7e31cde04f6308615734f5c6fd91de87e1a60f5 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Thu, 25 Apr 2019 15:46:36 +0200
Subject: gnu: ftgl: Update to 2.4.0.

* gnu/packages/gl.scm (ftgl): Update to 2.4.0.
[home-page]: Change to maintained fork at <https://github.com/frankheckenbach/ftgl>.
[source]: Change to GIT-FETCH.
[native-inputs]: Add AUTOCONF, AUTOMAKE and LIBTOOL.
---
 gnu/packages/gl.scm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

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

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index f615ebd71c..e7d50a5b8a 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -149,15 +149,16 @@ (define-public freeglut-2.8
 (define-public ftgl
   (package
     (name "ftgl")
-    (version "2.1.3-rc5")
+    (version "2.4.0")
+    (home-page "https://github.com/frankheckenbach/ftgl")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "mirror://sourceforge/ftgl/FTGL%20Source/2.1.3~rc5/"
-                    "ftgl-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference (url home-page)
+                                  (commit (string-append "v" version))))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"))))
+                "0zjs1h9w30gajq9lndzvjsa26rsmr1081lb1fbpbj10yhcdcsc79"))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags '("--disable-static")))
@@ -167,8 +168,10 @@ (define-public ftgl
               ("mesa" ,mesa)
               ("glu" ,glu)))
     (native-inputs
-     `(("pkg-config" ,pkg-config)))
-    (home-page "http://ftgl.sourceforge.net")
+     `(("pkg-config" ,pkg-config)
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
     (synopsis "Font rendering library for OpenGL applications")
     (description
      "FTGL is a font rendering library for OpenGL applications.  Supported
-- 
cgit v1.2.3