extra/libdrm: remove patch. derp.

This commit is contained in:
Jason Plum 2015-08-14 12:36:07 -04:00
parent 4ed7ee07e0
commit cbbe2efbec
2 changed files with 0 additions and 34 deletions

View file

@ -1,29 +0,0 @@
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

View file

@ -19,10 +19,8 @@ checkdepends=('cairo')
replaces=('libdrm-new' 'libdrm-nouveau') replaces=('libdrm-new' 'libdrm-nouveau')
url="http://dri.freedesktop.org/" url="http://dri.freedesktop.org/"
source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
0001-configure-default-enable-valgrind-to-auto.patch
COPYING) COPYING)
sha256sums=('c7ae43520a9c74ee168a3393c7a6d138342e04d9f821f46c0589547c92a3e79e' sha256sums=('c7ae43520a9c74ee168a3393c7a6d138342e04d9f821f46c0589547c92a3e79e'
'3fc9bb4279486e3a4cb0d86d50b6999f95d0606e83f1f804b3f110d371b74588'
'9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst <maarten.lankhorst@canonical.com> validpgpkeys=('B97BD6A80CAC4981091AE547FE558C72A67013C3') # Maarten Lankhorst <maarten.lankhorst@canonical.com>
validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau <damien.lespiau@intel.com> validpgpkeys+=('215DEE688925CCB965BE5DA97C03D7797B6E1AE2') # Damien Lespiau <damien.lespiau@intel.com>
@ -32,9 +30,6 @@ validpgpkeys+=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.
prepare() { prepare() {
cd $pkgname-$pkgver cd $pkgname-$pkgver
# upstream fix
patch -p1 -i ../0001-configure-default-enable-valgrind-to-auto.patch
# pthread is useless in Linux # pthread is useless in Linux
sed -i "/pthread-stubs/d" configure.ac sed -i "/pthread-stubs/d" configure.ac
autoreconf --force --install autoreconf --force --install