libdrm-2.4.60 (2015-03-19)

Alan Coopersmith (2):
      Stop undefining _ATOMIC_TYPE in Solaris/NetBSD section of xf86atomic.h
      On Solaris, #include <sys/mkdev.h> in xf86drm.c

Chih-Wei Huang (1):
      android: remove duplicate libdrm in LOCAL_SHARED_LIBRARIES

Damien Lespiau (1):
      build: Bump version number to 2.4.60 before release

Daniel Vetter (7):
      intel: Unconditionally clear ioctl structs
      xf86drmMode: Unconditionally clear ioctl structs
      drm: use drmIoctl everywhere
      xf86drm: Unconditionally clear ioctl structs
      tests: remove intel-specific tests
      xf86drm: Fix ioctl struct clearing in drmGetVersion
      Revert "intel: Fix documentation for drm_intel_gem_bo_wait()"

Emil Velikov (21):
      libdrm: fix the Android 64bit build
      autotools: add AM_DISTCHECK_CONFIGURE_FLAGS
      exynos_fimg2d_test: fix implicit funciton declaration errors
      tests: fix implicit funciton declaration errors
      autotools: add WARN_CFLAGS to all targets
      tests: remove unused variables
      exynos_fimg2d_test: remove unused variables
      tests/radeon: set the list* functions as inline
      automake: wrap an insanely long line
      configure: omap, freedreno and tegra require atomics
      configure: update help strings
      automake: drop the NULL variable from the makefile
      tests: move the SUBDIR at the top of the makefile
      tests: automake: keep the libs link at the final stage
      drm: add drmGet(Primary|Render)DeviceNameFromFd functions
      modetest: include into the build when libkms is not selected.
      configure: Stop using AM_MAINTAINER_MODE
      autogen.sh: handle out-of-tree invokation
      configure.ac: fix host_cpu/atomics detection
      configure.ac: fix help string copy/pasta
      configure.ac: error out if building freedreno_kgsl without freedreno

Frank Binns (3):
      Rename DRM_NODE_RENDER to DRM_NODE_PRIMARY
      Add new drmOpenRender function
      Add new drmGetNodeTypeFromFd function

Hyungwon Hwang (2):
      exynos: Don't use DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls
      exynos: remove DRM_EXYNOS_GEM_{MAP_OFFSET/MMAP} ioctls

Jammy Zhou (2):
      Add new drmOpenWithType function (v4)
      Add new drmOpenOnceWithType function (v2)

Jan Vesely (7):
      random: Use unsigned long for seed
      Fix gcc -Wextra warnings
      tests: String literals are const char *
      Fix type-limits, pointer-arith and sign-compare warnings
      dristat: Handle DRM_CONSISTENT
      Fix unused, and unused-but-set variables warnings
      Add static qualifier to local functions

Jeff McGee (1):
      intel: Export total subslice and EU counts

Jerome Glisse (1):
      nouveau: fix unlock nouveau_bo_name_ref()

Kristian Høgsberg (1):
      intel: Fix documentation for drm_intel_gem_bo_wait()

Maarten Lankhorst (4):
      Add atomic_inc_return to atomics.
      Use __sync_add_and_fetch instead of __sync_fetch_and_add for atomic_dec_and_test
      nouveau: make nouveau importing global buffers completely thread-safe, with tests
      nouveau: Do not add most bo's to the global bo list.

Philipp Zabel (1):
      tests: add support for imx-drm

Thomas Klausner (4):
      Fix libdrm's atomic_dec_and_test on Solaris.
      Add NetBSD atomic ops support.
      intel: Only define variable when it's used.
      nouveau: Remove unused static function.

Tobias Jakobi (18):
      exynos: replace G2D_DOUBLE_TO_FIXED macro with function
      tests/exynos: fix typos and change wording
      tests/exynos: disable the G2D userptr/blend test
      tests/exynos: introduce wait_for_user_input
      exynos: introduce g2d_add_base_addr helper function
      tests/exynos: improve error handling
      exynos: fimg2d: remove TRUE/FALSE from header
      exynos: fimg2d: fix comment for G2D_COEFF_MODE_GB_COLOR
      exynos: fimg2d: unify register style
      exynos: fimg2d: introduce G2D_OP_INTERPOLATE
      exynos: fimg2d: whitespace fix in g2d_flush
      tests/exynos: fimg2d: add a checkerboard test
      exynos: add g2d_scale_and_blend
      exynos: honor the repeat mode in g2d_copy_with_scale
      exynos: use structure initialization instead of memset
      exynos: add exynos prefix to fimg2d header
      exynos: add fimg2d header to common includes
      exynos: fimg2d: follow-up fix for G2D_COEFF_MODE_GB_COLOR

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)