CVS commit: [netbsd-5] src/external/mit/xorg/lib/dri/libmesa
Module Name:src
Committed By: snj
Date: Thu Apr 8 23:14:27 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/libmesa [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by yhardy in ticket #1364):
external/mit/xorg/lib/dri/libmesa/Makefile: revision 1.5
i915 and i965 dri modules need glapi.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 \
src/external/mit/xorg/lib/dri/libmesa/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/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.1.2.5 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.1.2.6
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.1.2.5 Sat Oct 10 19:53:22 2009
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Thu Apr 8 23:14:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.2.5 2009/10/10 19:53:22 sborrill Exp $
+# $NetBSD: Makefile,v 1.1.2.6 2010/04/08 23:14:27 snj Exp $
.include
@@ -7,7 +7,7 @@
SHLIB_MAJOR= 0
-MESA_SRC_MODULES= main math vbo tnl shader swrast slang ss
+MESA_SRC_MODULES= glapi main math vbo tnl shader swrast slang ss
CPPFLAGS+= -I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
CVS commit: [netbsd-5] src/external/mit/xorg/lib/dri
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"
CVS commit: [netbsd-5] src/external/mit/xorg/lib/dri
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"
CVS commit: [netbsd-5] src/external/mit/xorg/lib/dri/i965
Module Name:src
Committed By: snj
Date: Mon Jan 11 00:49:48 UTC 2010
Modified Files:
src/external/mit/xorg/lib/dri/i965 [netbsd-5]: Makefile
Log Message:
Pull up following revision(s) (requested by mrg in ticket #1236):
external/mit/xorg/lib/dri/i965/Makefile: revision 1.6
fix a problem reported by jmorse:
- fix a line continuation that stopped SRCS= from working
- don't include intel_dri.c here
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.2 -r1.3.6.3 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/i965/Makefile
diff -u src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.2 src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.3
--- src/external/mit/xorg/lib/dri/i965/Makefile:1.3.6.2 Fri Nov 13 20:49:08 2009
+++ src/external/mit/xorg/lib/dri/i965/Makefile Mon Jan 11 00:49:47 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.6.2 2009/11/13 20:49:08 sborrill Exp $
+# $NetBSD: Makefile,v 1.3.6.3 2010/01/11 00:49:47 snj Exp $
MODULE= i965
@@ -7,7 +7,7 @@
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server
DRI_EXTRA_PATHS= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel \
- ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server \
+ ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/intel/server
SRCS= \
intel_batchbuffer.c \
intel_blit.c \
@@ -85,8 +85,7 @@
brw_wm_pass2.c \
brw_wm_sampler_state.c \
brw_wm_state.c \
- brw_wm_surface_state.c \
- intel_dri.c
+ brw_wm_surface_state.c
COPTS.brw_draw_upload.c= -Wno-error
CVS commit: [netbsd-5] src/external/mit/xorg/lib/dri
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"
