From 7dc96170a3684ed75ba232892b2d4390f963a6b3 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 8 Apr 2019 23:03:39 +0200
Subject: gnu: libdrm: Avoid timeout while running tests.

Suggested by Efraim Flashner at
<https://lists.gnu.org/archive/html/guix-devel/2019-04/msg00008.html>.

* gnu/packages/xdisorg.scm (libdrm)[arguments]: Make 'check phase
unconditional.
---
 gnu/packages/xdisorg.scm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index c034b50927..9fde0fcbd4 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2014, 2015, 2016 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2013, 2015, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2015, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2015 Alexander I.Grafov <grafov@gmail.com>
 ;;; Copyright © 2015 Andy Wingo <wingo@igalia.com>
@@ -402,13 +402,11 @@ (define-public libdrm
                 "-Dtegra=true"
                 "-Dfreedreno-kgsl=true"))
              (_ '())))
-       ,@(if (string=? (%current-system) "armhf-linux")
-             '(#:phases
-               (modify-phases %standard-phases
-                 (replace 'check
-                   (lambda _
-                     (invoke "meson" "test" "--timeout-multiplier" "5")))))
-             '())))
+
+       #:phases (modify-phases %standard-phases
+                  (replace 'check
+                    (lambda _
+                      (invoke "meson" "test" "--timeout-multiplier" "5"))))))
     (inputs
      `(("libpciaccess" ,libpciaccess)))
     (native-inputs
-- 
cgit v1.2.3


From ab45191ef03f575e2b019341827e79c29a2e6903 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Mon, 15 Apr 2019 06:29:29 +0200
Subject: gnu: libwacom: Update to 0.33.

* gnu/packages/xdisorg.scm (libwacom): Update to 0.33.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 415a1fc003..974233fd1e 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -956,7 +956,7 @@ (define-public xcape
 (define-public libwacom
   (package
     (name "libwacom")
-    (version "0.32")
+    (version "0.33")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -964,7 +964,7 @@ (define-public libwacom
                     "libwacom-" version "/libwacom-" version ".tar.bz2"))
               (sha256
                (base32
-                "102kz0q7i0bjsnl6yy83vcj2rpir12rs2d4xr0wvhw84rs5sp7bb"))))
+                "1wnv34y7m9l6avlvwqvfrnksfnsz1lbgb412dn6s7x1h3wvs7y4l"))))
     (build-system glib-or-gtk-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)))
-- 
cgit v1.2.3


From af1d777e6c03a89f8d5da0bc41b7d5709aebcaea Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Tue, 23 Apr 2019 13:32:05 +0200
Subject: gnu: maim: Update to 5.5.3.

* gnu/packages/xdisorg.scm (maim): Update to 5.5.3.
---
 gnu/packages/xdisorg.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 974233fd1e..79cd73cbfb 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -573,7 +573,7 @@ (define-public slop
 (define-public maim
   (package
     (name "maim")
-    (version "5.5.2")
+    (version "5.5.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -582,7 +582,7 @@ (define-public maim
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "14mfxdm39kc5jk8wysrzx05ag2g4sk9l24i8m5pzqn8j611150v3"))))
+                "1kbxsz8whfxl5blwsvpva2q95zwy72argwhi1cfqh5lrhzq5zrpp"))))
     (build-system cmake-build-system)
     (arguments
      '(#:tests? #f))            ; no "check" target
-- 
cgit v1.2.3