Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src install libdrm_intel.pc and libdrm_radeon.pc



details:   https://anonhg.NetBSD.org/src/rev/1b18e735c850
branches:  trunk
changeset: 755117:1b18e735c850
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sun May 23 01:30:25 2010 +0000

description:
install libdrm_intel.pc and libdrm_radeon.pc

diffstat:

 distrib/sets/lists/xcomp/md.amd64            |  3 ++-
 distrib/sets/lists/xcomp/md.i386             |  3 ++-
 distrib/sets/lists/xcomp/mi                  |  3 ++-
 external/mit/xorg/lib/libdrm_intel/Makefile  |  6 +++---
 external/mit/xorg/lib/libdrm_radeon/Makefile |  9 +++++----
 5 files changed, 14 insertions(+), 10 deletions(-)

diffs (99 lines):

diff -r 7049a62a6c51 -r 1b18e735c850 distrib/sets/lists/xcomp/md.amd64
--- a/distrib/sets/lists/xcomp/md.amd64 Sun May 23 01:19:34 2010 +0000
+++ b/distrib/sets/lists/xcomp/md.amd64 Sun May 23 01:30:25 2010 +0000
@@ -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
diff -r 7049a62a6c51 -r 1b18e735c850 distrib/sets/lists/xcomp/md.i386
--- a/distrib/sets/lists/xcomp/md.i386  Sun May 23 01:19:34 2010 +0000
+++ b/distrib/sets/lists/xcomp/md.i386  Sun May 23 01:30:25 2010 +0000
@@ -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
diff -r 7049a62a6c51 -r 1b18e735c850 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Sun May 23 01:19:34 2010 +0000
+++ b/distrib/sets/lists/xcomp/mi       Sun May 23 01:30:25 2010 +0000
@@ -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
diff -r 7049a62a6c51 -r 1b18e735c850 external/mit/xorg/lib/libdrm_intel/Makefile
--- a/external/mit/xorg/lib/libdrm_intel/Makefile       Sun May 23 01:19:34 2010 +0000
+++ b/external/mit/xorg/lib/libdrm_intel/Makefile       Sun May 23 01:30:25 2010 +0000
@@ -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>
diff -r 7049a62a6c51 -r 1b18e735c850 external/mit/xorg/lib/libdrm_radeon/Makefile
--- a/external/mit/xorg/lib/libdrm_radeon/Makefile      Sun May 23 01:19:34 2010 +0000
+++ b/external/mit/xorg/lib/libdrm_radeon/Makefile      Sun May 23 01:30:25 2010 +0000
@@ -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
 
-COPTS.radeon_cs_gem.c+=        -Wno-error      # XXX
+PKGCONFIG=     libdrm_radeon
+PKGDIST=       drm
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>



Home | Main Index | Thread Index | Old Index