Module Name: src
Committed By: bouyer
Date: Sat Jan 16 17:36:44 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 mrg in ticket #1239):
external/mit/xorg/lib/dri/i965/Makefile: revisions 1.7, 1.8
external/mit/xorg/lib/dri/i915/Makefile: revisions 1.5, 1.6
replace LIBS with LIBDPLIBS. makes these actually link against drm_intel.
should fix a problem reported by s...@.
link in libOSMesa as well.
To generate a diff of this commit:
cvs rdiff -u -r1.2.6.2 -r1.2.6.3 src/external/mit/xorg/lib/dri/i915/Makefile
cvs rdiff -u -r1.3.6.3 -r1.3.6.4 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.2 src/external/mit/xorg/lib/dri/i915/Makefile:1.2.6.3
--- src/external/mit/xorg/lib/dri/i915/Makefile:1.2.6.2 Fri Nov 13 20:49:08 2009
+++ src/external/mit/xorg/lib/dri/i915/Makefile Sat Jan 16 17:36:44 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2.6.2 2009/11/13 20:49:08 sborrill Exp $
+# $NetBSD: Makefile,v 1.2.6.3 2010/01/16 17:36:44 bouyer Exp $
MODULE= i915
@@ -58,6 +58,7 @@
CPPFLAGS+= -DI915 -DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP
-LIBS+= -ldrm_intel
+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.3 src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.4
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.3 Mon Jan 11 00:49:47 2010
+++ src/external/mit/xorg/lib/dri/i965/Makefile Sat Jan 16 17:36:44 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.6.3 2010/01/11 00:49:47 snj Exp $
+# $NetBSD: Makefile,v 1.3.6.4 2010/01/16 17:36:44 bouyer Exp $
MODULE= i965
@@ -89,6 +89,7 @@
COPTS.brw_draw_upload.c= -Wno-error
-LIBS+= -ldrm_intel
+LIBDPLIBS+= drm_intel ${.CURDIR}/../../libdrm_intel
+LIBDPLIBS+= OSMesa ${.CURDIR}/../../libOSMesa
.include "${.CURDIR}/../dri.mk"
