Module Name: src
Committed By: snj
Date: Thu Apr 8 23:13:32 UTC 2010
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 following revision(s) (requested by yhardy in ticket #1364):
external/mit/xorg/lib/dri/i965/Makefile: revision 1.9
external/mit/xorg/lib/dri/i915/Makefile: revision 1.7
Don't link libOSMesa, this functionality is provided by mesa_dri.so.
To generate a diff of this commit:
cvs rdiff -u -r1.2.6.3 -r1.2.6.4 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.3.6.4 -r1.3.6.5 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.3 src/external/mit/xorg/lib/dri/i915/Makefile:1.2.6.4
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.2.6.3 Sat Jan 16 17:36:44 2010
+++ src/external/mit/xorg/lib/dri/i915/Makefile Thu Apr 8 23:13:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.6.3 2010/01/16 17:36:44 bouyer Exp $
+# $NetBSD: Makefile,v 1.2.6.4 2010/04/08 23:13:32 snj Exp $
MODULE= i915
@@ -59,6 +59,5 @@
CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
-LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.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.4 src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.5
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.4 Sat Jan 16 17:36:44 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Thu Apr 8 23:13:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.6.4 2010/01/16 17:36:44 bouyer Exp $
+# $NetBSD: Makefile,v 1.3.6.5 2010/04/08 23:13:32 snj Exp $
MODULE= i965
@@ -90,6 +90,5 @@
COPTS.brw_draw_upload.c= -Wno-error
LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
-LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include "${.CURDIR}/../dri.mk"
