Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Move libdrm headers up one level (out of the X11 directory) ...
details: https://anonhg.NetBSD.org/src/rev/e50228efed35
branches: trunk
changeset: 747997:e50228efed35
user: snj <snj%NetBSD.org@localhost>
date: Thu Oct 08 19:06:49 2009 +0000
description:
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.
diffstat:
distrib/sets/lists/xbase/mi | 5 +-
distrib/sets/lists/xcomp/mi | 53 ++++++---
etc/mtree/NetBSD.dist.Xorg | 4 +-
external/mit/xorg/lib/dri/dri.mk | 4 +-
external/mit/xorg/lib/dri/libmesa/Makefile | 4 +-
external/mit/xorg/lib/libGL/Makefile | 4 +-
external/mit/xorg/lib/libdrm/Makefile | 6 +-
external/mit/xorg/lib/libdrm/drm/Makefile | 6 +-
external/mit/xorg/lib/libdrm_intel/Makefile | 4 +-
external/mit/xorg/server/drivers/Makefile.xf86-driver | 4 +-
external/mit/xorg/server/drivers/xf86-video-glint/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-intel/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-intel/ch7xxx/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-intel/ivch/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-intel/sil164/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-intel/tfp410/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-mga/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-radeon/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-savage/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-sis/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-tdfx/Makefile | 4 +-
external/mit/xorg/server/drivers/xf86-video-via/Makefile | 4 +-
external/mit/xorg/server/xorg-server/GL/glx/Makefile.glx | 4 +-
external/mit/xorg/server/xorg-server/glx/Makefile.glx | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/dri/Makefile | 4 +-
external/mit/xorg/server/xorg-server/hw/xfree86/dri2/Makefile | 4 +-
27 files changed, 90 insertions(+), 72 deletions(-)
diffs (truncated from 563 to 300 lines):
diff -r 84d01ff10d11 -r e50228efed35 distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi Thu Oct 08 16:33:45 2009 +0000
+++ b/distrib/sets/lists/xbase/mi Thu Oct 08 19:06:49 2009 +0000
@@ -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
diff -r 84d01ff10d11 -r e50228efed35 distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi Thu Oct 08 16:33:45 2009 +0000
+++ b/distrib/sets/lists/xcomp/mi Thu Oct 08 19:06:49 2009 +0000
@@ -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
diff -r 84d01ff10d11 -r e50228efed35 etc/mtree/NetBSD.dist.Xorg
--- a/etc/mtree/NetBSD.dist.Xorg Thu Oct 08 16:33:45 2009 +0000
+++ b/etc/mtree/NetBSD.dist.Xorg Thu Oct 08 19:06:49 2009 +0000
@@ -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
diff -r 84d01ff10d11 -r e50228efed35 external/mit/xorg/lib/dri/dri.mk
--- a/external/mit/xorg/lib/dri/dri.mk Thu Oct 08 16:33:45 2009 +0000
+++ b/external/mit/xorg/lib/dri/dri.mk Thu Oct 08 19:06:49 2009 +0000
@@ -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 \
diff -r 84d01ff10d11 -r e50228efed35 external/mit/xorg/lib/dri/libmesa/Makefile
--- a/external/mit/xorg/lib/dri/libmesa/Makefile Thu Oct 08 16:33:45 2009 +0000
+++ b/external/mit/xorg/lib/dri/libmesa/Makefile Thu Oct 08 19:06:49 2009 +0000
@@ -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} \
diff -r 84d01ff10d11 -r e50228efed35 external/mit/xorg/lib/libGL/Makefile
--- a/external/mit/xorg/lib/libGL/Makefile Thu Oct 08 16:33:45 2009 +0000
+++ b/external/mit/xorg/lib/libGL/Makefile Thu Oct 08 19:06:49 2009 +0000
@@ -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 \
diff -r 84d01ff10d11 -r e50228efed35 external/mit/xorg/lib/libdrm/Makefile
--- a/external/mit/xorg/lib/libdrm/Makefile Thu Oct 08 16:33:45 2009 +0000
+++ b/external/mit/xorg/lib/libdrm/Makefile Thu Oct 08 19:06:49 2009 +0000
@@ -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
diff -r 84d01ff10d11 -r e50228efed35 external/mit/xorg/lib/libdrm/drm/Makefile
--- a/external/mit/xorg/lib/libdrm/drm/Makefile Thu Oct 08 16:33:45 2009 +0000
+++ b/external/mit/xorg/lib/libdrm/drm/Makefile Thu Oct 08 19:06:49 2009 +0000
@@ -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>
diff -r 84d01ff10d11 -r e50228efed35 external/mit/xorg/lib/libdrm_intel/Makefile
--- a/external/mit/xorg/lib/libdrm_intel/Makefile Thu Oct 08 16:33:45 2009 +0000
+++ b/external/mit/xorg/lib/libdrm_intel/Makefile Thu Oct 08 19:06:49 2009 +0000
@@ -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
diff -r 84d01ff10d11 -r e50228efed35 external/mit/xorg/server/drivers/Makefile.xf86-driver
--- a/external/mit/xorg/server/drivers/Makefile.xf86-driver Thu Oct 08 16:33:45 2009 +0000
+++ b/external/mit/xorg/server/drivers/Makefile.xf86-driver Thu Oct 08 19:06:49 2009 +0000
@@ -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 \
diff -r 84d01ff10d11 -r e50228efed35 external/mit/xorg/server/drivers/xf86-video-glint/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Thu Oct 08 16:33:45 2009 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-glint/Makefile Thu Oct 08 19:06:49 2009 +0000
@@ -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"
diff -r 84d01ff10d11 -r e50228efed35 external/mit/xorg/server/drivers/xf86-video-intel/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Thu Oct 08 16:33:45 2009 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/Makefile Thu Oct 08 19:06:49 2009 +0000
@@ -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
diff -r 84d01ff10d11 -r e50228efed35 external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile
--- a/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile Thu Oct 08 16:33:45 2009 +0000
+++ b/external/mit/xorg/server/drivers/xf86-video-intel/ch7017/Makefile Thu Oct 08 19:06:49 2009 +0000
@@ -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 $
Home |
Main Index |
Thread Index |
Old Index