Module Name: src
Committed By: mrg
Date: Tue Jun 9 05:02:13 UTC 2009
Modified Files:
src/external/mit/xorg/lib: Makefile
src/external/mit/xorg/lib/libdrm: Makefile
src/external/mit/xorg/lib/libdrm_intel: Makefile
Log Message:
updates for libdrm 2.4.11. install libdrm_intel on x86.
XXX: need to install libdrm_intel.pc yet.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/mit/xorg/lib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libdrm_intel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/Makefile
diff -u src/external/mit/xorg/lib/Makefile:1.13 src/external/mit/xorg/lib/Makefile:1.14
--- src/external/mit/xorg/lib/Makefile:1.13 Tue Jun 9 03:05:36 2009
+++ src/external/mit/xorg/lib/Makefile Tue Jun 9 05:02:13 2009
@@ -1,9 +1,13 @@
-# $NetBSD: Makefile,v 1.13 2009/06/09 03:05:36 mrg Exp $
+# $NetBSD: Makefile,v 1.14 2009/06/09 05:02:13 mrg Exp $
# build libraries for xorg
SUBDIR= expat libfontenc freetype libFS libICE libOSMesa \
- libXau libXdmcp libdrm libdrm_intel pixman xkbdata \
+ libXau libXdmcp libdrm
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+SUBDIR+=libdrm_intel
+.endif
+SUBDIR+=pixman xkbdata \
.WAIT \
dri fontconfig libSM libX11 \
.WAIT \
Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.3 src/external/mit/xorg/lib/libdrm/Makefile:1.4
--- src/external/mit/xorg/lib/libdrm/Makefile:1.3 Tue Jun 9 03:05:37 2009
+++ src/external/mit/xorg/lib/libdrm/Makefile Tue Jun 9 05:02:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/09 03:05:37 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/09 05:02:13 mrg Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
SRCS= xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
-INCS= xf86drm.h intel_bufmgr.h xf86drmMode.h
+INCS= xf86drm.h xf86drmMode.h
INCSDIR=${X11INCDIR}/X11
.PATH: ${X11SRCDIR.${LIB}}/libdrm/intel
Index: src/external/mit/xorg/lib/libdrm_intel/Makefile
diff -u src/external/mit/xorg/lib/libdrm_intel/Makefile:1.1 src/external/mit/xorg/lib/libdrm_intel/Makefile:1.2
--- src/external/mit/xorg/lib/libdrm_intel/Makefile:1.1 Tue Jun 9 03:05:37 2009
+++ src/external/mit/xorg/lib/libdrm_intel/Makefile Tue Jun 9 05:02:13 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/09 03:05:37 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/09 05:02:13 mrg Exp $
.include <bsd.own.mk>
@@ -7,11 +7,15 @@
SRCS= intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c mm.c
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}/libdrm
+
INCS= intel_bufmgr.h
INCSDIR=${X11INCDIR}
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}/libdrm
+# XXX not yet
+#PKGCONFIG= libdrm_intel
+#PKGDIST= libdrm
.include <bsd.x11.mk>
.include <bsd.lib.mk>
