diff options
| -rw-r--r-- | x11/libdrm/Makefile | 4 | ||||
| -rw-r--r-- | x11/libdrm/distinfo | 9 | ||||
| -rw-r--r-- | x11/libdrm/patches/patch-ad | 33 |
3 files changed, 6 insertions, 40 deletions
diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile index e3b7af4a856..df46a994ae1 100644 --- a/x11/libdrm/Makefile +++ b/x11/libdrm/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.53 2015/03/09 19:47:54 tnn Exp $ +# $NetBSD: Makefile,v 1.54 2015/04/02 22:21:43 tnn Exp $ -DISTNAME= libdrm-2.4.59 +DISTNAME= libdrm-2.4.60 CATEGORIES= x11 graphics MASTER_SITES= http://dri.freedesktop.org/libdrm/ EXTRACT_SUFX= .tar.bz2 diff --git a/x11/libdrm/distinfo b/x11/libdrm/distinfo index 6517b293738..f333c7d141b 100644 --- a/x11/libdrm/distinfo +++ b/x11/libdrm/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.49 2015/01/22 08:28:48 wiz Exp $ +$NetBSD: distinfo,v 1.50 2015/04/02 22:21:43 tnn Exp $ -SHA1 (libdrm-2.4.59.tar.bz2) = 7a0f7a3076d3d52c787f306ef0c1af837b27f089 -RMD160 (libdrm-2.4.59.tar.bz2) = 687be2ccdcf740d3edb8c185de05d013d0f289ea -Size (libdrm-2.4.59.tar.bz2) = 592722 bytes +SHA1 (libdrm-2.4.60.tar.bz2) = 4e041a5ff22b2b9132b216eb0574638bf252b7a9 +RMD160 (libdrm-2.4.60.tar.bz2) = 01b3dde0786dea020850a35058ee2be507829293 +Size (libdrm-2.4.60.tar.bz2) = 581786 bytes SHA1 (patch-ab) = e28070e56924a68ecc3c4e27d479a5e8edc70913 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea -SHA1 (patch-ad) = b9c8d708830c8b182c8e491fe5a9e5d0f2d44a5f SHA1 (patch-include_drm_drm.h) = 1cb10685b54a1c0ad71aef92edecbb0318fe4c99 SHA1 (patch-intel_intel__bufmgr__gem.c) = bab22f43ba85c48fd063b6ac667369d1223f908f SHA1 (patch-libkms_linux.c) = 737d0a8e7b742ee9d24fec94c72de6b4915dd675 diff --git a/x11/libdrm/patches/patch-ad b/x11/libdrm/patches/patch-ad deleted file mode 100644 index 963028cf9a7..00000000000 --- a/x11/libdrm/patches/patch-ad +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ad,v 1.2 2014/07/20 08:29:27 wiz Exp $ - -Fix Solaris atomic_dec_and_test. -Add NetBSD atomic ops support. - ---- xf86atomic.h.orig 2010-05-18 17:00:43.000000000 +0000 -+++ xf86atomic.h -@@ -85,7 +85,24 @@ typedef struct { uint_t atomic; } atomic - # define atomic_read(x) (int) ((x)->atomic) - # define atomic_set(x, val) ((x)->atomic = (uint_t)(val)) - # define atomic_inc(x) (atomic_inc_uint (&(x)->atomic)) --# define atomic_dec_and_test(x) (atomic_dec_uint_nv(&(x)->atomic) == 1) -+# define atomic_dec_and_test(x) (atomic_dec_uint_nv(&(x)->atomic) == 0) -+# define atomic_add(x, v) (atomic_add_int(&(x)->atomic, (v))) -+# define atomic_dec(x, v) (atomic_add_int(&(x)->atomic, -(v))) -+# define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint (&(x)->atomic, oldv, newv) -+ -+#endif -+ -+#if defined(__NetBSD__) && !defined(HAS_ATOMIC_OPS) /* NetBSD */ -+ -+#include <sys/atomic.h> -+#define HAS_ATOMIC_OPS 1 -+ -+typedef struct { int atomic; } atomic_t; -+ -+# define atomic_read(x) (int) ((x)->atomic) -+# define atomic_set(x, val) ((x)->atomic = (val)) -+# define atomic_inc(x) (atomic_inc_uint (&(x)->atomic)) -+# define atomic_dec_and_test(x) (atomic_dec_uint_nv(&(x)->atomic) == 0) - # define atomic_add(x, v) (atomic_add_int(&(x)->atomic, (v))) - # define atomic_dec(x, v) (atomic_add_int(&(x)->atomic, -(v))) - # define atomic_cmpxchg(x, oldv, newv) atomic_cas_uint (&(x)->atomic, oldv, newv) |