[src/trunk]: src/external/mit/xorg/lib update for libdrm 2.4.20 changed paths...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/781911cf1a3a
branches:  trunk
changeset: 755106:781911cf1a3a
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat May 22 22:43:57 2010 +0000

description:
update for libdrm 2.4.20 changed paths/headers.

diffstat:

 external/mit/xorg/lib/dri/dri.mk            |   4 +-
 external/mit/xorg/lib/libdrm/Makefile       |   7 ++---
 external/mit/xorg/lib/libdrm/drm/Makefile   |  36 +++++++++++++++++++++-------
 external/mit/xorg/lib/libdrm/shlib_version  |   4 +-
 external/mit/xorg/lib/libdrm_intel/Makefile |  12 +++------
 5 files changed, 38 insertions(+), 25 deletions(-)

diffs (130 lines):

diff -r 95f7dd8bc341 -r 781911cf1a3a external/mit/xorg/lib/dri/dri.mk
--- a/external/mit/xorg/lib/dri/dri.mk  Sat May 22 21:12:19 2010 +0000
+++ b/external/mit/xorg/lib/dri/dri.mk  Sat May 22 22:43:57 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.8 2009/10/08 19:06:50 snj Exp $
+# $NetBSD: dri.mk,v 1.9 2010/05/22 22:43:57 mrg Exp $
 
 # XXX DRI_LIB_DEPS
 
@@ -15,7 +15,7 @@
                -I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/${MODULE}/server \
                -I${X11SRCDIR.MesaLib}/src/mesa \
                -I${X11SRCDIR.MesaLib}/include \
-               -I${DESTDIR}${X11INCDIR}/drm \
+               -I${DESTDIR}${X11INCDIR}/libdrm \
                -I${DESTDIR}${X11INCDIR}/X11
 
 CPPFLAGS+=     -D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
diff -r 95f7dd8bc341 -r 781911cf1a3a external/mit/xorg/lib/libdrm/Makefile
--- a/external/mit/xorg/lib/libdrm/Makefile     Sat May 22 21:12:19 2010 +0000
+++ b/external/mit/xorg/lib/libdrm/Makefile     Sat May 22 22:43:57 2010 +0000
@@ -1,17 +1,16 @@
-#      $NetBSD: Makefile,v 1.5 2009/10/08 19:06:50 snj Exp $
+#      $NetBSD: Makefile,v 1.6 2010/05/22 22:43:57 mrg Exp $
 
 .include <bsd.own.mk>
 
 LIB=   drm
-.PATH: ${X11SRCDIR.${LIB}}/libdrm
+.PATH: ${X11SRCDIR.${LIB}}
 
 SRCS=  xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
 
 INCS=  xf86drm.h xf86drmMode.h
 INCSDIR=${X11INCDIR}
-.PATH: ${X11SRCDIR.${LIB}}/libdrm/intel
 
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/drm
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
 
 SUBDIR=        drm
 
diff -r 95f7dd8bc341 -r 781911cf1a3a external/mit/xorg/lib/libdrm/drm/Makefile
--- a/external/mit/xorg/lib/libdrm/drm/Makefile Sat May 22 21:12:19 2010 +0000
+++ b/external/mit/xorg/lib/libdrm/drm/Makefile Sat May 22 22:43:57 2010 +0000
@@ -1,18 +1,36 @@
-#      $NetBSD: Makefile,v 1.3 2009/10/08 19:06:50 snj Exp $
+#      $NetBSD: Makefile,v 1.4 2010/05/22 22:43:57 mrg Exp $
 
 # install include/drm files
 
 .include <bsd.own.mk>
 
-.PATH: ${X11SRCDIR.drm}/shared-core
-.PATH: ${X11SRCDIR.drm}/bsd-core
+.PATH: ${X11SRCDIR.drm}/include/drm
+.PATH: ${X11SRCDIR.drm}/intel
+.PATH: ${X11SRCDIR.drm}/radeon
+.PATH: ${X11SRCDIR.drm}/libkms
 
-INCS=  drm.h drm_sarea.h drm_mode.h \
-       i915_drm.h mach64_drm.h mga_drm.h nouveau_drm.h \
-       r128_drm.h r300_reg.h radeon_drm.h \
-       savage_drm.h sis_drm.h via_3d_reg.h via_drm.h \
-       xgi_drm.h
-INCSDIR=${X11INCDIR}/drm
+INCS=  drm.h \
+       drm_mode.h \
+       drm_sarea.h \
+       i915_drm.h \
+       intel_bufmgr.h \
+       mach64_drm.h \
+       mga_drm.h \
+       nouveau_drm.h \
+       r128_drm.h \
+       radeon_bo.h \
+       radeon_bo_gem.h \
+       radeon_bo_int.h \
+       radeon_cs.h \
+       radeon_cs_gem.h \
+       radeon_cs_int.h \
+       radeon_drm.h \
+       savage_drm.h \
+       sis_drm.h \
+       via_drm.h \
+       libkms.h
+
+INCSDIR=${X11INCDIR}/libdrm
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r 95f7dd8bc341 -r 781911cf1a3a external/mit/xorg/lib/libdrm/shlib_version
--- a/external/mit/xorg/lib/libdrm/shlib_version        Sat May 22 21:12:19 2010 +0000
+++ b/external/mit/xorg/lib/libdrm/shlib_version        Sat May 22 22:43:57 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: shlib_version,v 1.3 2009/06/09 03:05:37 mrg Exp $
+#      $NetBSD: shlib_version,v 1.4 2010/05/22 22:43:57 mrg Exp $
 #
 major=3
-minor=1
+minor=2
diff -r 95f7dd8bc341 -r 781911cf1a3a external/mit/xorg/lib/libdrm_intel/Makefile
--- a/external/mit/xorg/lib/libdrm_intel/Makefile       Sat May 22 21:12:19 2010 +0000
+++ b/external/mit/xorg/lib/libdrm_intel/Makefile       Sat May 22 22:43:57 2010 +0000
@@ -1,21 +1,17 @@
-#      $NetBSD: Makefile,v 1.3 2009/10/08 19:06:50 snj Exp $
+#      $NetBSD: Makefile,v 1.4 2010/05/22 22:43:57 mrg Exp $
 
 .include <bsd.own.mk>
 
 LIB=   drm_intel
-.PATH: ${X11SRCDIR.drm}/libdrm/intel
+.PATH: ${X11SRCDIR.drm}/intel
 
 SRCS=  intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c mm.c
 
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/drm
-CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}/libdrm
-
-INCS=  intel_bufmgr.h
-INCSDIR=${X11INCDIR}
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+=     -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}
 
 # XXX not yet
 #PKGCONFIG=    libdrm_intel
-#PKGDIST=      libdrm
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>