extra/valgrind fixes

extra/libdrm/0001-configure-default-enable-valgrind-to-auto.patch

@@ -0,0 +1,29 @@
+From 676c806d0221a7ea375676b2eab514c426fcacd3 Mon Sep 17 00:00:00 2001
+From: Emil Velikov <emil.l.velikov@gmail.com>
+Date: Tue, 30 Jun 2015 14:01:14 +0100
+Subject: [PATCH] configure: default --enable-valgrind to auto
+
+... as the help text says.
+
+Reported-by: Jasper St. Pierre <jstpierre@mecheye.net>
+Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1456b90..001fd3d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -406,7 +406,7 @@ AM_CONDITIONAL([HAVE_MANPAGES_STYLESHEET], [test "x$HAVE_MANPAGES_STYLESHEET" =
+ AC_ARG_ENABLE(valgrind,
+               [AS_HELP_STRING([--enable-valgrind],
+                              [Build libdrm with  valgrind support (default: auto)])],
+-                             [VALGRIND=$enableval], [VALGRIND=yes])
++                             [VALGRIND=$enableval], [VALGRIND=auto])
+ PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no])
+ AC_MSG_CHECKING([whether to enable Valgrind support])
+ if test "x$VALGRIND" = xauto; then
+-- 
+2.4.4
+

extra/libdrm/PKGBUILD

@@ -3,7 +3,8 @@
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - enable omap, exynos, freedreno for v7
-#  - drop valgrind makdepend
+#  - drop valgrind makdepend for v5 and v6
+#  - upstream fix to valgrind detection
 
 pkgname=libdrm
 pkgver=2.4.62
@@ -13,13 +14,16 @@ arch=(i686 x86_64)
 license=('custom')
 depends=('glibc' 'libpciaccess')
 makedepends=('xorg-util-macros')
+makedepends_armv7h=('valgrind')
 checkdepends=('cairo')
 replaces=('libdrm-new' 'libdrm-nouveau')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2{,.sig}
+        0001-configure-default-enable-valgrind-to-auto.patch
         COPYING)
 sha256sums=('906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc'
             'SKIP'
+            '3fc9bb4279486e3a4cb0d86d50b6999f95d0606e83f1f804b3f110d371b74588'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst <maarten.lankhorst@canonical.com>
 validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau <damien.lespiau@intel.com>
@@ -29,6 +33,9 @@ validpgpkeys+=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.
 prepare() {
   cd $pkgname-$pkgver
 
+  # upstream fix
+  patch -p1 -i ../0001-configure-default-enable-valgrind-to-auto.patch
+
   # pthread is useless in Linux
   sed -i "/pthread-stubs/d" configure.ac
   autoreconf --force --install