Module Name: src
Committed By: sborrill
Date: Fri Nov 13 20:49:08 UTC 2009
Modified Files:
src/external/mit/xorg/lib/dri/i915 [netbsd-5]: Makefile
src/external/mit/xorg/lib/dri/i965 [netbsd-5]: Makefile
Log Message:
Pull up the following revisions(s) (requested by mrg in ticket #1132):
external/mit/xorg/lib/dri/i915/Makefile: revision 1.4
external/mit/xorg/lib/dri/i965/Makefile: revision 1.5
Link in -ldrm_intel on i915 and i965 drivers.
Build i915 driver with -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP.
To generate a diff of this commit:
cvs rdiff -u -r1.2.6.1 -r1.2.6.2 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/external/mit/xorg/lib/dri/i965/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/dri/i915/Makefile
diff -u src/external/mit/xorg/lib/dri/i915/Makefile:1.2.6.1 src/external/mit/xorg/lib/dri/i915/Makefile:1.2.6.2
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.2.6.1 Thu Sep 17 04:24:30 2009
+++ src/external/mit/xorg/lib/dri/i915/Makefile Fri Nov 13 20:49:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.6.1 2009/09/17 04:24:30 snj Exp $
+# $NetBSD: Makefile,v 1.2.6.2 2009/11/13 20:49:08 sborrill Exp $
MODULE= i915
@@ -56,4 +56,8 @@
intel_fbo.c \
intel_depthstencil.c
+CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
+
+LIBS+= -ldrm_intel
+
.include "${.CURDIR}/../dri.mk"
Index: src/external/mit/xorg/lib/dri/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.1 src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.2
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.1 Thu Sep 17 04:24:30 2009
+++ src/external/mit/xorg/lib/dri/i965/Makefile Fri Nov 13 20:49:08 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.6.1 2009/09/17 04:24:30 snj Exp $
+# $NetBSD: Makefile,v 1.3.6.2 2009/11/13 20:49:08 sborrill Exp $
MODULE= i965
@@ -90,4 +90,6 @@
COPTS.brw_draw_upload.c= -Wno-error
+LIBS+= -ldrm_intel
+
.include "${.CURDIR}/../dri.mk"
