Module Name: src
Committed By: snj
Date: Thu Oct 8 19:06:52 UTC 2009
Modified Files:
src/distrib/sets/lists/xbase: mi
src/distrib/sets/lists/xcomp: mi
src/etc/mtree: NetBSD.dist.Xorg
src/external/mit/xorg/lib/dri: dri.mk
src/external/mit/xorg/lib/dri/libmesa: Makefile
src/external/mit/xorg/lib/libGL: Makefile
src/external/mit/xorg/lib/libdrm: Makefile
src/external/mit/xorg/lib/libdrm/drm: Makefile
src/external/mit/xorg/lib/libdrm_intel: Makefile
src/external/mit/xorg/server/drivers: Makefile.xf86-driver
src/external/mit/xorg/server/drivers/xf86-video-glint: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/ivch: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/sil164: Makefile
src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410: Makefile
src/external/mit/xorg/server/drivers/xf86-video-mga: Makefile
src/external/mit/xorg/server/drivers/xf86-video-radeon: Makefile
src/external/mit/xorg/server/drivers/xf86-video-savage: Makefile
src/external/mit/xorg/server/drivers/xf86-video-sis: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tdfx: Makefile
src/external/mit/xorg/server/drivers/xf86-video-via: Makefile
src/external/mit/xorg/server/xorg-server/GL/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/glx: Makefile.glx
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2: Makefile
Log Message:
Move libdrm headers up one level (out of the X11 directory) to match
the rest of the world and fix the inconsistency with libdrm.pc.
Fixes PR xsrc/42126.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.99 -r1.100 src/distrib/sets/lists/xcomp/mi
cvs rdiff -u -r1.2 -r1.3 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.7 -r1.8 src/external/mit/xorg/lib/dri/dri.mk
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/lib/dri/libmesa/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libGL/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libdrm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libdrm/drm/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/mit/xorg/lib/libdrm_intel/Makefile
cvs rdiff -u -r1.15 -r1.16 \
src/external/mit/xorg/server/drivers/Makefile.xf86-driver
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-via/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.80 src/distrib/sets/lists/xbase/mi:1.81
--- src/distrib/sets/lists/xbase/mi:1.80 Wed Sep 23 09:18:32 2009
+++ src/distrib/sets/lists/xbase/mi Thu Oct 8 19:06:49 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.80 2009/09/23 09:18:32 njoly Exp $
+# $NetBSD: mi,v 1.81 2009/10/08 19:06:49 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1495,7 +1495,7 @@
./usr/X11R7/include/X11/Xtrans base-x11-root xorg
./usr/X11R7/include/X11/bitmaps base-x11-root xorg
./usr/X11R7/include/X11/dri base-x11-root xorg
-./usr/X11R7/include/X11/drm base-x11-root xorg
+./usr/X11R7/include/X11/drm base-x11-root obsolete
./usr/X11R7/include/X11/extensions base-x11-root xorg
./usr/X11R7/include/X11/fonts base-x11-root xorg
./usr/X11R7/include/X11/pixmaps base-x11-root xorg
@@ -1504,6 +1504,7 @@
./usr/X11R7/include/X11/pixmaps/NetBSD.xpm -unknown- xorg
./usr/X11R7/include/X11/pixmaps/xorg-bw.xpm -unknown- xorg
./usr/X11R7/include/X11/pixmaps/xorg.xpm -unknown- xorg
+./usr/X11R7/include/drm base-x11-root xorg
./usr/X11R7/include/fontconfig base-x11-root xorg
./usr/X11R7/include/freetype2 base-x11-root xorg
./usr/X11R7/include/freetype2/freetype base-x11-root xorg
Index: src/distrib/sets/lists/xcomp/mi
diff -u src/distrib/sets/lists/xcomp/mi:1.99 src/distrib/sets/lists/xcomp/mi:1.100
--- src/distrib/sets/lists/xcomp/mi:1.99 Wed Aug 26 09:49:29 2009
+++ src/distrib/sets/lists/xcomp/mi Thu Oct 8 19:06:49 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.99 2009/08/26 09:49:29 njoly Exp $
+# $NetBSD: mi,v 1.100 2009/10/08 19:06:49 snj Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -5474,21 +5474,36 @@
./usr/X11R7/include/X11/cursorfont.h -unknown- xorg
./usr/X11R7/include/X11/dri/xf86dri.h -unknown- xorg
./usr/X11R7/include/X11/dri/xf86dristr.h -unknown- xorg
-./usr/X11R7/include/X11/drm/drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/drm_mode.h -unknown- xorg
-./usr/X11R7/include/X11/drm/drm_sarea.h -unknown- xorg
-./usr/X11R7/include/X11/drm/i915_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/mach64_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/mga_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/nouveau_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/r128_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/r300_reg.h -unknown- xorg
-./usr/X11R7/include/X11/drm/radeon_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/savage_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/sis_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/via_3d_reg.h -unknown- xorg
-./usr/X11R7/include/X11/drm/via_drm.h -unknown- xorg
-./usr/X11R7/include/X11/drm/xgi_drm.h -unknown- xorg
+./usr/X11R7/include/X11/drm/drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/drm_mode.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/drm_sarea.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/i915_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/mach64_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/mga_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/nouveau_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/r128_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/r300_reg.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/radeon_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/savage_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/sis_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/via_3d_reg.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/via_drm.h -unknown- obsolete
+./usr/X11R7/include/X11/drm/xgi_drm.h -unknown- obsolete
+./usr/X11R7/include/drm/drm.h -unknown- xorg
+./usr/X11R7/include/drm/drm_mode.h -unknown- xorg
+./usr/X11R7/include/drm/drm_sarea.h -unknown- xorg
+./usr/X11R7/include/drm/i915_drm.h -unknown- xorg
+./usr/X11R7/include/drm/mach64_drm.h -unknown- xorg
+./usr/X11R7/include/drm/mga_drm.h -unknown- xorg
+./usr/X11R7/include/drm/nouveau_drm.h -unknown- xorg
+./usr/X11R7/include/drm/r128_drm.h -unknown- xorg
+./usr/X11R7/include/drm/r300_reg.h -unknown- xorg
+./usr/X11R7/include/drm/radeon_drm.h -unknown- xorg
+./usr/X11R7/include/drm/savage_drm.h -unknown- xorg
+./usr/X11R7/include/drm/sis_drm.h -unknown- xorg
+./usr/X11R7/include/drm/via_3d_reg.h -unknown- xorg
+./usr/X11R7/include/drm/via_drm.h -unknown- xorg
+./usr/X11R7/include/drm/xgi_drm.h -unknown- xorg
./usr/X11R7/include/X11/extensions/MITMisc.h -unknown- xorg
./usr/X11R7/include/X11/extensions/Print.h -obsolete- obsolete
./usr/X11R7/include/X11/extensions/Printstr.h -obsolete- obsolete
@@ -5628,8 +5643,10 @@
./usr/X11R7/include/X11/fonts/pcf.h -unknown- xorg
./usr/X11R7/include/X11/keysym.h -unknown- xorg
./usr/X11R7/include/X11/keysymdef.h -unknown- xorg
-./usr/X11R7/include/X11/xf86drm.h -unknown- xorg
-./usr/X11R7/include/X11/xf86drmMode.h -unknown- xorg
+./usr/X11R7/include/X11/xf86drm.h -unknown- obsolete
+./usr/X11R7/include/X11/xf86drmMode.h -unknown- obsolete
+./usr/X11R7/include/xf86drm.h -unknown- xorg
+./usr/X11R7/include/xf86drmMode.h -unknown- xorg
./usr/X11R7/include/X11/xf86mm.h -obsolete- obsolete
./usr/X11R7/include/X11/xpm.h -unknown- xorg
./usr/X11R7/include/expat.h -unknown- xorg
Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.2 src/etc/mtree/NetBSD.dist.Xorg:1.3
--- src/etc/mtree/NetBSD.dist.Xorg:1.2 Fri Oct 2 00:00:59 2009
+++ src/etc/mtree/NetBSD.dist.Xorg Thu Oct 8 19:06:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.Xorg,v 1.2 2009/10/02 00:00:59 mrg Exp $
+# $NetBSD: NetBSD.dist.Xorg,v 1.3 2009/10/08 19:06:50 snj Exp $
./usr/X11R7
./usr/X11R7/bin
@@ -7,7 +7,6 @@
./usr/X11R7/include/GL
./usr/X11R7/include/GL/internal
./usr/X11R7/include/X11
-./usr/X11R7/include/X11/drm
./usr/X11R7/include/X11/dri
./usr/X11R7/include/X11/ICE
./usr/X11R7/include/X11/PM
@@ -21,6 +20,7 @@
./usr/X11R7/include/X11/extensions
./usr/X11R7/include/X11/fonts
./usr/X11R7/include/X11/pixmaps
+./usr/X11R7/include/drm
./usr/X11R7/include/fontconfig
./usr/X11R7/include/freetype2
./usr/X11R7/include/freetype2/freetype
Index: src/external/mit/xorg/lib/dri/dri.mk
diff -u src/external/mit/xorg/lib/dri/dri.mk:1.7 src/external/mit/xorg/lib/dri/dri.mk:1.8
--- src/external/mit/xorg/lib/dri/dri.mk:1.7 Thu Aug 27 04:36:13 2009
+++ src/external/mit/xorg/lib/dri/dri.mk Thu Oct 8 19:06:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: dri.mk,v 1.7 2009/08/27 04:36:13 mrg Exp $
+# $NetBSD: dri.mk,v 1.8 2009/10/08 19:06:50 snj 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}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -D_NETBSD_SOURCE -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 \
Index: src/external/mit/xorg/lib/dri/libmesa/Makefile
diff -u src/external/mit/xorg/lib/dri/libmesa/Makefile:1.3 src/external/mit/xorg/lib/dri/libmesa/Makefile:1.4
--- src/external/mit/xorg/lib/dri/libmesa/Makefile:1.3 Tue Jun 16 05:16:12 2009
+++ src/external/mit/xorg/lib/dri/libmesa/Makefile Thu Oct 8 19:06:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/06/16 05:16:12 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/08 19:06:50 snj Exp $
.include <bsd.own.mk>
@@ -15,7 +15,7 @@
-I${X11SRCDIR.MesaLib}/src/mesa/drivers/dri/common \
-I${X11SRCDIR.MesaLib}/src/mesa \
-I${X11SRCDIR.MesaLib}/include \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= ${X11FLAGS.THREADLIB} \
Index: src/external/mit/xorg/lib/libGL/Makefile
diff -u src/external/mit/xorg/lib/libGL/Makefile:1.9 src/external/mit/xorg/lib/libGL/Makefile:1.10
--- src/external/mit/xorg/lib/libGL/Makefile:1.9 Thu Jun 11 15:25:53 2009
+++ src/external/mit/xorg/lib/libGL/Makefile Thu Oct 8 19:06:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/06/11 15:25:53 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2009/10/08 19:06:50 snj Exp $
.include <bsd.own.mk>
@@ -55,7 +55,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/GL \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/extensions \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${X11SRCDIR.MesaLib}/include \
-I${X11SRCDIR.MesaLib}/include/GL/internal \
-I${X11SRCDIR.MesaLib}/src/mesa \
Index: src/external/mit/xorg/lib/libdrm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/Makefile:1.4 src/external/mit/xorg/lib/libdrm/Makefile:1.5
--- src/external/mit/xorg/lib/libdrm/Makefile:1.4 Tue Jun 9 05:02:13 2009
+++ src/external/mit/xorg/lib/libdrm/Makefile Thu Oct 8 19:06:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/09 05:02:13 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/10/08 19:06:50 snj Exp $
.include <bsd.own.mk>
@@ -8,10 +8,10 @@
SRCS= xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
INCS= xf86drm.h xf86drmMode.h
-INCSDIR=${X11INCDIR}/X11
+INCSDIR=${X11INCDIR}
.PATH: ${X11SRCDIR.${LIB}}/libdrm/intel
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
SUBDIR= drm
Index: src/external/mit/xorg/lib/libdrm/drm/Makefile
diff -u src/external/mit/xorg/lib/libdrm/drm/Makefile:1.2 src/external/mit/xorg/lib/libdrm/drm/Makefile:1.3
--- src/external/mit/xorg/lib/libdrm/drm/Makefile:1.2 Tue Jun 9 03:05:37 2009
+++ src/external/mit/xorg/lib/libdrm/drm/Makefile Thu Oct 8 19:06:50 2009
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2009/06/09 03:05:37 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2009/10/08 19:06:50 snj Exp $
-# install include/X11/drm files
+# install include/drm files
.include <bsd.own.mk>
@@ -12,7 +12,7 @@
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}/X11/drm
+INCSDIR=${X11INCDIR}/drm
.include <bsd.x11.mk>
.include <bsd.prog.mk>
Index: src/external/mit/xorg/lib/libdrm_intel/Makefile
diff -u src/external/mit/xorg/lib/libdrm_intel/Makefile:1.2 src/external/mit/xorg/lib/libdrm_intel/Makefile:1.3
--- src/external/mit/xorg/lib/libdrm_intel/Makefile:1.2 Tue Jun 9 05:02:13 2009
+++ src/external/mit/xorg/lib/libdrm_intel/Makefile Thu Oct 8 19:06:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/06/09 05:02:13 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2009/10/08 19:06:50 snj Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
SRCS= intel_bufmgr.c intel_bufmgr_fake.c intel_bufmgr_gem.c mm.c
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 -I${X11SRCDIR.drm}/libdrm
INCS= intel_bufmgr.h
Index: src/external/mit/xorg/server/drivers/Makefile.xf86-driver
diff -u src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.15 src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.16
--- src/external/mit/xorg/server/drivers/Makefile.xf86-driver:1.15 Fri Jun 12 01:59:04 2009
+++ src/external/mit/xorg/server/drivers/Makefile.xf86-driver Thu Oct 8 19:06:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xf86-driver,v 1.15 2009/06/12 01:59:04 mrg Exp $
+# $NetBSD: Makefile.xf86-driver,v 1.16 2009/10/08 19:06:50 snj Exp $
LIBISMODULE= yes
SHLIB_MAJOR= ${PACKAGE_MAJOR}
@@ -29,7 +29,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${X11SRCDIR.xorg-server}/../include \
Index: src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile:1.6 Wed Jun 10 02:00:10 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Thu Oct 8 19:06:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/10 02:00:10 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/08 19:06:50 snj Exp $
DRIVER= xf86-video-glint
DRIVER_NAME= glint_drv
@@ -20,6 +20,6 @@
CPPFLAGS+= -DHAVE_CONFIG_H -I${X11SRCDIR.${DRIVER}}/../include
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile:1.6 Tue Jun 9 03:05:36 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Thu Oct 8 19:06:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/09 03:05:36 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/08 19:06:50 snj Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= intel_drv
@@ -17,7 +17,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
CPPFLAGS+= -DI830_XV -DI830_USE_XAA -DI830_USE_EXA
LDADD+= -ldrm_intel
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile:1.1 Sun Aug 31 19:58:06 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile Thu Oct 8 19:06:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/31 19:58:06 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/08 19:06:50 snj Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= ch7017_drv
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/src/ch7017
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile:1.1 Sun Aug 31 19:58:06 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/31 19:58:06 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/08 19:06:51 snj Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= ch7xxx_drv
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/src/ch7xxx
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile:1.1 Sun Aug 31 19:58:06 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/31 19:58:06 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/08 19:06:51 snj Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= ivch_drv
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/src/ivch
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile:1.1 Sun Aug 31 19:58:06 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/31 19:58:06 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/08 19:06:51 snj Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= sil164_drv
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/src/sil164
Index: src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile:1.1 Sun Aug 31 19:58:06 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2008/08/31 19:58:06 christos Exp $
+# $NetBSD: Makefile,v 1.2 2009/10/08 19:06:51 snj Exp $
DRIVER= xf86-video-intel
DRIVER_NAME= tfp410_drv
@@ -8,7 +8,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
.include "../../Makefile.xf86-driver"
.PATH: ${X11SRCDIR.${DRIVER}}/src/tfp410
Index: src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile:1.6 Fri Jul 3 21:19:19 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-mga/Makefile Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/07/03 21:19:19 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/08 19:06:51 snj Exp $
.include <bsd.own.mk>
@@ -27,7 +27,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
CPPFLAGS.mga_driver.c= -Wno-error # XXX fix me please
CPPFLAGS.mga_dacG.c= -Wno-error # XXX fix me please
Index: src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile:1.4 Fri Jun 12 04:00:57 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-radeon/Makefile Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/12 04:00:57 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2009/10/08 19:06:51 snj Exp $
.include <bsd.own.mk>
@@ -35,7 +35,7 @@
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src/AtomBios/includes \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${X11SRCDIR.${DRIVER}}/../include
# XXX
Index: src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile:1.6 Thu Jul 9 07:50:10 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-savage/Makefile Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/07/09 07:50:10 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/08 19:06:51 snj Exp $
DRIVER= xf86-video-savage
DRIVER_NAME= savage_drv
@@ -21,7 +21,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
CPPFLAGS.savage_driver.c= -DPACKAGE_VERSION=\"${PACKAGE_MAJOR}\"
CPPFLAGS.savage_exa.c= -Wno-error # volatile -> mempcy
Index: src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.6 src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.7
--- src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile:1.6 Wed Jun 10 02:01:14 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-sis/Makefile Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/10 02:01:14 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/08 19:06:51 snj Exp $
DRIVER= xf86-video-sis
DRIVER_NAME= sis_drv
@@ -14,7 +14,7 @@
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
# XXX
COPTS.sis_driver.c= -Wno-error
Index: src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.5 src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.6
--- src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile:1.5 Thu Aug 27 04:33:18 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/08/27 04:33:18 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2009/10/08 19:06:51 snj Exp $
DRIVER= xf86-video-tdfx
DRIVER_NAME= tdfx_drv
@@ -10,7 +10,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
COPTS.tdfx_driver.c= -Wno-error # XXX deprecated
Index: src/external/mit/xorg/server/drivers/xf86-video-via/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-via/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-via/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-via/Makefile:1.4 Fri Feb 27 15:47:46 2009
+++ src/external/mit/xorg/server/drivers/xf86-video-via/Makefile Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/02/27 15:47:46 reinoud Exp $
+# $NetBSD: Makefile,v 1.5 2009/10/08 19:06:51 snj Exp $
DRIVER= xf86-video-via
DRIVER_NAME= via_drv
@@ -12,7 +12,7 @@
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/dri
-CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11/drm
+CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/drm
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/src
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:1.4 src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:1.5
--- src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx:1.4 Thu Sep 25 15:02:58 2008
+++ src/external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx Thu Oct 8 19:06:51 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.4 2008/09/25 15:02:58 rtr Exp $
+# $NetBSD: Makefile.glx,v 1.5 2009/10/08 19:06:51 snj Exp $
.PATH: ${X11SRCDIR.xorg-server}/GL/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -49,7 +49,7 @@
-I${X11SRCDIR.MesaLib}/src/glx/x11 \
-I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1
Index: src/external/mit/xorg/server/xorg-server/glx/Makefile.glx
diff -u src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3 src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.4
--- src/external/mit/xorg/server/xorg-server/glx/Makefile.glx:1.3 Sat Aug 22 02:40:27 2009
+++ src/external/mit/xorg/server/xorg-server/glx/Makefile.glx Thu Oct 8 19:06:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.glx,v 1.3 2009/08/22 02:40:27 mrg Exp $
+# $NetBSD: Makefile.glx,v 1.4 2009/10/08 19:06:52 snj Exp $
.PATH: ${X11SRCDIR.xorg-server}/glx
.PATH: ${X11SRCDIR.MesaLib}/src/mesa/glapi
@@ -52,7 +52,7 @@
-I${X11SRCDIR.MesaLib}/src/mesa/main \
-I${X11SRCDIR.MesaLib}/src/mesa/glapi \
-I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/xorg \
-I${DESTDIR}${X11INCDIR}/pixman-1
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile:1.6 Fri Jun 12 01:59:05 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile Thu Oct 8 19:06:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/06/12 01:59:05 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2009/10/08 19:06:52 snj Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -26,7 +26,7 @@
-I${X11SRCDIR.MesaLib}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.3 src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile:1.3 Sat Aug 22 02:40:27 2009
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile Thu Oct 8 19:06:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/08/22 02:40:27 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/08 19:06:52 snj Exp $
XMODULEDIR= ${X11USRLIBDIR}/modules/extensions
@@ -27,7 +27,7 @@
-I${X11SRCDIR.MesaLib}/include \
-I${DESTDIR}${X11INCDIR}/X11 \
-I${DESTDIR}${X11INCDIR}/X11/dri \
- -I${DESTDIR}${X11INCDIR}/X11/drm \
+ -I${DESTDIR}${X11INCDIR}/drm \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
