Update to latest version of mpi@ patch to update to libdrm 2.4.31

8 files changed, 15 insertions, 63 deletions

diff --git a/lib/libdrm/Makefile b/lib/libdrm/Makefile
index 823c0c292..fd49bcb86 100644
--- a/lib/libdrm/Makefile
+++ b/lib/libdrm/Makefile
@@ -12,9 +12,6 @@ LIB=		drm
 
 INCSDIR=	${X11BASE}/include/
 
-CPP=		cpp -notraditional
-DEBUG?=
-
 CPPFLAGS+=	-I${.CURDIR} \
 		-I${X11BASE}/include \
 		-I/usr/include/dev/pci/drm \
@@ -29,21 +26,7 @@ SRCS=		xf86drm.c	\
 		xf86drmRandom.c	\
 		xf86drmSL.c	
 
-includes: _SUBDIRUSE
-	cd ${.CURDIR}; for i in ${INCS}; do \
-	    j="cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
-		${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/"; \
-		echo "\tinstalling $$i"; \
-		eval "$$j"; \
-	done
-
-NOPROFILE =
-
 PKGCONFIG=	libdrm.pc
 
-obj: _xenocara_obj
-
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>
-
-.include <bsd.subdir.mk>
diff --git a/lib/libdrm/Makefile.inc b/lib/libdrm/Makefile.inc
index 62d5e984e..7fc7fb59b 100644
--- a/lib/libdrm/Makefile.inc
+++ b/lib/libdrm/Makefile.inc
@@ -1,2 +1,11 @@
+# $OpenBSD$
+
 PACKAGE_VERSION=	2.4.31
 
+includes: _SUBDIRUSE
+	cd ${.CURDIR}; for i in ${INCS}; do \
+	    j="cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
+		${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/"; \
+		echo "\tinstalling $$i"; \
+		eval "$$j"; \
+	done
diff --git a/lib/libdrm/intel/Makefile b/lib/libdrm/intel/Makefile
index 5a15e7b89..414219395 100644
--- a/lib/libdrm/intel/Makefile
+++ b/lib/libdrm/intel/Makefile
@@ -21,17 +21,5 @@ PKGCONFIG=	libdrm_intel.pc
 
 LDADD+=		-L${X11BASE}/lib -lX11 -lpciaccess
 
-includes:
-	cd ${.CURDIR}; for i in ${INCS}; do \
-	    j="cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
-		${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/"; \
-		echo "\tinstalling $$i"; \
-		eval "$$j"; \
-	done
-
-NOPROFILE =
-
-obj: _xenocara_obj
-
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>
diff --git a/lib/libdrm/libkms/Makefile b/lib/libdrm/libkms/Makefile
index 26b27ee1a..a004ae679 100644
--- a/lib/libdrm/libkms/Makefile
+++ b/lib/libdrm/libkms/Makefile
@@ -1,14 +1,10 @@
 # $OpenBSD: Makefile,v 1.7 2012/08/29 12:51:04 mpi Exp $
 .include <bsd.xconf.mk>
-.include "${.CURDIR}/Makefile.inc"
 
 LIB=		kms
 
 INCSDIR=	${X11BASE}/include/
 
-CPP=		cpp -notraditional
-DEBUG?=
-
 CPPFLAGS+=	-I${.CURDIR} \
 		-I${X11BASE}/include \
 		-I/usr/include/dev/pci/drm \
@@ -22,21 +18,7 @@ SRCS=		api.c		\
 		linux.c		\
 		radeon.c
 
-includes: _SUBDIRUSE
-	cd ${.CURDIR}; for i in ${INCS}; do \
-	    j="cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
-		${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/"; \
-		echo "\tinstalling $$i"; \
-		eval "$$j"; \
-	done
-
-NOPROFILE =
-
 PKGCONFIG=	libkms.pc
 
-obj: _xenocara_obj
-
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>
-
-.include <bsd.subdir.mk>
diff --git a/lib/libdrm/libkms/Makefile.inc b/lib/libdrm/libkms/Makefile.inc
deleted file mode 100644
index 62d5e984e..000000000
--- a/lib/libdrm/libkms/Makefile.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-PACKAGE_VERSION=	2.4.31
-
diff --git a/lib/libdrm/libkms/api.c b/lib/libdrm/libkms/api.c
index db5f9cca8..bf56a640c 100644
--- a/lib/libdrm/libkms/api.c
+++ b/lib/libdrm/libkms/api.c
@@ -26,7 +26,9 @@
  **************************************************************************/
 
 
-//#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/lib/libdrm/libkms/linux.c b/lib/libdrm/libkms/linux.c
index 72963adb4..896ab1d48 100644
--- a/lib/libdrm/libkms/linux.c
+++ b/lib/libdrm/libkms/linux.c
@@ -30,7 +30,9 @@
  */
 
 
-//#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib/libdrm/radeon/Makefile b/lib/libdrm/radeon/Makefile
index a8df81dc1..0228f0d0b 100644
--- a/lib/libdrm/radeon/Makefile
+++ b/lib/libdrm/radeon/Makefile
@@ -31,17 +31,5 @@ PKGCONFIG=	libdrm_radeon.pc
 
 LDADD+=		-L${X11BASE}/lib -lX11
 
-includes:
-	cd ${.CURDIR}; for i in ${INCS}; do \
-	    j="cmp -s $$i ${DESTDIR}${INCSDIR}/$$i || \
-		${INSTALL_DATA} $$i ${DESTDIR}${INCSDIR}/"; \
-		echo "\tinstalling $$i"; \
-		eval "$$j"; \
-	done
-
-NOPROFILE =
-
-obj: _xenocara_obj
-
 .include <bsd.lib.mk>
 .include <bsd.xorg.mk>