various updates for libdrm 2.4.52.

external/mit/xorg/lib/libdrm/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2011/08/11 23:15:39 joerg Exp $
+#	$NetBSD: Makefile,v 1.9 2014/03/17 08:01:18 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -19,6 +19,20 @@ PKGDIST=	${LIB}
 
 CWARNFLAGS.clang+=	-Wno-conversion -Wno-tautological-compare
 
+.if 0
+MAN=		drm.7 \
+		drm-kms.7 \
+		drm-memory.7 \
+		drmAvailable.3 \
+		drmHandleEvent.3 \
+		drmModeGetResources.3
+# XXX is this right?
+MLINKS+=	drm-mm.7 drm-gem.7 \
+		drm-mm.7 drm-ttm.7
+.endif
+
+.include "Makefile.defines"
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
 .include <bsd.subdir.mk>

external/mit/xorg/lib/libdrm/Makefile.defines

@@ -0,0 +1,16 @@
+#	$NetBSD: Makefile.defines,v 1.1 2014/03/17 08:01:18 mrg Exp $
+
+# common defiles for libdrm components
+
+CPPFLAGS+=	-DHAVE_INTTYPES_H \
+		-DHAVE_RADEON \
+		-DHAVE_SETENV \
+		-DHAVE_STDINT_H \
+		-DHAVE_STRINGS_H \
+		-DHAVE_STRING_H  \
+		-DHAVE_SYS_STAT_H \
+		-DHAVE_SYS_TYPES_H \
+		-DHAVE_UNISTD_H
+
+#		-DHAVE_NOUVEAU
+

external/mit/xorg/lib/libdrm/drm/Makefile

@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2010/05/22 23:19:24 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2014/03/17 08:01:18 mrg Exp $
 
 # install include/libdrm files
 
@@ -9,14 +9,18 @@
 .PATH:	${X11SRCDIR.drm}/radeon
 
 INCS=	drm.h \
+	drm_fourcc.h \
 	drm_mode.h \
 	drm_sarea.h \
 	i915_drm.h \
+	intel_aub.h \
 	intel_bufmgr.h \
+	intel_debug.h \
 	mach64_drm.h \
 	mga_drm.h \
 	nouveau_drm.h \
 	r128_drm.h \
+	r600_pci_ids.h \
 	radeon_bo.h \
 	radeon_bo_gem.h \
 	radeon_bo_int.h \
@@ -24,9 +28,11 @@ INCS=	drm.h \
 	radeon_cs_gem.h \
 	radeon_cs_int.h \
 	radeon_drm.h \
+	radeon_surface.h \
 	savage_drm.h \
 	sis_drm.h \
-	via_drm.h
+	via_drm.h \
+	qxl_drm.h
 
 INCSDIR=${X11INCDIR}/libdrm
 

external/mit/xorg/lib/libdrm_intel/Makefile

@@ -1,11 +1,14 @@
-#      $NetBSD: Makefile,v 1.7 2011/08/11 23:15:39 joerg Exp $
+#      $NetBSD: Makefile,v 1.8 2014/03/17 08:01:18 mrg Exp $
 
 .include <bsd.own.mk>
 
 LIB=	drm_intel
 .PATH: ${X11SRCDIR.drm}/intel
 
-SRCS=	intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c mm.c
+SRCS=	intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c \
+	intel_decode.c mm.c
+
+CFLAGS+=	-std=c99
 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
@@ -17,5 +20,7 @@ PKGDIST=	drm
 
 CWARNFLAGS.clang+=	-Wno-pointer-sign
 
+.include "../libdrm/Makefile.defines"
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>

external/mit/xorg/lib/libdrm_radeon/Makefile

@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2010/08/14 10:29:43 mrg Exp $
+#      $NetBSD: Makefile,v 1.5 2014/03/17 08:01:18 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -11,6 +11,7 @@ SRCS=	radeon_bo.c \
 	radeon_cs.c \
 	radeon_cs_gem.c \
 	radeon_cs_space.c \
+	radeon_surface.c \
 	bof.c
 
 CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
@@ -23,5 +24,7 @@ LIBDPLIBS=	drm	${.CURDIR}/../libdrm
 PKGCONFIG=	libdrm_radeon
 PKGDIST=	drm
 
+.include "../libdrm/Makefile.defines"
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>