Mon Aug 13 07:02:02 2012 UTC ()
regen patch


(wiz)
diff -r1.21 -r1.22 pkgsrc/x11/libdrm/distinfo
diff -r1.2 -r1.3 pkgsrc/x11/libdrm/patches/patch-intel_intel__bufmgr__gem.c

cvs diff -r1.21 -r1.22 pkgsrc/x11/libdrm/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/libdrm/distinfo 2012/08/12 16:16:39 1.21
+++ pkgsrc/x11/libdrm/distinfo 2012/08/13 07:02:00 1.22
@@ -1,10 +1,10 @@ @@ -1,10 +1,10 @@
1$NetBSD: distinfo,v 1.21 2012/08/12 16:16:39 wiz Exp $ 1$NetBSD: distinfo,v 1.22 2012/08/13 07:02:00 wiz Exp $
2 2
3SHA1 (libdrm-2.4.38.tar.bz2) = e90e28a0db2c32238e445f48af9683600c5f191f 3SHA1 (libdrm-2.4.38.tar.bz2) = e90e28a0db2c32238e445f48af9683600c5f191f
4RMD160 (libdrm-2.4.38.tar.bz2) = 59667c2d37c2e57155b2c0095881171b7098d82b 4RMD160 (libdrm-2.4.38.tar.bz2) = 59667c2d37c2e57155b2c0095881171b7098d82b
5Size (libdrm-2.4.38.tar.bz2) = 484514 bytes 5Size (libdrm-2.4.38.tar.bz2) = 484514 bytes
6SHA1 (patch-ab) = 66dadd3244bfa9c69be0982fd2108deb94483de2 6SHA1 (patch-ab) = 66dadd3244bfa9c69be0982fd2108deb94483de2
7SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea 7SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
8SHA1 (patch-ad) = ea3ef8de8db782ddab23f182f1e6bd9d8f612a78 8SHA1 (patch-ad) = ea3ef8de8db782ddab23f182f1e6bd9d8f612a78
9SHA1 (patch-intel_intel__bufmgr__gem.c) = bf0ff270b2838ff8d160ef5f5995342cbe221db7 9SHA1 (patch-intel_intel__bufmgr__gem.c) = 418d00f24344b7abaa86d3b3d10817314ce70175
10SHA1 (patch-libkms_linux.c) = 737d0a8e7b742ee9d24fec94c72de6b4915dd675 10SHA1 (patch-libkms_linux.c) = 737d0a8e7b742ee9d24fec94c72de6b4915dd675

cvs diff -r1.2 -r1.3 pkgsrc/x11/libdrm/patches/Attic/patch-intel_intel__bufmgr__gem.c (expand / switch to unified diff)

--- pkgsrc/x11/libdrm/patches/Attic/patch-intel_intel__bufmgr__gem.c 2012/07/28 18:01:26 1.2
+++ pkgsrc/x11/libdrm/patches/Attic/patch-intel_intel__bufmgr__gem.c 2012/08/13 07:02:01 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: patch-intel_intel__bufmgr__gem.c,v 1.2 2012/07/28 18:01:26 dholland Exp $ 1$NetBSD: patch-intel_intel__bufmgr__gem.c,v 1.3 2012/08/13 07:02:01 wiz Exp $
2 2
3ETIME is not defined on DragonFly BSD, work around it. 3ETIME is not defined on DragonFly BSD, work around it.
4From PR 46649; upstream report at 4From PR 46649; upstream report at
5 https://bugs.freedesktop.org/show_bug.cgi?id=52549 5 https://bugs.freedesktop.org/show_bug.cgi?id=52549
6 6
7--- intel/intel_bufmgr_gem.c.orig 2012-07-02 15:22:14.326942000 +0000 7--- intel/intel_bufmgr_gem.c.orig 2012-08-11 18:49:45.000000000 +0000
8+++ intel/intel_bufmgr_gem.c 8+++ intel/intel_bufmgr_gem.c
9@@ -54,6 +54,9 @@ 9@@ -54,6 +54,9 @@
10 #include <stdbool.h> 10 #include <stdbool.h>
11 11
12 #include "errno.h" 12 #include "errno.h"
13+#ifndef ETIME 13+#ifndef ETIME
14+#define ETIME ETIMEDOUT 14+#define ETIME ETIMEDOUT
15+#endif 15+#endif
16 #include "libdrm_lists.h" 16 #include "libdrm_lists.h"
17 #include "intel_bufmgr.h" 17 #include "intel_bufmgr.h"
18 #include "intel_bufmgr_priv.h" 18 #include "intel_bufmgr_priv.h"