From def7d522c29b71633dfc77571d793d0bc4f3f4b5 Mon Sep 17 00:00:00 2001 From: mrg Date: Tue, 29 Jul 2008 04:40:14 +0000 Subject: [PATCH] begin to add support for cross-built Xorg: - add MKXORG - default to DRI-on for Xorg - add paths for 192 Xorg packages that will exist in xsrc/external/mit//dist - add some more X11FLAGS.* variables if MKXORG. this is somewhat based on the xorg work rtr@ did a couple of years ago. XXX: seriously need to fix the XORG_RELEASE value, it is still set to XXX: 6.8.1 from when rtr was working on this. --- share/mk/bsd.README | 8 +++++- share/mk/bsd.own.mk | 62 ++++++++++++++++++++++++++++++++++++++++++--- share/mk/bsd.x11.mk | 29 ++++++++++++++++++++- 3 files changed, 93 insertions(+), 6 deletions(-) diff --git a/share/mk/bsd.README b/share/mk/bsd.README index f1d67d677359..084b80a657e1 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.215 2008/07/22 21:09:52 dyoung Exp $ +# $NetBSD: bsd.README,v 1.216 2008/07/29 04:40:14 mrg Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -325,6 +325,12 @@ MKX11 If not "no", 'make build' also descends into src/x11 of X sets. Default: no +MKXORG If not "no", 'make build' also descends into + src/external/mit/xorg to cross build modular Xorg and + automatically enables creation of X sets. Overrides + MKX11. + Default: no + MKYP If "no", disables building of YP (NIS) infrastructure (libraries and support programs). Default: yes diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 48072d592bff..cfdc04dc54ec 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.515 2008/07/23 00:45:39 dogcow Exp $ +# $NetBSD: bsd.own.mk,v 1.516 2008/07/29 04:40:15 mrg Exp $ .if !defined(_BSD_OWN_MK_) _BSD_OWN_MK_=1 @@ -571,7 +571,7 @@ ${var}?= yes MKMANZ MKMODULAR MKOBJDIRS \ MKPCC MKPCCCMDS \ MKPUFFS MKSOFTFLOAT \ - MKUNPRIVED MKUPDATE MKX11 + MKUNPRIVED MKUPDATE MKX11 MKXORG ${var}?=no .endfor @@ -703,8 +703,62 @@ X11LIBDIR?= ${X11ROOTDIR}/lib/X11 X11MANDIR?= ${X11ROOTDIR}/man X11USRLIBDIR?= ${X11ROOTDIR}/lib -X11DRI?= no -X11LOADABLE?= yes +# +# New modular-xorg based builds +# +X11SRCDIRMIT?= ${X11SRCDIR}/external/mit +.for _lib in \ + FS ICE SM X11 XScrnSaver XTrap Xau Xcomposite Xcursor Xdamage \ + Xdmcp Xevie Xext Xfixes Xfont Xft Xi Xinerama Xmu Xp Xpm XprintUtil \ + Xrandr Xrender Xres Xt Xtst Xv XvMC Xxf86dga Xxf86misc Xxf86vm drm \ + fontenc xkbfile xkbui Xaw lbxutil Xfontcache XprintAppUtil +X11SRCDIR.${_lib}?= ${X11SRCDIRMIT}/lib${_lib}/dist +.endfor + +.for _proto in \ + xcmisc xext xf86bigfont bigreqs input kb x fonts fixes scrnsaver \ + xinerama print render resource record video xf86dga xf86misc \ + xf86vidmode composite damage trap gl randr fontcache xf86dri +X11SRCDIR.${_proto}proto?= ${X11SRCDIRMIT}/${_proto}proto/dist +.endfor + +.for _dir in \ + xtrans fontconfig expat freetype evieext mkfontscale bdftopcf \ + xkbcomp xorg-cf-files imake xorg-server xbiff xkbdata \ + xbitmaps appres xeyes xev xedit sessreg \ + beforelight bitmap editres makedepend fonttosfnt fslsfonts \ + fstobdf MesaDemos MesaLib ico iceauth lbxproxy listres lndir \ + luit xproxymanagementprotocol mkfontdir oclock proxymngr rgb \ + setxkbmap smproxy twm viewres x11perf xauth xcalc xclipboard \ + xclock xcmsdb xconsole xcutsel xditview xdpyinfo xdriinfo xdm \ + xfd xf86dga xfindproxy xfontsel xfwp xgamma xgc xhost xinit \ + xkill xload xlogo xlsatoms xlsclients xlsfonts xmag xmessage \ + xmh xmodmap xmore xman xprop xrandr xrdb xrefresh xset \ + xsetmode xsetpointer xsetroot xsm xstdcmap xvidtune xvinfo \ + xwininfo xwud xprehashprinterlist xplsprinters xkbprint xkbevd \ + xterm xwd xfs xfsinfo xphelloworld xtrap xkbutils xkbcomp \ + font-adobe-100dpi font-adobe-75dpi font-adobe-utopia-100dpi \ + font-adobe-utopia-75dpi font-adobe-utopia-type1 \ + font-alias \ + font-bh-100dpi font-bh-75dpi font-bh-lucidatypewriter-100dpi \ + font-bh-lucidatypewriter-75dpi font-bh-ttf font-bh-type1 \ + font-bitstream-100dpi font-bitstream-75dpi font-bitstream-type1 \ + font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 \ + font-isas-misc font-jis-misc font-misc-misc font-mutt-misc \ + font-util ttf-bitstream-vera encodings +X11SRCDIR.${_dir}?= ${X11SRCDIRMIT}/${_dir}/dist +.endfor + +# Default to no xorg builds for now. +MKXORG?= no +MKXORG_WITH_XSRC_XSERVER?= no + +.if ${MKXORG} != no +X11DRI?= yes +.endif + +X11DRI?= no +X11LOADABLE?= yes # diff --git a/share/mk/bsd.x11.mk b/share/mk/bsd.x11.mk index 886c2d87a443..15b989a000e6 100644 --- a/share/mk/bsd.x11.mk +++ b/share/mk/bsd.x11.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.x11.mk,v 1.57 2008/03/08 10:39:39 phx Exp $ +# $NetBSD: bsd.x11.mk,v 1.58 2008/07/29 04:40:15 mrg Exp $ .include @@ -27,10 +27,26 @@ X11FLAGS.CONNECTION+= -DIPv6 .endif # EXT_DEFINES +.if ${MKXORG} != "no" +X11FLAGS.BASE_EXTENSION= -DMITMISC -DXTEST -DXTRAP -DXSYNC -DXCMISC \ + -DXRECORD -DMITSHM -DBIGREQS -DXF86VIDMODE \ + -DXF86MISC -DDPMSExtension -DEVI \ + -DSCREENSAVER -DXV -DXVMC -DGLXEXT \ + -DFONTCACHE -DRES + +X11FLAGS.PERVASIVE_EXTENSION= -DSHAPE -DXINPUT -DXKB -DLBX -DXAPPGROUP \ + -DXCSECURITY -DTOGCUP -DXF86BIGFONT \ + -DDPMSExtension -DPIXPRIV -DPANORAMIX \ + -DRENDER -DRANDR -DXFIXES -DDAMAGE \ + -DCOMPOSITE -DXEVIE +X11FLAGS.EXTENSION= ${X11FLAGS.BASE_EXTENSION} \ + ${X11FLAGS.PERVASIVE_EXTENSION} +.else X11FLAGS.EXTENSION= -DMITMISC -DXTEST -DXTRAP -DXSYNC -DXCMISC -DXRECORD \ -DMITSHM -DBIGREQS -DXF86MISC -DDBE -DDPMSExtension \ -DEVI -DSCREENSAVER -DXV -DXVMC -DGLXEXT \ -DGLX_USE_MESA -DFONTCACHE -DRES +.endif X11FLAGS.DRI= -DGLXEXT -DXF86DRI -DGLX_DIRECT_RENDERING \ -DGLX_USE_DLOPEN -DGLX_USE_MESA @@ -86,6 +102,17 @@ X11FLAGS.EXTENSION+= -D__GLX_ALIGN64 X11FLAGS.LOADABLE= -DXFree86LOADER -DIN_MODULE -DXFree86Module \ -fno-merge-constants .endif + +# XXX FIX ME +.if ${MKXORG} != "no" +XVENDORNAMESHORT= '"X.Org"' +XVENDORNAME= '"The X.Org Foundation"' +XORG_RELEASE= '"Release 6.8.1"' +__XKBDEFRULES__= '"xorg"' + +# XXX oh yeah, fix me later +XORG_VERSION_CURRENT="(((6) * 10000000) + ((8) * 100000) + ((1) * 1000) + 0)" +.endif # Extract X11VERSION PRINTX11VERSION=awk '/^\#define XF86_VERSION_MAJOR/ {major = $$3} \