Module Name: src
Committed By: mrg
Date: Sun May 23 01:30:26 UTC 2010
Modified Files:
src/distrib/sets/lists/xcomp: md.amd64 md.i386 mi
src/external/mit/xorg/lib/libdrm_intel: Makefile
src/external/mit/xorg/lib/libdrm_radeon: Makefile
Log Message:
install libdrm_intel.pc and libdrm_radeon.pc
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xcomp/md.amd64
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xcomp/md.i386
cvs rdiff -u -r1.107 -r1.108 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libdrm_intel/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/mit/xorg/lib/libdrm_radeon/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/md.amd64
diff -u src/distrib/sets/lists/xcomp/md.amd64:1.23 src/distrib/sets/lists/xcomp/md.amd64:1.24
--- src/distrib/sets/lists/xcomp/md.amd64:1.23 Sat May 22 23:19:45 2010
+++ src/distrib/sets/lists/xcomp/md.amd64 Sun May 23 01:30:25 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.23 2010/05/22 23:19:45 mrg Exp $
+# $NetBSD: md.amd64,v 1.24 2010/05/23 01:30:25 mrg Exp $
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11
@@ -75,6 +75,7 @@
./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg
./usr/X11R7/lib/libdrm_intel_pic.a -unknown- xorg
+./usr/X11R7/lib/pkgconfig/libdrm_intel.pc -unknown- xorg
./usr/libdata/debug/usr/X11R6/bin/XFree86.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/gtf.debug -unknown- debug,x11
Index: src/distrib/sets/lists/xcomp/md.i386
diff -u src/distrib/sets/lists/xcomp/md.i386:1.29 src/distrib/sets/lists/xcomp/md.i386:1.30
--- src/distrib/sets/lists/xcomp/md.i386:1.29 Sat May 22 23:19:45 2010
+++ src/distrib/sets/lists/xcomp/md.i386 Sun May 23 01:30:25 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.29 2010/05/22 23:19:45 mrg Exp $
+# $NetBSD: md.i386,v 1.30 2010/05/23 01:30:25 mrg Exp $
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11
@@ -75,6 +75,7 @@
./usr/X11R7/lib/libdrm_intel_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libdrm_intel_p.a -unknown- profile,xorg
./usr/X11R7/lib/libdrm_intel_pic.a -unknown- xorg
+./usr/X11R7/lib/pkgconfig/libdrm_intel.pc -unknown- xorg
./usr/libdata/debug/usr/X11R6/bin/XFree86.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/Xvfb.debug -unknown- debug,x11
./usr/libdata/debug/usr/X11R6/bin/gtf.debug -unknown- debug,x11
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.107 src/distrib/sets/lists/xcomp/mi:1.108
--- src/distrib/sets/lists/xcomp/mi:1.107 Sat May 22 23:21:36 2010
+++ src/distrib/sets/lists/xcomp/mi Sun May 23 01:30:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.107 2010/05/22 23:21:36 mrg Exp $
+# $NetBSD: mi,v 1.108 2010/05/23 01:30:26 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6279,6 +6279,7 @@
./usr/X11R7/lib/pkgconfig/kbproto.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/lbxutil.pc -obsolete- obsolete
./usr/X11R7/lib/pkgconfig/libdrm.pc -unknown- xorg
+./usr/X11R7/lib/pkgconfig/libdrm_radeon.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/libfs.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/pciaccess.pc -unknown- xorg
./usr/X11R7/lib/pkgconfig/pixman-1.pc -unknown- xorg
Index: src/external/mit/xorg/lib/libdrm_intel/Makefile
diff -u src/external/mit/xorg/lib/libdrm_intel/Makefile:1.4 src/external/mit/xorg/lib/libdrm_intel/Makefile:1.5
--- src/external/mit/xorg/lib/libdrm_intel/Makefile:1.4 Sat May 22 22:43:57 2010
+++ src/external/mit/xorg/lib/libdrm_intel/Makefile Sun May 23 01:30:26 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/05/22 22:43:57 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/23 01:30:26 mrg Exp $
.include <bsd.own.mk>
@@ -10,8 +10,8 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
-# XXX not yet
-#PKGCONFIG= libdrm_intel
+PKGCONFIG= libdrm_intel
+PKGDIST= drm
.include <bsd.x11.mk>
.include <bsd.lib.mk>
Index: src/external/mit/xorg/lib/libdrm_radeon/Makefile
diff -u src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.1 src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.2
--- src/external/mit/xorg/lib/libdrm_radeon/Makefile:1.1 Sat May 22 22:48:19 2010
+++ src/external/mit/xorg/lib/libdrm_radeon/Makefile Sun May 23 01:30:26 2010
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2010/05/22 22:48:19 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2010/05/23 01:30:26 mrg Exp $
.include <bsd.own.mk>
LIB= drm_radeon
+.PATH: ${X11SRCDIR.drm}
.PATH: ${X11SRCDIR.drm}/radeon
SRCS= radeon_bo.c \
@@ -14,10 +15,10 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/libdrm
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
-# XXX not yet
-#PKGCONFIG= libdrm_radeon
-
COPTS.radeon_cs_gem.c+= -Wno-error # XXX
+PKGCONFIG= libdrm_radeon
+PKGDIST= drm
+
.include <bsd.x11.mk>
.include <bsd.lib.mk>
