Module Name: src
Committed By: mrg
Date: Mon Nov 22 21:05:30 UTC 2010
Modified Files:
src/distrib/sets/lists/xcomp: mi
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libGLU: Makefile
src/external/mit/xorg/lib/libglut: Makefile
Added Files:
src/external/mit/xorg/lib/libGL: mesa-ver.mk
Log Message:
install dri.pc.
put the Mesa version into it's own makefile, and share it. there
are now 4 references to it.
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.17 -r1.18 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.15 -r1.16 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/libGLU/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/mit/xorg/lib/libglut/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.116 src/distrib/sets/lists/xcomp/mi:1.117
--- src/distrib/sets/lists/xcomp/mi:1.116 Sun Nov 21 20:45:02 2010
+++ src/distrib/sets/lists/xcomp/mi Mon Nov 22 21:05:27 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.116 2010/11/21 20:45:02 mrg Exp $
+# $NetBSD: mi,v 1.117 2010/11/22 21:05:27 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6389,6 +6389,7 @@
./usr/X11R7/lib/pkgconfig/bigreqsproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/compositeproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/damageproto.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/dri.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/dri2proto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/evieproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/fixesproto.pc -unknown- xorg
Index: src/external/mit/xorg/lib/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.17 src/external/mit/xorg/lib/dri/Makefile:1.18
--- src/external/mit/xorg/lib/dri/Makefile:1.17 Thu Nov 18 08:41:54 2010
+++ src/external/mit/xorg/lib/dri/Makefile Mon Nov 22 21:05:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/11/18 08:41:54 mrg Exp $
+# $NetBSD: Makefile,v 1.18 2010/11/22 21:05:30 mrg Exp $
SUBDIR= libmesa .WAIT
@@ -17,4 +17,10 @@
SUBDIR+= swrast
+PKGCONFIG= dri
+PKGDIST.dri= ${X11SRCDIR.MesaLib}/src/mesa/drivers/dri
+.include "${.CURDIR}/../libGL/mesa-ver.mk"
+PKGCONFIG_VERSION.dri= ${MESA_VER}
+
.include <bsd.subdir.mk>
+.include <bsd.x11.mk>
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.15 src/external/mit/xorg/lib/libGL/Makefile:1.16
--- src/external/mit/xorg/lib/libGL/Makefile:1.15 Mon Jul 19 05:34:26 2010
+++ src/external/mit/xorg/lib/libGL/Makefile Mon Nov 22 21:05:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2010/07/19 05:34:26 mrg Exp $
+# $NetBSD: Makefile,v 1.16 2010/11/22 21:05:29 mrg Exp $
.include <bsd.own.mk>
@@ -106,7 +106,8 @@
PKGCONFIG= gl
PKGDIST.gl= ${X11SRCDIR.MesaLib}/src/mesa
-PKGCONFIG_VERSION.gl= 7.8.2
+.include "${.CURDIR}/../libGL/mesa-ver.mk"
+PKGCONFIG_VERSION.gl= ${MESA_VER}
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libGLU/Makefile
diff -u src/external/mit/xorg/lib/libGLU/Makefile:1.7 src/external/mit/xorg/lib/libGLU/Makefile:1.8
--- src/external/mit/xorg/lib/libGLU/Makefile:1.7 Mon Jul 19 05:34:26 2010
+++ src/external/mit/xorg/lib/libGLU/Makefile Mon Nov 22 21:05:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/07/19 05:34:26 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2010/11/22 21:05:29 mrg Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@@ -84,7 +84,8 @@
PKGCONFIG= glu
PKGDIST.glu= ${X11SRCDIR.MesaLib}/src/glu
-PKGCONFIG_VERSION.glu= 7.8.2
+.include "${.CURDIR}/../libGL/mesa-ver.mk"
+PKGCONFIG_VERSION.glu= ${MESA_VER}
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libglut/Makefile
diff -u src/external/mit/xorg/lib/libglut/Makefile:1.6 src/external/mit/xorg/lib/libglut/Makefile:1.7
--- src/external/mit/xorg/lib/libglut/Makefile:1.6 Mon Jul 19 05:34:27 2010
+++ src/external/mit/xorg/lib/libglut/Makefile Mon Nov 22 21:05:29 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/07/19 05:34:27 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2010/11/22 21:05:29 mrg Exp $
.include <bsd.own.mk>
@@ -74,7 +74,8 @@
PKGCONFIG= glut
PKGDIST.glut= ${X11SRCDIR.MesaGLUT}/src/glut/glx
-PKGCONFIG_VERSION.glut= 7.8.2
+.include "${.CURDIR}/../libGL/mesa-ver.mk"
+PKGCONFIG_VERSION.glut= ${MESA_VER}
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Added files:
Index: src/external/mit/xorg/lib/libGL/mesa-ver.mk
diff -u /dev/null src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.1
--- /dev/null Mon Nov 22 21:05:30 2010
+++ src/external/mit/xorg/lib/libGL/mesa-ver.mk Mon Nov 22 21:05:29 2010
@@ -0,0 +1,3 @@
+# $NetBSD: mesa-ver.mk,v 1.1 2010/11/22 21:05:29 mrg Exp $
+
+MESA_VER= 7.8.2
