This patch should be applied to an un-modified XFree86 version 4.0.2 source tree. It is the first of four patches that will will convert the source tree to XFree86 version 4.1.0. To apply this patch, run the following from the directory containing your 'xc' directory: patch -p0 -E < 4.0.2-4.1.0.diff1 patch -p0 -E < 4.0.2-4.1.0.diff2 patch -p0 -E < 4.0.2-4.1.0.diff3 patch -p0 -E < 4.0.2-4.1.0.diff4 rm -f xc/programs/xieperf/images/image.012 rm -fr xc/fonts/bdf/latin2 rm -fr xc/fonts/bdf/100dpi rm -fr xc/fonts/bdf/75dpi gzip -d < 4.1.0.tgz | tar vxf - ------------------------------------------------------------------------------- Prereq: 4.0.2 Index: xc/programs/Xserver/hw/xfree86/CHANGELOG diff -u xc/programs/Xserver/hw/xfree86/CHANGELOG:3.1485 xc/programs/Xserver/hw/xfree86/CHANGELOG:3.1785.2.32 --- xc/programs/Xserver/hw/xfree86/CHANGELOG:3.1485 Mon Dec 18 10:55:33 2000 +++ xc/programs/Xserver/hw/xfree86/CHANGELOG Sat Jun 2 11:27:50 2001 @@ -1,3 +1,1306 @@ +XFree86 4.1.0 (2 June 2001) + 619. Disable PCI resource conflict checking for Linux/Alpha (Jay Estabrook). + +XFree86 4.0.99.902 (1 June 2001) + 618. Fix Linux xf86GetPciSizeFromOS() parsing when the kernel is 64 bit + and any base or size is larger than 32 bits in magnitude (#4732, + David S. Miller). + 617. Make XDarwin ddx pass up proper right and middle mouse button numbers + and fix mouse button 5 (Christoph Pfisterer and Torrey T. Lyons). + 616. Restore backwards compatibility from 4.0.[2,3] to 4.1.0 for + the i810, r128 and radeon DRI drivers (Gareth Hughes). + 615. Fix a problem when using patterns of horizontal lines with the mga + video overlay (#A.442, Ewald Snel). + 614. Xinstall.sh updates and bug fixes (David Dawes). + 613. Remove duplicate XineramaLibrary section in X11.tmpl (#4731, + Mike Harris). + 612. Enable building DRI for Linux/ppc, and fix a drm-related bug + for Linux/ppc (#4728, 4730, Michel Dänzer). + 611. Document Options for the r128 and fbdev drivers (#4727, 4729, + Michel Dänzer). + 610. Add a BuildBindist switch which causes a file containing the XFree86 + version number to be installed in ProjectRoot, include this in + the Xbin bindist tarballs, and turn on this switch in the bindist + host.def files. The purpose is to allow the installer script to + easily identify which version the bindist tarballs are (David Dawes). + 609. Resync bindist and Xinstall.sh with changes made for 4.0.3 (David Dawes). + 608. Fix the Shape extension's XShapeCombineMask to handle cases where + src_mask is None according to the spec. This reportedly fixes an + X server crash (#4715, Huver). + 607. Make sure -UXF86DRI is after -DXF86DRI when compiling vfb/miinitext.c + (#4714, Frederic Lepied). + 606. Fix ATI Radeon driver on Alpha. Seems as though the BIOS doesn't + like Re-POSTing and memory setup gets confused. (Jay Estabrook, Jeff + Weidemeier) + 605. Fix build for Cygwin/XFree86 (#4711,#4713 Harold Hunt). + 604. Fix problem with Xinstall.sh on Darwin 1.3.x (#A.431, Stefan Pantos). + 603. Update Xinstall.sh and Darwin bindist directories to optionally + install Quartz support and to add an x86 distribution (Torrey T. Lyons). + +XFree86 4.0.99.901 (29 May 2001) + 602. Add missing return value for miSetPixmapDepths() (#4708, + ISHIKAWA Mutsumi). + 601. Fill in the v4l man page template with some useful information (#4707, + Gerd Knorr). + 600. Fix FFB OpenGL SwapBuffers (#4705, David S. Miller). + 599. Work around a problem building the rstart specs doc with a symlinked + build tree (David Dawes). + 598. Remove SPARC-specific byte-swapping code that would not work on older + SPARC CPUs (part of #4653, David S. Miller). + 597. NULLify mapVidMem() and remove DEV_MEM #define for Linux/SPARC + (#4651, David S. Miller). + 596. Fix Glint 300SX+Delta support. Add faster 500TX text acceleration + based on other code (Alan Hourihane). + 595. Fixing MTRR split code (hopefully) (Egbert Eich). + 594. Fixing coredump when doing vbeFree() twice: S3 Virge and C&T + (Egbert Eich). + 593. Fixing HWCursor for mga driver in fbdev mode (Egbert Eich). + 592. Fix xmh's use of XtNewString() with getenv (#4694, Tim Waugh). + 591. Xdm/PAM fixes: leave it to PAM to observe whether or not an account + is locked, and reinitialize credentials after calling initgroups(), + because sometimes the credentials pam_setcred() gives are in the + form of group membership (#4693, Mike Harris). + 590. Add an encodings file for standard box drawing characters for + VT100-compatible terminals (#4691, Juliusz Chroboczek). + 589. Fix warnings when building mieq.c (#4689, Adam Sulmicki). + 588. Fix some bugs in the cz and sk entried in XKB's keymap/xfree86 file + (#4692, Ivan Pascal). + 587. Add 'hr' entries to XKB's keymap/xfree86 and rules/xfree86.lst files + (#4687, Nerijus Baliunas). + 586. Include in shape.h to get Region typedef (#4686, + Adam Sulmicki). + 585. Acceleration fixes for GLINT Permedia1 (Alan Hourihane). + 584. Ensure glint driver chips don't exceed the specified virtual sizes. + (Alan Hourihane). + 583. Remove all VGA'isms from the glint driver, it doesn't need them + (Alan Hourihane). + 582. Support the Delta in the glint driver, needed for boards that have + the Delta connected to the rasterizer, as it acts as an arbiter for + the bus. Resolves acceleration troubles. (Alan Hourihane). + 581. Add an lv entry to XKB's keymap/xfree86 file (#4685, Nerijus Baliunas). + 580. Fix some typos in XKB's xfree86.lst file (#4684, Nerijus Baliunas). + 579. Add DDXOSVERRORF ifdefs to the XFree86 ddx code that make use of the + OsVendorVErrorFProc feature (#4678, Michel Dänzer). + 578. Convert the r128 driver's "UseBIOSDisplay" option into a more general + "Display" option (#4678, Michel Dänzer). + 577. Treat GL_POINT like GL_POINTS and GL_LINE like GL_LINES in the sunffb + DRI driver (#4677, David S. Miller) + 576. Fix bsdLib.rules and bsdLib.tmpl problems that show up when + X11ProjectRoot is defined (#4676, Johnny C. Lam). + 575. Fix Trident XVideo colorkey at depth 15, 24 (Alan Hourihane). + 574. Fix a typo in the lv XKB description, and fix things so that it gets + installed (#4675, 4679, Andris Pavenis). + 573. Fix some apm driver bugs, including one that prevented acceleration + from working (#4674, Loïc Grenié). + 572. Fix 555 (depth 15) palette handling in the i810 driver (#4673, + Andrew C. Aitchison). + 571. [SECURITY] Fix authentication issues with mmap() on drm devices + (Jeff Hartmann). + 570. Add euro locales and some other missing locales to locale.alias and + locale.dir (#4662, 4665, 4667, Mike Harris). + 569. Fix Romanian XKB map (#4664, Mike Harris). + 568. Spell Portuguese correctly in XKB lst files (#4663, Mike Harris). + 567. Fix new ioperm calls in lnx_video.c for Alpha that are not needed + (Jay Estabrook). + 566. Fix problems with assembler file dependencies when using gccmakedep + with the build (Frederic Lepied). + 565. Finish DRI resync, including tdfx driver updates for textured video + support (VA Linux Systems). + 564. Fix formatting of max clock reported by DDC (Marc La France). + 563. Update Japanese localization of XDarwin help file (Toshimitsu Tanaka). + 562. Update XDarwin man pages, help files, and version info. Add option to + build XDarwin.app bundle for deployment (Torrey Lyons). + +XFree86 4.0.99.900 (18 May 2001) + 561. Add an XKB description for Latvian (lv) keyboards (#A.411, Ilya Ketris). + 560. Resync with DRI CVS trunk (VA Linux Systems). + 559. Savage driver updates, including compiler warning fixes, document + the "ShadowStatus" option in the man page, and fix an argument + mismatch between ShadowWait and SavageWaitQueue (#4661, Tim Roberts). + 558. Update the wacom driver to add a "ScreenNo" option to allow a tablet + to be attached to a screen in a multi-head setup, and to add auto- + detection of USB line and max parameters of USB tablets (#4640, + Frederic Lepied). + 557. Add a README file that has information about enabling the extra buttons + on the IBM Rapid Access keyboard (#4639, Dennis Bjorklund). + 556. Fix some Slovene/Slovak confusion in locale.dir/locale.alias files + (#4638, Kamil Toman). + 555. New XKB keymaps for cz and sk (#4634, 4637, Kamil Toman). + 554. Updates for the iso8859-2 Compose file (#4634, Kamil Toman). + 553. Check V_CSYNC in the r128 driver, and fix building with R128_DEBUG + enabled (#4631, Michel Dänzer). + 552. Mesa 3.4.2 (and later) import. + 551. More build & warning fixes (Marc La France). + 550. Fix bug that caused hardware cursors to be temporarily moved during mode + switches (Marc La France). + 549. Optimise HARDWARE_CURSOR_AND_SOURCE_WITH_MASK case (Marc La France). + 548. Move xf86CursorScreenRec definition into xf86CursorPriv.h + (Marc La France). + 547. Fix BIOS retrievals in MGA driver (Marc La France). + 546. Fix ATIProbe() for newer Rage128 and Radeon chips (Marc La France). + 545. Add temporary workaround in ATI driver for interrupts that occur on + PowerPC's upon PCI master-aborts (Marc La France). + 544. Update XDarwin to use fb and support Render (Torrey Lyons). + 543. Back out sunleo conversion to fb. This driver is too heavily dependent + on cfb32 for a simple fb conversion (Marc La France). + 542. Miscellaneous build/warning fixes (Marc La France). + 541. More prep work for SunOS (Marc La France). + 540. Fix libXft build on SunOS (Marc La France). + 539. Another makedepend bug fix (Marc La France). + 538. Fix use of xftcache utility during !UseInstalled builds (Marc La France). + 537. Adds #XFree86LOADER define to wrap ModuleInfo related functions + (#4654, Harold Hunt). + 536. Add an option to the SiS driver to turn off Xvideo support + (Ademar de Souza Reis Jr.) + 535. Fix FreeType bug, use MAXFONTNAMELEN (#4652, Janusz Gorycki, + Juliusz Chroboczek). + 534. Fix hw/vfb for compilation on Cygwin/XFree86 (#4655, Harold Hunt). + 533. Fix some Sparc platform issues with Pci resources and the glint + driver (#4641-4641,4644-4648 David S. Miller). + 532. Update glide, imstt, newport, rendition, suncg14, suncg3, suncg6, + sunleo, suntcx, vga and vmware to use fb and support Render + (Keith Packard). + 531. XDarwin fixes: + - Turn off building non-functional RENDER support. + - Reduce disappearing cursor problems when switching with Dock. + - Top of X display is no longer occasionally drawn black when + switching from Aqua. + (Torrey Lyons). + 530. Update freetype2 bits to 2.0.2 version (Keith Packard). + 529. Re-fix the Trident Video scaler support for Blade series chips + (Alan Hourihane). + 528. Fixed lbx to handle endian swapping without core dump (Egbert Eich). + 527. Fixed MTRR region splitting (Egbert Eich). + 526. Cleaned up option handling in int10 code (Egbert Eich). + 525. Added options to specify the Video BIOS to use for POSTing a + chipset (Egbert Eich). + 524. Trident driver: added call to BIOS to enable unstretched mode when + display is stretched. This should make the option "CyberShadow" + obsolete. (Egbert Eich). + 523. Attempt to fix video Support on Trident driver (Egbert Eich). + 522. Added VBE DDC support to SiS driver (Egbert Eich). + 521. Fixed Silicon Motion to unblank the display when driver fails + in PreInit() (Egbert Eich). + 520. Cleaned up handling of 'shadow status' in Savage driver + (Egbert Eich). + 519. Savage driver: fixed lockups for Savage4 when loading colormap, + manipulating the HW cursor, doing certain blit operations + 518. Cleanded up DDC code in mga driver (Egbert Eich). + 517. Fixed KGA handling in i740 driver (Egbert Eich). + 516. Converted i740 and Silicon Motion drivers to fb (Egbert Eich). + 515. Added calls to vbeFree() or xf86FreeInt10() to C&T, glint, + mga, neomagic, nv, s3v, tdfx and trident drivers to clean up + shared memory segments (Egbert Eich). + 514. Reworked video support in C&T driver, cleaned up block handler + (Egbert Eich). + 513. C&T driver: introduced a delay when setting the cursor image for + the first time after a mode change (Egbert Eich). + 512. Fixed R128CCE_RESET in r128 driver to do a reset only when dri + is enabled (Egbert Eich). + 511. Rewrote readPciBIOS() and getValidBIOSBase() (Egbert Eich). + 510. Fixed xf86Info structure in xf86Globals.c to match prototype + (Egbert Eich). + 509. - + 508. Fix XDarwin install problems with DESTDIR handling and with soft links + to the XtAppAddTimeOut manpage (Christoph Pfisterer). + 507. Add Error message output in Cygwin/XFree86 (#4632, Harold Hunt). + 506. Fix xdm when HasPam defined, and enable Pam support on Solaris 2.6 and + later (#A.401, #A.402, #A.403, Rainer Orth). + 505. Add Croatian keyboard for xkbcomp from Slovenian keyboard layout + (#A.405, Vlatko Kosturjak). + 504. Fix XvQueryAdaptors when there is no adaptors found + (#A.394, Jamie Strachan). + 503. Remove a stray INCLUDES in Xmuu/Imakefile when snprintf isn't used. + Set the Permedia2 DAC Mask to 0xFF. + PCI ROM space address access patch for LynxOS PPC. + Change limit of motoppcBusAddrToHostAddr for LynxOS PPC. + Include for LynxOS in os/osinit.c. + Define CBAUD, when it's missing in xterm, on LynxOS. + (#A.387, Stuart Lissaman). + 502. Add SiS 86C204 to xf86PciInfo.h (#A.382, Carlos Manuel Duclos Vergara). + 501. Fix mga font corruption problems introduced with the recent addition + of big-endian support (#4629, Andrew C. Aitchison). + 500. Update for the mga driver's man page (#4628, Andy Isaacson). + 499. Add more drivers to the default build on Linux/mips (#4623, + Guido Guenther). + 498. Move the vgahw module load/init after the PROBD_DETECT handling + in the i810 driver's PreInit(), which fixes a segv when using + the X server's -configure option (#A.378, Leandro Martelli). + 497. Fix a problem with Radeon VE cards failing to enable its video output + (#A.376, Paul Stewart). + 496. Fix some DRI-related build dependency problems (David Dawes). + 495. Fix some drivers (including tdfx, r128, radeon, ark, imstt) that weren't + respecting the Virtual resolution requested in the config file + (David Dawes). + 494. Fix some offscreen memory calculation/allocation problems in the + tdfx driver (David Dawes). + 493. Fix a bug in localResizeOffscreenLinear when checking widths + (Alan Hourihane). + 492. Update Japanese localization for XDarwin Dock related fixes + (Toshimitsu Tanaka). + 491. Fix restoring of text mode fonts on Permedia3 (Alan Hourihane). + 490. Provide workaround for an apparent bug in Mac OS X 10.0.2 that causes + XDarwin to lose the cursor when switching to X using the Dock icon. + Fix "Application not responding" message in XDarwin's popup Dock menu + (Torrey Lyons). + 489. Hardware cursor documentation update (Marc La France). + 488. XVideo extension support in ATI driver for generic (e.g. v4l) adapters + (based on a patch by Ignacio Garcia Etxebarria). + 487. Fix ATI driver bug that caused the hardware cursor to move after mode + switches (Marc La France). + 486. Fix off-by-one error in screen positioning after a mode switch + (Marc La France). + 485. Backout part of 479 and implement a proper fix in the ATI driver + (Marc La France). + 484. Fix palette problem on NVIDIA Riva128 in DGA mode (Mark Vojkovich). + 483. setxkbmap patch that: + - fixes bug in comand line parser + - makes debug output more comprehensive + - prevent to use 'variant' from previous call if 'layout' name changed. + (#4627, Ivan Pascal) + 482. Documents Xaa specific options in the XF86Config manual page + (#4616, Branden Robinson) + 481. Add Mouse 3 Button emulation to Cygwin/XFree86 (#4626, Harold Hunt, + Alexander Gottwald). + 480. V4L documentation fix (Marc La France). + 479. Fix bug in generic hardware cursor RealizeCursor entry + (Marc La France). + 478. Extend the XFree86-VidModeExtension to accept gamma ramps from the + client rather than just rgb gamma values (Mark Vojkovich). + 477. More Xv updates for the Permedia3 (#4625, Sven Luther). + 476. Build Cygwin/XFree86 with -ansi -pedantic (Alan Hourihane). + 475. Limit the number of PCI buses to 128 on ix86 (Marc La France). + 474. More fixes for the handling of unassigned PCI bases (Marc La France). + 473. Fix option handling in most drivers so that per-screen options work + correctly (David Dawes). + 472. Resync with DRI CVS trunk (VA Linux Systems). + 471. Import latest Mesa 3.4.x branch. + 470. Add a PIOOffset value plus readEnable and writeEnable function pointers + to the vgahw rec. The former allows vgahw to be used for VGA registers + that are shadowed in I/O space. The latter allow the VGA_ENABLE + register to be accessed in similar way to most other VGA registers. + Add vgaHWEnable() and vgaHWDisable() functions (David Dawes). + 469. Disable HWcursor for CyberBladeXP chips (Alan Hourihane). + 468. Fix a Trident Cyber9388 setup issue (Alan Hourihane). + 467. Fix man page building and installing on Darwin. To be safe we assume + the Darwin file system is case insensitive since one common variety is, + ie. HFS+ (Torrey Lyons). + 466. Improve interoperability between Aqua pasteboard and X cut buffer with + XDarwin (Gregory Parker). + 465. Updates for Cygwin/XFree86 (Harold Hunt). + 464. Provide more robust default preferences for XDarwin (Torrey Lyons). + 463. Remove map84 keyboard map from Cygwin/XFree86 build (#4621, Harold Hunt). + 462. Disable xload on Cygwin/XFree86 (Alan Hourihane). + 461. Remove an errorneous i++ from os/xdmcp.c with -class (Alexander Gottwald). + 460. Allow Cygwin/XFree86 to build with cygipc support (Alan Hourihane). + 459. Small XDarwin fixes: + - Don't leak IOService objects when searching for desired screen. + - Eliminate chance of SIGPIPE while shutting down. + - Revert to Aqua cursor when quit by exiting main client. + - Stop console error messages when using mouse button 3. + (Torrey Lyons and Christoph Pfisterer). + 458. At Linus' request, make linux/int10 module deal with shmat() errors + (Marc La France). + 457. Fix makedepend's integer value parsing and make it understand GCC's + #include_next directive as found in glibc & libc5 (Marc La France). + 456. Xterm patch #156 (Thomas Dickey): change preference of types for + selection-target between UTF8_STRING and STRING (Juliusz Chroboczek), + fixes for configure script and documentation (report by Adam + ). + 455. Fix XDarwin so display number preference is followed (Torrey Lyons). + 454. Fix Xserver/Imakefile for Cygwin/XFree86 (Harold Hunt, Alan Hourihane). + +XFree86 4.0.99.3 (26 April 2001) + 453. Loader fixups for Sparc's (Marc La France). + 452. Fix dependencies for libGLU on Cygwin/XFree86 (Alan Hourihane). + 451. Make xdm & xfs compile on Cygwin/XFree86 (Alan Hourihane). + 450. Update Japanese localization of XDarwin.app's Preferences window + (Toshimitsu Tanaka). + 449. Don't build clients that require extension libraries unless those + libraries are being built (#A.386, Scott A McConnell, David Dawes). + 448. Fix the BuildXinerama test in Xserver/Imakefile (#4615, Harold Hunt). + 447. Ignore MakeDllModules when DoLoadableServer isn't set (#4613, + Guido Guenther). + 446. Don't define the T compose sequences in the iso8859-1 compose + map by default (#4611, Mike Harris). + 445. Allow the nls compose data files to be pre-processed (David Dawes). + 444. Fix some problems introduced with the internationalisation of twm + (#4607, Juliusz Chroboczek). + 443. Fix dpsinfo so that the correct headers are included (#4606, + Juliusz Chroboczek). + 442. Fix mismatches between the way xlsfonts interprets font properties and + the way they are defined in the XLFD spec (#4604, Jochen Voss). + 441. Add entries for German iso-8859-15 locales (#4603, + Philipp Matthias Hahn). + 440. Cleanup build in Xserver/GL/mesa, making use of the earlier cleanups in + the lib/GL build (David Dawes). #4602 is redundant as a result. + 439. [SECURITY] Check for negative reply length/overflow in _XAsyncReply + (Xlib) (#4601, Mike Harris). + 438. New 'hu' xkb symbols file (#A.364, Peter Soos). + 437. Trident driver fixes for PC98 platforms (#4612, Akio Morita). + 436. Convert apm driver from cfb to fb (Alan Hourihane). + 435. Fix makedepend for '//' comment parsing and symbols that contain + expressions (Marc La France). + 434. Fix a problem with the mga G400 2nd head going into power saver mode + when it should be blanked, and enable DPMS for the 2nd head (#A.358, + Craig Leres). + 433. Fix a horizontal resolution problem that shows up with mga Xv (#A.365, + Ewald Snel). + 432. Work around a refresh rate problem when using custom modelines that + have a refresh rate > 100Hz with the Matrox HAL library (#A.360, + Ewald Snel). + 431. XDarwin fixes: + - Provide work around for kernel/driver issue on Darwin 1.3 that + causes the kernel keymapping to be empty on Mac portables. + - Command line -dpi option is no longer ignored. + (Torrey Lyons). + 430. Ensure that the X-TT module isn't built if the Xserver isn't being + built (#4594, Chu-yeon Park). + 429. Make xconsole try to reopen the /dev/xconsole pipe when it gets an EOF + (#4593, Jeff King). + 428. Prevent an infinite loop (or unpredictable behaviour) in xmodmap (#4592, + Peter Maydell). + 427. Add a font substitute for the zh locale (#4590, submitted by Branden + Robinson). + 426. Make the backspace key definitions for the xkb macintosh/us and + dvorak layouts consistent with the default 'us' layout (#4588, 4589, + Branden Robinson). + 425. Update for the sessreg man page (#4587, Branden Robinson). + 424. Add a font substitute for the ko locale (#4586, Changwoo Ryu). + 423. Avoid using fileno() in xauth's signal handler, and write messages to + stderr rather than stdout (#4585, submitted by Branden Robinson). + 422. Fix nested comment warnings in dix/gc.c (#4584, Branden Robinson). + 421. Include in two lbxutil files to get malloc/free prototypes + (#4583, submitted by Branden Robinson). + 420. Remove duplicate paragraph in xdm man page (#4582, Branden Robinson). + 419. Fix line numbers in error messages when parsing .twmrc files (#4580, + Topi Miettinen). + 418. Fix backwards font glyphs in the ati/Mach64 driver for big endian + platforms (#4579, Michael Dänzer). + 417. Add a build-time option to xf86config to make it append the major version + number to the config file name (David Dawes, prompted by #4577, + Branden Robinson). + 416. xf86config build fix for non-GNU make (Marc La France). + 415. Build fix for Summa driver on SunOS/Sparc (Marc La France). + 414. compiler.h cleanup (Marc La France). + 413. More DependDefines, OS_DEFINES and EXT_DEFINES build fixes + (Marc La France). + 412. Fix installation of specs docs (#4575, Branden Robinson). + 411. Make Cygwin/XFree86 call miSetPixmapDepth for RENDER extension + (Alan Hourihane). + 410. Xterm patch #155 (Thomas Dickey): correct change to return-type of + in_put(), which caused problem with UTF-8 (fixed by Bruno Haible). + 409. Some unobstrusive preparations for SunOS/Sparc (Marc La France). + 408. Remove unnecessary libxf86_os link into Xnest & Xvfb (Marc La France). + 407. Disable building of SuperProbe by default (Alan Hourihane). + 406. Make OS_DEFINES available to all server Makefiles (Marc La France). + 405. Add support to xman for parsing '\" formatting hints. + Also cleanup some of the vendor-specific definitions and fix + processing of mandoc pages on FreeBSD (based on #4573, + Branden Robinson, David Dawes). + 404. Fix default mailbox selection in xbiff for Linux, add recognition of + $MAIL, and update the man page accordingly (based on #4571, + Branden Robinson). + 403. Remove redundant PCI id definitions in the tdfx driver, and clean up + the messages printed when the DRI can't be enabled because the bpp + isn't supported (based on #4570, Branden Robinson and #4598, + Antti Tapaninen). Also, re-enable soft booting. + 402. Install the XftConfig file under $(CONFDIR), with a link from the + usual place (based on #4569, Branden Robinson). + 401. Update the Debian section on linux.cf (#4568, Branden Robinson). + 400. Startx fixes/enhancements, including: + - Fix argument processing. + - Set XAUTHORITY. + - Don't overwrite existing cookies, and remove ones added for this + session when exiting. + - Deallocate the VT that X was using. + - Update the man page. + (based on #4567, Branden Robinson, Henry T. So, Jr). + 399. Implement two new driver-provided options in the common cursor code and + use them to work around hardware bug that causes flickering Mach64 + hardware cursors (Marc La France). + 398. Integrate SiS driver changes (Ademar De Souza Reis). + 397. Initialize Elsa GloriaXXL (GLINT) framebuffer properly (Alan Hourihane). + 396. Fix bug where XDarwin.app would not hide the X display when it was no + longer the active application (Torrey Lyons). + 395. Make XDarwin.app ignore .xserverrc file when started from the GUI so + that it starts correctly (Torrey Lyons). + 394. Cygwin updates (#4557, 4558, 4563, Suhaib Siddiqi). + 393. Document the usage of the -server option in the xfsinfo man page (#4562, + Mike Harris). + 392. Fix xfs man page problem (#4561, Mike Harris). + 391. Fix a crash that happens when a font encoding has no aliases and it is + invoked using a non-canonical name (#4560, Takeshi Miyasaka). + 390. Add imake/config support for distinguising big endian and little endian + MipsArchitecture types (#4556, Florian Lohoff). + 389. Add support to the mga driver for auto-detecting the display type + (#4555, Stephane Duguay (Matrox)). + 388. Savage driver updates, including: + - Enable the Render extension. + - Make the DGA mode setup look more like the other drivers. + - First cut at Xvideo for the Savage4. + - Add a "ShadowStatus" option, which is a reliable workaround for the + scrolling hang that many experience. + (#4554, Tim Roberts). + 387. Enable wide character support for NetBSD 1.5P and later (#4553, + Matthias Scheler). + 386. Add offscreen image support to the i810 driver (for Xv), and fix + physMemBase (#4552, Matthew Sottek). + 385. Fix bad cut&paste update to the sunffb driver (#4551, David S. Miller). + 384. Fix "DriDrivers" typo in the sparc section of xfree86.cf (#4550, + David S. Miller). + 383. Update UCS 75dpi and 100dpi fonts, including adding UCS versions of + the UTBI and UTB fonts that were in the unnec_75dpi and unnec_100dpi + directories. The other "unnec" fonts are also moved over (#4548, + Markus Kuhn). + 382. Make the v4l driver module keep searching for more devices if the first + one can't do overlay (#4545, 4614, Gerd Knorr). + 381. Bug fixes for Xv support using a Permedia3 chip (#4564, Sven Luther). + 380. Xterm patches #151, #152, #153, #154 (Thomas Dickey): + - improve select/paste of COMPOUND_TEXT and UTF8_STRING (Juliusz + Chroboczek, Bruno Haible). + - fixes for erase operations (Alexander V Lukyanov). + - correct ifdef for bold overstriking when built to support UTF-8. + - change resource corresponding to "-T" option to match Xt library's + "-title", i.e., ".title" rather than "*title" so the command-line + options are interchangeable as documented (Debian bug report #68843). + - modify "RequestResize()" function to save/restore window manager hints + (Debian bug report #79939). + - improved error checking for input-method initialization. + - minor fixes for terminfo entries. + - various build/portability fixes. + 379. XDarwin fixes: + - Don't SetUID XDarwin X server. (The IOKit doesn't need it.) + - Startup message reports correct display mode. + - XDarwin.app is now installed in /Applications by default. + - Update xinit server name list. + - "make clean" now works for a non-root user. + (Torrey T. Lyons) + 378. Make XDarwin correctly handle color hardware cursors in Quartz mode + (Gregory Parker). + 377. Fixes to the XDarwin application: + - Display menubar when started without a splash screen. + - Query before quitting from Aqua when started with startx. + (Torrey T. Lyons). + 376. Update Japanese localization for XDarwin application (Toshimitsu Tanaka). + 375. Fix byte ordering and static colormap issues with XDarwin server + on x86 hardware (Rob Braun). + 374. Fix problems with XDarwin hardware cursor support in Quartz mode + (Gregory Parker). + 373. Resync with DRI CVS trunk (VA Linux Systems). + 372. Fix bug in XvMC protocol (Bob Paauwe). + 371. Ensure NoInt10 is used for PC98 (Alan Hourihane). + 370. Fix PC98 issues with the trident driver (#4547, Akio Morita). + 369. Add a NoInt10 option to the int10 module, allowing it to be disabled + per entity (Alan Hourihane). + 368. Fixes to the XDarwin application: + - X clients are now started correctly. + - Shuts down cleanly. + - Removed erroneous NSString releases in quartzCocoa.m. + - Dragging with mouse button 3 or higher depressed produces events. + (Christoph Pfisterer and Torrey Lyons) + 367. Make the ramdac module for the IBM RGB640 DAC work at depth 15 + (Alan Hourihane). + 366. Fix interference between acceleration and hardware cursors on Mach64 + variants (Marc La France). + 365. Fix xload so it is functional on Darwin OS (Rob Braun). + 364. Mac OS X specific fixes: + - Fix typo in XDarwin startup program that could cause crash with + many command line options. + - Move Show/HideMenuBar() call to main thread so that XDarwin + application displays a menu bar on the Mac OS X desktop. + (Greg Parker). + 363. XDarwin application fixes including: + - Fix bugs causing XDarwin preferences to not be saved correctly. + - When using system beep, turn off bell when beep volume is set to 0. + (Christoph Pfisterer). + 362. Fix building of dpsops.h and psops.h in correct order (Alan Hourihane). + 361. Change xvmc.h to xvmcext.h to avoid case-(in)sensitive name clash with + XvMC.h for Cygwin/XFree86 (Alan Hourihane). + +XFree86 4.0.99.2 (6 April 2001) + 360. Fbdev driver updates, including: + - Switch from shadowfb to mishadow. + - Add RENDER extension support. + - Add DGA support. + - Fix SaveScreen function + - Blank screen in ScreenInit so the former framebuffer contents aren't + visible + (#4544, Michel Dänzer). + 359. Remove references to th_TH compose file from compose.dir (#4543, + Theppitak Karoonboonyanan). + 358. Fix for improper setting of the maxHValue limit in the tseng driver. + This makes modes like 1152x864@24bpp possible (#A.355, Stanislav Brabec). + 357. Fix a hw cursor related lockup that shows up with some mga G400 + 16MB OEM single head cards (#A.351, Ewald Snel). + 356. Fix the XKB macintosh/it mapping (the accent-related keys were wrong) + (#A.349, Andrea Ghirardini). + 355. Add XKB descriptions for the extra keys on a Chicony internet + keyboard (#A.356, John Gladkih). + 354. Add support for the internal input device interface to mice on + Solaris 8, and make it the default protocol ("VUID") (#A.340, + Marcus Comstedt). + 353. Add XKB descriptions for the extra keys on an IBM Rapid Access II + keyboard (#A.332, Patrick D'Cruze). + 352. Fix a typo in xvidtune (#A.327, Peter Breitenlohner). + 351. Fix Linux/libc5 build problem in the bigfont extension code (#A.327, + Peter Breitenlohner). + 350. Fix typo in Chooser.ad (#A.327, Peter Breitenlohner). + 349. Big endian and PowerPC support for the mga driver (#4540, Ani Joshi). + 348. Big endian support for the tdfx driver (#4539, Ani Joshi, + Nicolas Dimitrijevic). + 347. Build the tdfx and imstt drivers on PowerPC platforms (#4538, Ani Joshi). + 346. Add IMS (Integrated Micro Solutions) PCI data for the TwinTurbo128 + and TwinTurbo3D (#4537, Ani Joshi). + 345. Fix some color and accel glitches in the imstt driver (#4536, Ani Joshi). + 344. Add ISA I/O support for PowerPC Linux using the __NR_pciconfig_iobase + syscall (#4535, Ani Joshi). + 343. New Xwin server code from the Cygwin/XFree86 project. This version + is more portable across Win32 platforms. Changes include: + - Use fb and shadowfb, and use the faster of GDI blitter, + DirectDraw blitter and DirectDraw4 blitter to update damaged + regions. The video card's framebuffer is no longer mapped. + - Works correctly at depths > 8, but colors are not correct at depth 8. + - Uses the standard Win32 API messages for processing keyboard and + mouse input rather than using DirectInput. This is more reliable. + - Improved internal structure and coding conventions. + - Builds completely from the XFree86 tree using gcc (the Visual C++ + compiled xf_dx.dll is no longer used). + - The new server can run on machines that don't have DirectDraw/DirectX + installed (or installed but not operable) by falling back to the + GDI blitter. The best drawing interface is determined at startup, + but this can be overriden with the -engine command line option. + - The Xrender extension is now supported. + - Command line option is available to run in full screen mode. + (#4531, 4532, 4534, Cygwin/XFree86 project including Harold L Hunt II, + Suhaib M Siddiqi, Dakshinamurthy Karra, Peter Busch). + 342. v4l driver bug fixs: catch xalloc() failures, and set the depth + correctly for the VIDIOCSPICT ioctl (#4530, Gerd Knorr). + 341. Add a driver for VMware virtual SVGA devices. This is for use + by X servers running under a VMware guest OS (#4529, VMware, Inc). + 340. Remove Cygwin-specific #ifdef in Xserver/os/Waitfor.c, which fixes + a crash (#4528, Suhaib Siddiqi). + 339. Cygwin build fixes (#4527, Suhaib Siddiqi). + 338. Updates to the "citron" input driver. It includes compatibility + with the Winbond SIO chip (83977EF), and some new commands to + communicate to the touch driver from an application program + (via XChangeFeedbackControl) (#4526, Peter Kunzmann, Citron). + 337. Updates to the "summa" input driver, including: + - "Resolution" replaces "LPI" as option for setting resolution. + - Fixed device reporting to give the actual tablet area size and + resolution. + - Tested and working with: SummaSketch3, Hitachi_1217D, a couple of + others emulating the Summa protocol. + - Reduce debug message verbosity. + - Various cleanups. + (#4525, Huver). + 336. SunFFB driver bug fixes, including: + - Be smarter about restoring Kernel framebuffer state. + - Cure build errors when debug defines are enabled. + - Do not enable DRI or DGA acceleration if NoAccel option is specified. + (#4524, David S. Miller). + 335. Mga G450 dual head support, (#4523, Luugi Marsan (Matrox) and + David Woodhouse). + 334. Fix missing xfree -> Xfree mapping in the Type1 font library code (#4521, + Juliusz Chroboczek). + 333. Make sure that an initialization assumption in parse_fontdata() in + lib/X11/omGeneric.c is met (#4520, Jonathan Kamens). + 332. Add checksum verification to detect monitors that give incorrect EDID + data (#4517, Andrew C Aitchison). + 331. Fix checking of LD_ELFDLOBJECT on big-endian systems (#4514, + Guido Guenter). + 330. Add an update.fonts target/rule for maintainer use to update + the latin1 fonts in the source tree that are derived from the + ISO10646-1 masters (David Dawes). + 329. Update UCS misc fonts, which includes the addition of the missing + 4 DEC VT100 graphics characters from Unicode 3.2 (#4533, Markus Kuhn). + 328. Handle build-time generation of 8 bit fonts from the UCS versions, + rework the way this is organised, and allow some better control over + which fonts are built/installed (David Dawes). + 327. Add UCS versions of most of the 75dpi and 100dpi bdf fonts, and generate + 8-bit subsets of them. Also, remove the now-redundant latin2 + bdf font directories (#4512 Markus Kuhn). + 326. Add support for Trident CyberBladeXP and CyberBladeXPm (mobile) + (Alan Hourihane, Robert V Fleisig). + 325. Add XKB descriptions for the extra keys on an IBM Rapid Access keyboard + (#4510, Dennis Bjorklund). + 324. Update Status and i810 docs to mention i815 support and FreeBSD support + (#4509, Andrew C Aitchison, David Dawes). + 323. Xprt fixes to make it closer to X.org version (Danny Backx). + 322. Fix for reading PCI resource data on Linux/alpha (#4508, + Ivan Kokshaysky). + 321. Add XKB descriptions for the extra keys on a "Logitech Internet Keyboard" + (#4505, Matthew Hand). + 320. Build shared libGL and DRI client modules on Linux without PIC for + performance reasons. + 319. Updates to glxinfo (Brian Paul). + 318. Add glxgears (Brian Paul). + 317. glxinfo needs libGLU (Marc La France). + 316. Rage128 fix to Cards database (Marc La France). + 315. Minor fix to PCI resource overlap handling (Marc La France). + 314. Loader code simplification and IA-64 cache flushes (Marc La France). + 313. Workaround in the ATI driver for troublesome interaction between loader + and compiler optimisation (Marc La France). + 312. Warning fixes for `gcc -fno-builtin`, which appears to be the default on + some systems (Marc La France). + 311. Add glyph transformations to Xft (Tuomas J. Lukka) + 310. Add XftCache creation to fonts/Type1 (Keith Packard) + 309. Add Xmuu library for non-Xt/Xaw dependent applications (Jim Gettys) + 308. Add i810 and Xv support to kdrive (Pontus Lidman) + 307. Fix Radeon CPUToScreen acceleration on Alpha platforms (Jay Estabrook). + 306. Fix bug in ServerLayout option handling when there's no ServerFlags + section present (David Dawes). + 305. Allow fb to access 16bit devices (Alan Hourihane). + 304. XvImage support for GeForce chips in the nv driver (Mark Vojkovich). + 303. XvMC build fix (Marc La France). + 302. Fix recently introduced bug in xf86cfg (Marc La France). + 301. Re-instate warning fixes clobbered by DRI merge (Marc La France). + 300. Ignore disabled non-video PCI ROMs (Marc La France). + 299. Hardware cursor implementation for Mach64 variants (William Blew, + Ani Joshi, Marc La France). + 298. Some endianness fixes in the ATI driver (incomplete) (Marc La France). + 297. Fix MMIO ordering problems for Mach64 acceleration (Marc La France). + 296. Fix ATI driver behaviour when it finds the LCD panel has been disabled + on entry (Marc La France). + 295. Fix ECP clock for GATOS (Vladimir Dergachev). + 294. Undo part of CHANGELOG 36 (Marc La France). + 293. Rework the building of libGL and the DRI drivers (David Dawes). + 292. Update greek keyboard layout and compose map. + (#4513, Katsaloulis Panagiotis) + 291. Fix problems in Xnest when MouseKeys is enabled and patched it to + use XKB to allow clients to change keyboard description and + configuration whithout interfering with the "real" X server + (Paulo César Pereira de Andrade). + 290. Dvorak keymap fix (#A.343, J Phillips). + 289. Some vesa driver updates, including: + - Wrap CloseScreen(). + - Call xf86PrintModes(). + - Add error messages for when PreInit bails out for lack of modes. + - Rework how the debugging information is printed. + _ Avoid some build warnings. + (David Dawes) + 288. Make it possible to call xf86PrintModes() when there is no hsync or + refresh data available, like from the vesa drivers (David Dawes). + 287. Add a "cleanlinks" script for cleaning up dangling links in lndir-created + shadow trees (David Dawes). + 286. Resync with DRI CVS trunk (VA Linux Systems). + 285. Make extension headers available when the extension is enabled but the + extension's client library is disabled (David Dawes). + 284. Make it possible to enable building selected extension libraries + when BuildServersOnly is set, and allow independent control of + building docs and clients (David Dawes). + 283. Import latest Mesa 3.4.x branch. + 282. Lower the default fifo threshold for PM3 chips (Alan Hourihane, + Rafael Barbalho, 3DLabs). + 281. Fix 3DLabs GLINT driver for use the Flat Panels, use the UseFlatPanel + option. Tested with the SGI 1600SW and Permedia3 board (Alan Hourihane). + 280. Fix glxinfo to query default display (Alan Hourihane). + 279. Convert TGA driver to use fb (Alan Hourihane). + 278. Fix XTRAP typo in miinitext.c (Damien Touraine). + 277. Major updates to the XFree86(1) man page (David Dawes). + 276. A new (perl) version of the mkhtmlindex script that works better than + the shell version (David Dawes). + 275. Fix the `make depend` scripts to accept -U flags and not require a blank + in their -f flag (Marc La France). + 274. Bump the video and input driver ABI minor numbers. + 273. Add xf86SetRealOption() (Huver). + 272. Change Xdarwin do that it processes all pending events instead of + just the oldest one on ProcessInputEvents() call , + Quit Xdarwin cleanly, wether from the Xserve or from Cocoa front end, + Fix a case typp which cases the Xdarwin server not to start if + installed on a case sensitive file system like UFS. + (#4504, #4507, #45011, Gregory Parker, Torrey T. Lyons). + 271. Move Section DRI/Endsection into the DRI function to be consistant with + all of the other sections. (Quentin Neill) + 270. Made xf4bpp code moer 64bit clean (still doesn't work on Alphas) + (Egbert Eich). + 269. Removed disable/enable interrupt call on ia64 platforms. + The machine instruction is privileged and not permitted in user space + (Egbert Eich). + 268. Improved mode setting in Trident driver; added code to ValidMode + to reject any modes whose size is larger than the physical LCD + size if LCD is enabled (Egbert Eich). + 267. Modified error message in TDFX driver to give user a clue how + to avoid error (Stefan Dirsch). + 266. Fixed appearant typo in SMI driver (Egbert Eich). + 265. Changed Savage driver to unmap memory when exiting PreInit() and + maps it on every call to ScreenInit() (Egbert Eich). + 264. Changed handling of failed vbe call in rage 128 driver. + No the driver doesn't fail any more (Egbert Eich). + 263. Integrate the currently Panix-specific keycodes into atKeynames.h, + since they're not really Panix-specific (David Dawes). + 262. Fix problem with a NULL pointer in Xv Xineramification (Benjamin Monate). + 261. Bug fixes and improvements for mouse 3 button emulation state machine + (Andrew Pimlott). + 260. Updates for Hurd support (#A.324, Marcus Brinkmann). + 259. Add call to setlocale() in xev (#A.322, Eugene B. Byrganov). + 258. Add support fo the charset Big5HKSCS to the X-TrueType module, as + well as some basic XLocale support for it (#A.321, Roger So). + 257. Fix core dump in XqueueMousePreInit (#A.317, Fiel Cabral). + 256. Allow the mga driver's "DigitalScreen" option to work for the first + head (#A.297, Niels Gram Jeppesen). + 255. Add zh_CN.GBK locale support (#A.293, Yong Li). + 254. Fix a problem with the ThinkingMousePS/2 protocol handling of left + movement (#A.292, Ian Remmler). (This has been in 3.3.x since 3.3.4.) + 253. Make xdm Xinerama-aware so that it can avoid splitting login and + chooser windows across physical screens (#A.276, + Dmitry Yu. Bolkhovityanov). + 252. Fix a resource allocation bug in the DBE code (#A.271, Bill Rugolsky). + 251. Only enable Xv support for the 630 in the sis driver (#A.263, Nick Lamb). + 250. Modify the sis driver to prefer 24bpp framebuffer layout. Perhaps not + all support 32bpp? (#A.263, Nick Lamb). + 249. Add missing byte to Intellimouse init string, which fixes problems + that show up with some KVM switches (#A.258, Seung-Hyeon Rhee). + 248. Some DRM module fixes for FreeBSD 5-current (#A.242, Andrew Atrens). + 247. Fix xterm build on Solaris 2.5.1 (based on #A.282 from mark at zang.com). + 246. Make the Linux/PPC "custom keycodes" choice a run-time option instead + of a build-time option (#A.240, Franz Sirl). + 245. Add support to splitting WC MTRR regions on Linux when the regions is + not aligned on a size boudary (#A.238, _Usul John Obscurant). + 244. Add Acecad support to the "summa" input driver (#A.237, Arpad Gereoffy). + 243. Don't try to map 64K blit window aperture on older trident chips + (Alan Hourihane). + 242. V4L driver cleanups and Xineramification (#4502, Gerd Knorr). + 241. Make the X server and the Mac OS X front end run in a single process. + Other build fixes for Darwin (#4500, #4501, the XonX team). + 240. Don't build xf86config under BuildServersOnly (Marc La France). + 239. Potential fix for DGA apps that set colourmaps the normal way rather than + through DGA (Mark Vojkovich, Marc La France, Pontus Lidman). + 238. Make fstobdf generate correct ATTRIBUTES fields (Ishikawa Mutsumi). + 237. Xt man page updates (Paul Vojta). + 236. Plug kernel security hole in Linux int10 (Marc La France). + 235. Fix Xnest build for newest gcc versions (Marc La France). + 234. Fix typo in Xv Xinerama support (Gerd Knorr). + 233. Fix a problem with multi-thread support on OpenBSD (released OpenBSD + versions don't have getpwuid_r) (Matthieu Herrb) + 232. Allow to compile on OpenBSD-current which has completly removed PCVT + from its installation. (Matthieu Herrb) + 231. Support for ThreadedX on FreeBSD (FreeBSD ports patch-xthread). + 230. Updates for console-related FreeBSD system header changes as of 4.1-REL + (FreeBSD ports patch-r, patch-s). + 229. Don't leave free'd vrotate uninitialised in lib/X11/omGeneric.c + (FreeBSD ports patch-q). + 228. Protect #define HasPam in FreeBSD.cf (FreeBSD ports patch-d). + 227. Fix border garbage for the G400 second head by backing out #4205 + (David Dawes). + 227. Fix a typo in fonts/util/Imakefile (#4499, Juliusz Chroboczek). + 226. Add a document describing the DPS code included in the tree, and + pointers to web resources (#4498, Juliusz Chroboczek). + 225. Use VBE to add runtime DDC support to the i810 driver (#4496, + Andrew C. Aitchison). + 224. DRM kernel module updates for FreeBSD (#4493, joe at cracktown.org). + 223. Add support for the "Internet" keys of the Genius Comfy KB-16M keyboard + (#4491, Kamil Toman). + 222. Include three DPS sample clients: + - dpsinfo: random info about the DPS extension; + - dpsexec: interactive DPS ``executive'' (command-line); + - texteroids: a demo of font support. + (#4489, 4497, Juliusz Chroboczek). + 221. Don't build the GLU library when not building GLX. This fixes + a build failure when GLX is disabled (#4488, Juliusz Chroboczek). + 220. Make the stub files that pswrap generates contain the same set of + includes as the Adobe version, which fixes problems building + standalone DPS clients (#4487, Juliusz Chroboczek). + 219. Fix setxkbmap bugs, including: + - Continue working if the appropriate root window property where the + current xkb settings are saved can't be read or interpreted. + - Make the -keymap option work. + - Update the man page to explain how the "-option" option works. + - Add primitive sanity checking for 'map name'. + (#4482, Ivan Pascal). + 218. Fix a server crash while reading DDC data from EDID2 capable monitors + (#4481, Andrew C Aitchison). + 217. Updates to Thai support, including: + - Fix a bug combining characterw with Shift keys. + - Remove the th_TH Compose file so that Thai XIM is/can be(?) activated + without needing XSetLocaleModifiers(). + - A more precise context-sensitive input sequence check using + XNStringConversionCallback added. This has been tested with + xiterm+thai-1.04pre2. The implementation detail might be changed + if found inconsistent with the X11 specification. + (#4478, Theppitak Karoonboonyanan). + 216. Update ucs2any.pl, and replace the special map-* files with the + original mapping files from ftp.unicode.org. Changes include: + - A bug has been fixed that caused sometimes the FONT property not + to be updated correctly. + - The FONTBOUNDINGBOX is now recalculated, which makes the script + also suitable for proportional fonts. + - The mapping table for the DEC VT100 graphic characters is now built + into the script. This means the special map-* files are not necessary + any more and they could be replaced with the original mapping files + found on ftp://ftp.unicode.org/Public/MAPPINGS/ + - Whether the DEC VT100 graphic characters are added can be controlled + with options +d/-d. Default is to add them for upright charcell fonts + only. + - Slightly improved warning messages. + (#4472, Markus Kuhn). + 215. Fix libGLU build problem on Cygwin (#4467, Suhaib M. Siddiqi). + 214. Fix missing libX11 exported symbols for Cygwin (#4467, + Suhaib M. Siddiqi). + 213. Updates for Hurd support (#A.209, Marcus Brinkmann). + 212. Fix some mis-placed mem_barrier's for Alpha platforms (Jay Estabrook). + 211. Fix a Index/DAC register access in glint PM2v, PM3 driver. + (#A.319, Romain Dolbeau). + 210. Add Xv support to Permedia3 driver (#4480, #4486 Sven Luther). + 209. Support for NVIDIA GeForce3 (Mark Vojkovich). + 208. Allow GccWarningFlags overrides on Linux (Marc La France). + 207. Fix a problem with xvinfo's listing of image formats + (Giridhar Pemmasani). + 206. Fix bug in XkbSetNamedDeviceIndicator (XkbSetNamedIndicator). This + function can be used both for change state of specified indicator + (on/off) and for change description (and so behavior) of indicator. + Fix bug (in XkbGetPerClientControls). Typo where subroutine apply bit + mask (that consist of bitwise OR of three separate masks) to value + that have to be returned (#4474, Ivan Pascal). + 205. Setxkbmap can crash X server if one specify some illegal string as + 'xkb variant' name (#4471, Ivan Pascal). + 204. In Grab mode XKB sends 'state' in key events without 'group info' + (keyboard map layout) (#4469-4470, Ivan Pascal). + 203. Rewrite the X-Video extension's Xineramification (Mark Vojkovich). + +XFree86 4.0.99.1 (19 February 2001) + 202. Gamma correction and DirectColor visual support for NVIDIA RIVA TNT + and newer chipsets (Mark Vojkovich). + 201. IA64 fix for generic int10 code (Egbert Eich). + 200. Redadding space as delimiter in locale.alias and locale.dir + (Egbert Eich). + 199. Modified memory debugger script to retieve backtrace information + with an unmodified version of gdb (Egbert Eich). + 198. Modified memory debugger to print out backtrace of call where + a referenced freed pointer was once allocated (Egbert Eich). + 197. Several more fixes for memory leaks and several "referenced freed" + to keep memory debugger quiet (Egbert Eich). + 196. Fixed "referenced freed" memory debugger message in xf8_24bpp code + (Egbert Eich). + 195. Add a new rule for building DRI (client) modules, so that only the + relevant symbols are exported (#4454, Red Hat). + 194. Fixed several memleaks in PCI bus code (Egbert Eich). + 193. Added code to disable SIGIO when entering SETUP state and reenable + it when leaving SETUP state (Egbert Eich). + 192. Add type of option argument as comment to config file. + (xf86cfg might need some fixing) (Egbert Eich). + (Hopefully) fixed reordering of chips so primary comes first + (Egbert Eich). + 191. Fixed bug that caused server to crash when a DGA private colormap + was freed as miSprite still had a pointer to this colormap + (Egbert Eich). + 190. Fixed savage driver for altered vbe functionality (Egbert Eich). + 189. Moved bulk of generic VBE functionality from VESA driver into + the vbe module (Egbert Eich). + 188. Fixed some bugs in vesa driver (Egbert Eich). + 187. Fixed memleaks in parser code as well as several referenced freed + pointers which pollute output of memory debugger and obsucre debugging + (Egbert Eich). + 186. Fixed ChangeWindowAttributes() in cfb8_16 code (Egbert Eich). + 185. Moved Linux specific typedef from shared/xf86AXP.h to linux-specific + os-level code (Egbert Eich). + 184. Added option to int10 softbooter to POST even primary device. + 183. Fixed memory leak in linux int10 code (Egbert Eich). + 182. Modified vm86 trap code not to fail on a #LOCK prefix byte + (Egbert Eich). + 181. Fixed memory leak in posix_tty.c (Egbert Eich). + 180. Added support to generic driver to POST even primary devices + (Egbert Eich). + 179. Added support for more AXP chipsets that require sparse addressing + to bsd os level (Egbert Eich). + 178. Added missing symbols to C&T driver (Egbert Eich). + 177. Fixed problems with Xv code in C&T driver (Egbert Eich). + 176. Fixed a vertical and horizontal offsets on HiQV chips due to + non-"standard" handling of H/VBlankEnd registers (Egbert Eich). + 175. Removed code that sets a chipset into graphics mode when + saving/restoring fonts in standard vga code. This causes problems + on some trident chipsets (Egbert Eich). [EXPERIMENTAL!] + 174. Moved KGA code that handles the H/VBlankEnd code that overscans remain + invisible to separate functions. This way drivers have better control + over these registers. + 173. TGA driver fixes (Jay Estabrook). + 172. Moved option processing to allow VGAClock option to be processed + (Egbert Eich). + 171. Added option to swap heads on a matrox G400 dual head (Stefan Dirsch). + 170. Added handling of broken planemask support on different models of + matrox G100 cards (Egbert Eich). + 169. Fixed minor memory leak in ati driver (Egbert Eich). + 168. Fixed resource registration in TDFX driver (Egbert Eich). + 167. Set new modelines for Trident LCD modes (Egbert Eich). + 166. Fixed handling of PreEnd Control register on Trident (Egbert Eich). + 165. Fixed problem with Trident Blade Mono8x8Patterns (Egbert Eich). + 164. Fixed clock division for CyberBlade E4 (Egbert Eich). + 163. Removed last static symbols from Tseng driver (Egbert Eich). + 162. Fixed handling of ICS5341 RAMDAC under 24bpp (Egbert Eich). + 161. Fixed resource registration in rendition driver (Egbert Eich). + 160. Attempt to fix various other issues on rendition - driver remains + to be broken though (Egbert Eich)! + 159. Fixed false linear size for NeoMagic 2380 (Egbert Eich). + 158. Modified calulation of aperture size in NeoMagic driver to use the + available video memory instead of the map size (Egbert Eich). + 157. Added a delay to prevent rare cases of lockups when starting + X on NeoMagic 2160 (Miles Lane). + 156. Added DGA to Cirrus driver (Egbert Eich). + 155. Missing symbols added to Cirrus driver (Egbert Eich). + 154. Fixed acceleration on Alpine (Cirrus) driver. PIO and MMIO versions of + the accelerator driver now support the same functionality (Egbert Eich). + 153. Removed unneededed call to xfree() in ddc code (Egbert Eich). + 152. - + 151. Siliconmotion driver updates, including: + - Color change/flash at 8bpp when switch back to desktop in rotation + mode. + - System hangs when enabling rotation in 24-bpp. + - Overlay disappear in the virtual desktop when move the window. + - Mouse pointer doesn't work properly in panning modes under rotation. + - Garbage appears on desktop when click the Basic/Metal for the Theme + Selector. + - Added ZoomOnLCD option. + - Desktop changes color when panning in 24-bpp mode. + - CRT is off after exit X on DSTN 800x600. + - Screen broken occurs in X when enable Rotation on DSTN 800x600. + (#4463, Frido Garritsen). + 150. Include in Xos.h to get struct tm (based on #4464, Mike Harris, + and H.J. Lu). + 149. Add 1400x1050 60Hz and 75Hz to the default built-in modes (#4462, + Tim Roberts). + 148. Create the default modes source file from the mode definitions on + systems that have perl (David Dawes). + 147. Alias memset and memcpy to xf86memset and xf86memcpy in the loader, + which should catch implicit compiler-generated calls to these functions + (David Dawes). + 146. Fix NV, Glint, ati and mga drivers for Alpha EV56 machines + (Jay Estabrook). + 145. Work around compiler-generated call to memcpy in the sis driver + (David Dawes). + 144. Fix the neomagic driver so that it saves/restores the palette (#4452, + Ken Hornstein). + 143. Fix a palette saving bug in the vgahw module (#4452, Ken Hornstein). + 142. Fix a typo in Xfbdev.man (#4446, Juliusz Chroboczek). + 141. Major updates to the savage driver, including: + - DDC support + - I2C support + - XVideo YUV overlay support for Savage/MX and Savage/IX + - DGA support + - yanks Ani Joshi's depth/bitsPerPixel patch for searching the BIOS + - fixes interactions with frame buffer and SVGATextMode consoles; + VT switching now seems quite reliable for almost everyone + - yanks unused options + - adds new options for hacks to deal with the status register hangs + - adds one special case memory configuration for Savage 4 + - adds support for doublescan modes (320x240 works) + - adds LCD panel detection + - fixes a panning bug at depth 24 (panning must be to even pixels) + - adds a workaround for bugs in the latest ProSavage BIOSes + (#4445, 4448, Tim Roberts). + 140. Make 'X -configure' use the long monitor name when present in the + DDC info (#4444, Andrew C. Aitchison). + 139. Make glxinfo respect $DISPLAY (#4443, Meelis Roos). + 138. Fix TrueType font problems in 4.0.2 (#4439, Juliusz Chroboczek). + 137. Document the "DisplaySize" keyword in the XF86Config man page (#4438, + Andrew C. Aitchison). + 136. Update the i810 driver to set the UV vertical phase for the 4:2:0 + planar formats to account for the spatial relationship between the + chroma and luma samples (#4436, Jonathan Bian). + 135. Updates for Cygwin support (#4433, Suhaib M. Siddiqi). + 134. Fix a bug in the fonts.sgml doc (#4432, Juliusz Chroboczek). + 133. Fix the xdpyinfo so that it will build when the XKB extension isn't + defined (#4422, Jim Gettys). + 132. Fix the xdm greeter so that it will build when the XKB extension isn't + defined (#4421, Jim Gettys). + 131. Only build setxkbmap when building the XKB lib support (based on #4420, + Jim Gettys). + 130. Improve the mga driver messages when the HAL module isn't available + (#4451, David Woodhouse). + 129. Add G450 support to the mga driver (#4416, Luugi Marsan (Matrox), + 4449, David Woodhouse). + 128. Mga driver updates, including HAL cleanups, add a Crtc2Ram option, + and merge with Matrox beta4 source (#4415, Antii Tapaninen, #4423, + Simon Hosie). + 127. Fix a rounding problem in the wacom driver that was causing some + position instability (#4417, Hannes Eriksson). + 126. Change Freetype2 compilation to pacify makedepend (Marc La France). + 125. Added changes to il (Hebrew) xkb keyboard map (#4459, Tzafrir Cohen). + Added new by (Belarusian) xkb keyboard map (#4460, Alexander Mikhailian). + Small additions to fixes A.272 to allow autorepeat control of MouseKeys + also in 'non-accelerated mode' (#4461, Ivan Pascal). + 124. Add ATI Rage 128 PD support (#4455, ISHIKAWA Mutsumi). + 123. Make modeline2c.pl script case-insensitive (#4453, Mike Harris). + 122. Change ATI driver to detect panel dimensions of non-PC systems using an + LT or LT Pro (Marc La France). + 121. Fix misdetection of sparse I/O PCI bases and handling of unassigned PCI + bases in ATI driver (Marc La France). + 120. Extend libc wrapper's emulation of gettimeofday() and add emulation of PC + and PC98 interval timers to int10 (Marc La France). + 119. An attempt at fixing the handling of unassigned PCI resources by + improving detection of them and forcing them to be relocated + (Marc La France). + 118. Make lndir ignore finder data files on Mac OS X (Matthieu Herrb). + 117. - + 116. - + 115. Undo s3virge changes in 4.0.2 for Xv support on ViRGE chipsets since + they caused problems with plain ViRGE cards. Xv is still supported + for the ViRGE DX (#4414, 4430, Kevin Brosius). + 114. Siliconmotion driver fixes: + - 24bpp corruption + - mouse cursor still showing after X-server shutdown + (#4413, Frido Garritsen). + 113. Change the Thai charset and locale description to a form agreed to + by some Thai developers (#4412, Chanop Silpa-Anan). + 112. [SECURITY] Fix temp files vulnerabilites in xman on systems with + mkstemp(). (Matthieu Herrb). + 111. Major improvement to the Xmaster UI on Mac OS X. (#4447, XonX team). + 110. 8 bit DAC support for the NVIDIA Riva-128 (Mark Vojkovich). + 109. Fix panning on Permedia3 (Alan Hourihane). + 108. Enable wsmouse support on OpenBSD/i386 (Matthieu Herrb). + 107. Xdarwin bug fixes and updates (#4440-4442, Torrey T. Lyons). + 106. ATI driver Sparc compile fix (David S. Miller). + 105. Implement BlockFills at 32bpp in the Permedia3 driver (Alan Hourihane). + 104. Ensure PCI retry is off for Permedia3, and fix an over by 1 error on + FIFO usage (Alan Hourihane). + 103. Prevent glint driver from Seg faulting if mode pool is empty + (Alan Hourihane). + 102. Add FIFOSize to glint driver for overriding of the FIFO depending on + the target chip being used (Alan Hourihane). + 101. Major updates to the GLINT driver. + - Add Dual-Headed Appian Jeronimo 2000 support (dual PM3's), it now + shares heads as per MGA driver for G4xx dual head boards. + - Faster Permedia3 WriteBitmap/WritePixmap accelerator functions. + - Fix Scanline acceleration routines when MAX FIFO is reached. + - Improved Gamma support. + - Upload cursor and cursor colours for pm2v/pm3 during vertical retrace, + which fixes r/b inversion and loss of video problems. + - Fix pm2v/pm3 text restoration problems. + - Re-arranged structure to accomodate multi-chips per screen. + - Removed dualmx files and incorporated changes into standalone versions + - Allow -configure to only configure VGA based Glint chips, works + around multichip boards (for now). + (Alan Hourihane). + 100. Add XaaNoWriteBitmap and XaaNoWritePixmap options to XAA (Alan Hourihane). + 99. Improve determination of primary adapter (Marc La France). + 98. Fix PPC xf86sym.c compile problems (Marc La France). + 97. Fix int10 option handling for drivers that call xf86CollectOptions() + before calling int10 (Marc La France). + 96. Properly detect unassigned MMIO address in ATI driver (Marc La France). + 95. Fix default compilation on Sparc/Solaris (Marc La France). + 94. Fix typo in Linux/Arm configuration (Marc La France). + 93. By default, don't build libGLU on libc5 systems (Marc La France). + 92. Fix HW cursor colors for pm2v/pm3 in the glint driver (Alan Hourihane). + 91. Rework the memory detection code for Permedia3, now correctly detects + boards which aren't 32MB (Alan Hourihane). + 90. Write ScanlineCPUToScreen, ScanlineImageWrite functions for Permedia3 + which write directly to the FIFO, and remove obsolete functions + (Alan Hourihane). + 89. Fix ordering of writes in pm2v/pm3 ramdac functions in the glint driver, + thus fixing the R/B inversion problems (Jay Estabrook). + 88. Set the version strings in man pages dynamically (David Dawes). + 87. Remove the XF86_VERSION string from xf86Version.h, leaving just + the numerical values. All the version information is now derived + from that single set of values (David Dawes). + 86. [SECURITY] Fix temp vulnerabilities in Xaw/MultiSrc.c using the technique + in patch #4279 (Branden Robinson). Fix temp file vulnerability in + gccmakedep based on report from Alan Cox. Fix temp file vulnerability + in Imake.rules, InstallManPageAliases (Matthieu Herrb). + 85. Support vertical sub-pixel glyph rasterization in Xft + (Keith Packard) + 84. Allow xf86ClaimPciSlot to be called with a NULL GDevPtr, as it was + previously (Alan Hourihane). + 83. Fix clean rule in DRM build (Philip Willoghby). + 82. If MouseKeys is switched on, then the mousekeys autorepeat. (fixes + #272, Stephen Montgomery-Smith) + 81. Ensure Video is unavailable when no acceleration available in the + trident driver (Alan Hourihane). + 80. Implement a distclean make target (Marc La France). + NOTE: To correctly install this change, either `make Everything` or + `rm xmakefile; make World`. + 79. Preprocess all man pages to make sure that the references to pages + in sections that are platform-dependent are correct. Also fixed some + misc formatting problems found while doing that (David Dawes). + 78. Ensure client side version checking in 3D drivers for Rage128 and + Radeon chipsets (Alan Hourihane). + 77. Nv driver update to fix the cursor for double scan modes, and to + improve double scan mode handling in general (#4408, Csaba Halasz, + Jarno Paananen). + 76. Fix a twm segfault if it gets events for buttons > 5 (#4407, 4425, + Nathan Hand). + 75. Update the module subdirectory search list to include "multimedia/" + (#4405, Vladimir Dergachev). + 74. Small R6.5.1 merge update in Xlib (based on #4403, Bruno Haible). + 73. Updates to the xprop utility, including: + - Move to ANSI C, use const where possible. + - Print WM_NAME and WM_ICON_NAME properties in the locale encoding. + - Allow multiple "-remove" commands on the same command line. + - Better error message when "-remove" is applied to a font. + - New option "-set" that permits the changing of individual window + properties. + (#4402, Bruno Haible). + 72. Remove schumacher-clean compatibility aliases, since the fonts are + really ASCII and not iso8859-1 (#4401, Bruno Haible). + 71. Allow drivers to provide their own substitute for the xf86I2CWriteRead + function (#4399, Vladimir Dergachev). + 70. Cirrus driver updates, including: + - Add a call to fbPictureInit() in the Laguna driver. + - Fix warning (missing a symbol from VBE) when starting the Alpine + driver. + - Fix MMIO acceleration for the CL-GD5480 + (#4395, Itai Nahshon). + 69. Fix Neomagic 2200 screen corruption (Egbert Eich). + 68. Disable RENDER extension support in the ATI(misc) driver when mibank + and/or shadowfb is used (Marc La France). + 67. Remove cfb & friends from the ATI driver (Marc La France). + 66. Some additional ATI PCI IDs (Marc La France). + 65. Make compilation of drivers produce the same object whether or not + DPMS and DGA extensions are being built. Partial changes to do the same + for RENDER (Marc La France). + 64. Ensure `make depend` goes through the same set of subdirectories as + `make all` does. Allows MakefileAdditions to contain depend rule(s) + (Marc La France). + 63. Move $(EXTRA_DEFINES) to the end of ALLDEFINES. Ditto for + $(CXXEXTRA_DEFINES) and CXXDEFINES. Allows easier overrides at the + subdirectory level (Marc La France). + 62. Add a pre-clean phase to `make World` if xc/xmakefile already exists + (Marc La France). + 61. Import X.Org's X11R6.5.1 (David Dawes) + 60. Change identification of Trident 8400(CyberBlade/i7) so that it is not + a Cyber chipset (integrated Desktop version) (Alan Hourihane). + 59. Use the wsmouse protocol in XFree86 -configure if wsmouse is available + (Matthieu Herrb, lha at stacken.kth.se). + 58. Sync Xdarwin with XonX version (#4428 Torrey T. Lyons): + - add a working WarpCursor + - add 15 bit pixel depth to the Quartz mode. + 57. New version of Xmaster, a Mac OS X application that controls the + X server (#4427, Torrey T. Lyons, Andreas Monitzer). + 56. Add external CRT support for the Rage 128 Mobility (Kevin Martin + and ATI). + 55. Radeon DRI fixes (VA Linux Systems). + - Re-enable freeing resources when the screen is destroyed (Kevin + Martin) + - Use screen-relative instead of window-relative coordiantes to + calculate the tiled depth buffer offset address (Kevin Martin) + - Fix texture upload at offset 0 bug. Quake 2 engine games use + TexSubImage to update lightmaps and the like, and we were + uploading the updates before the image had space in the texture + heap allocated to it. (Gareth Hughes) + - Add XF86Config file option to enable depth buffer moves (they + are disabled by default since they are excuciatingly slow) + (Kevin Martin) + - Enable bus mastering in PCI config space for those systems that + do not automatically have it enabled (Kevin Martin) + - Remove AGP_CNTL register programming -- it was a holdover from + the Rage 128 driver and is not needed on the Radeon (Kevin + Martin) + - Fix offscreen memory allocation calculation for textures (Kevin + Martin) + 54. Allow libGLU to be built (Craig Dunwoody, SGI, David Dawes, + Alan Hourihane). + 53. Import the GLU parts of ogl-sample. + 52. Add an imake control for determining when xload should be installed + set-gid (David Dawes). + 51. Add some imake controls for installing Xkb and app-defaults files + in the traditional location rather than under /etc/X11 (Red Hat does + that) (David Dawes). + 50. Add compressed man page functionality to the rules in Imake.rules, + so it should be usable on most platforms (David Dawes). + 49. Make acceleration work on the Trident Cyber9388 (Alan Hourihane). + 48. - Various small changes to accomodate Mac OS X support and fix a + problem people were having with uninitialized globals in X + libraries, + - Allow XFree86 to run on Mac OS X as a full screen client of + CoreGraphics, + - Add a Mac OS X application that controls the X server and feeds it + events when running on Mac OS X. Currently must be built by + ProjectBuilder (#4409, #4410, #4411, Torrey T. Lyons). + 47. Fix Mach64 Mono 8x8 Pattern acceleration (Marc La France). + 46. Experiment with setting the server's "vendor release" value from + the information in xf86Version.h, and modify xdpyinfo to show the + server version in an easily readable format (David Dawes). + 45. Fix 1bpp colour map in vgaHW (Marc La France). + 44. More IA64 loader fixes and make xf86sym.c compile again + (Michael Madore, Marc La France). + 43. Add missing symbols in vesa driver (Marc La France). + 42. Fix multihead pointer problem on Rage 128 (Mark Vojkovich). + 41. Resync with DRI CVS trunk (Kevin Martin, VA Linux Systems) + - Add Radeon 3D driver (Kevin Martin and Gareth Hughes) + - Improve Rage 128 3D driver support (Gareth Hughes) + - Add fast AGP read/drawpixels support in MGA driver (Keith Whitwell) + - Update DRI docs (Kevin Martin, Brian Paul) + - Fix various bugs (Keith Whitwell, Brian Paul, Kevin Martin) + 40. Rename fsinfo to xfsinfo to avoid a name clash with the fsinfo utility + in the Berkeley automounter amd (Matthieu Herrb). + 39. Invert NO_COMPILER_H_EXTRAS to prevent unintentional references to inx()/ + outx() on the likes of SunOS (Marc La France). + 38. Change the os-support layer to only claim a bare minimum of I/O resources + rather than a larger estimate (Marc La France). + 37. Loader work: Fix handling of shared GOTs on IA-64 and Alpha's, and of + PLT and OPD entries on IA-64; Cleanup debug messages and #if testing + (Marc La France). + 36. Extensive int10 rework to address lockups, spontaneous reboots and tight + CPU loops on various architectures (Marc La France): + - Use intialised BIOS to softboot primary adapters on non-PC's; + - Fix endianness problems; + - Move stack into its own page to prevent overwritting interrupt vectors; + - Prevent (with a message) int10 from interfering with mainboard devices + (i.e. RTC, keyboard, speaker, chipset, etc.); + - Flesh out int 0x42 emulation on non-PC's; + - Emulate BIOS data area on non-PC's; + 35. Add missing symbols in i810 and sis drivers (Marc La France). + 34. Optionally disable, at compile time, loader bug workarounds in ATI driver + (Marc La France). + 33. Prevent the Rage 128 and Radeon drivers from initialising an adapter more + than once (Marc La France). + 32. Move support for >64kB BIOS'es from int10 into the os-support/bus layer + (Marc La France). + 31. When retrieving PCI BIOS'es, only use another PCI base when a previous + retrieval attempt fails (Marc La France). + 30. Temporary kludge to not consider any adapter as primary if more than one + candidate can be found (Marc La France). + 29. Make deleted mode messages less fearsome (Marc La France). + 28. Fix -configure to retrieve the correct set of options for ATI, C&T, + Cirrus and NeoMagic adapters (Marc La France). + 27. When removing PCI resource overlaps, always consider resources whose size + can be accurately determined, whether active or not (Marc La France). + 26. Real 4:2:0 YUV support for the Rage 128 (Mark Vojkovich). + 25. Xinerama support for Render extension (Keith Packard). + 24. Make some changes to the clock selection for trident driver + (Alan Hourihane). + 23. Switch savage driver to fb (+Render), correct maxHValue (Keith Packard). + 22. Add font property caching in Xft (Keith Packard). + 21. Xterm patch #150 (Thomas Dickey). + 20. Fix 24/8 Overlay support on Permedia2v and Permedia3 chipsets + (Alan Hourihane). + 19. Add CyberStretch option to the trident driver for Cyber chipsets that + allows Graphics modes to stretch to the full display (Alan Hourihane). + 18. Xterm patch #149 (#4351, Thomas Dickey). + 17. Fix Y offsets passed to pixmap cache when DRI disabled in R128 driver + (Alan Hourihane). + 16. Add BlockFills to Permedia3 (Alan Hourihane). + 15. Fix pixmap cache when more than 16MB of memory on Permedia 3 + (Alan Hourihane). + 14. Fix colourmap problems at depth15/16 on Permedia3 (Alan Hourihane). + 13. Bump xc/programs/Xserver/GL/dri (libdri.a) version to 3.1.0 to + correspond with the DRI backbuffer rewrite, and modify drivers accordingly + (Alan Hourihane). + 12. Enable ImageWrites on Rage128 and Radeon (Alan Hourihane). + 11. Add DRIMoveBuffersHelper function to prevent code duplication in + the drivers (Mark Vojkovich). + 10. Bug fixes for endianness problems in Permedia3 driver + (#4404, Sven Luther). + 9. Add Appian Jeronimo 4x8Mb (PM2v) support to the glint driver + (Alan Hourihane). + 8. Add render support to i810 driver (Keith Packard with testing + by Christien Bunting) + 7. Switch misc (non-radeon, non-r128) ATI driver to fb (Keith Packard). + 6. 3DFX driver changes (Mark Vojkovich). + - fix some DGA issues. + - 2D and 3D now share offscreen memory (much faster 2D now). + - rewrite Xv support to use the video overlay. + - add new Options "VideoKey" and "ShowCache". + 5. Change xterm from simple face name to full Xft font name so + that options can be provide (like minspace) (Keith Packard) + 4. Add UTF-8 support to Xft (Keith Packard) + 3. Add font/face sharing and a minumum vertical space option + to Xft (Keith Packard) + 2. Fix 64 bit DGA bug (Mark Vojkovich). + 1. Rewrite DRI back buffer handling to minimize the impact on 2D + performance (Mark Vojkovich). + 0. Fix incorrect driverName fields in the cyrix, i810 and sis drivers. + This was causing 'XFree86 -configure' to get the driver name wrong + (David Dawes). + XFree86 4.0.2 (18 December 2000) 1211. Fix a problem introduced recently when using the "ps/2" protocol for mice on FreeBSD (David Dawes). @@ -234,7 +1537,7 @@ 1087. Status doc updates for Neomagic an NVIDIA (#4334, Andrew C. Aitchison, Mark Vojkovich). 1086. Updated Rage 128 DRI support from the DRI CVS (Gareth Hughes, VA Linux). -1085. Updates for Hurd support (#A.209, Marcus Brinkmann). +1085. - 1084. Bump the minor revisions of libXmu (UTF8_STRING) and libX11 (Xutf8LookupString). 1083. Fixes for all known bugs in the CompoundText parser and generator, @@ -12114,4 +13417,4 @@ XFree86 3.0 (26 April 1994) -$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1485 2000/12/18 15:55:33 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/CHANGELOG,v 3.1785.2.32 2001/06/02 15:27:50 dawes Exp $ Index: xc/INSTALL-X.org diff -u xc/INSTALL-X.org:1.1 xc/INSTALL-X.org:1.2 --- xc/INSTALL-X.org:1.1 Sun Dec 17 21:45:44 2000 +++ xc/INSTALL-X.org Mon Jan 22 17:26:59 2001 @@ -7,7 +7,7 @@ - Building and Installing X11R6.4 + Building and Installing X11R6.5.1 @@ -17,55 +17,61 @@ Kaleb S. KEITHLEY - The Open Group X Project Team + August 20, 2000 - 30 January, 1998 - +Copyright (C) 1999,2000 Compaq Computer Corporation +Copyright (C) 1999,2000 Hewlett-Packard Company +Copyright (C) 1999,2000 IBM Corporation +Copyright (C) 1999,2000 Hummingbird Communications Ltd. +Copyright (C) 1999,2000 Silicon Graphics, Inc. +Copyright (C) 1999,2000 Sun Microsystems, Inc. +Copyright (C) 1999,2000 The Open Group Copyright (C) 1998 The Open Group Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the Software), -to use the Software without restriction, including, without limitation, -the rights to copy, modify, merge, publish, distribute and sublicense -the Software, to make, have made, license and distribute derivative -works thereof, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and the following permission notice shall be -included in all copies of the Software: - -THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE WARRANTIES OF MERCHANTABIL- -ITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- INFRINGEMENT. IN NO EVENT -SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER USEABILI- -TIY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF, OR IN CONNNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS -IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not -be used in advertising or otherwise to promote the use or other dealings -in this Software without prior written authorization from The Open -Group. +copy of this software and associated documentation files (the "Soft- +ware"), to deal in the Software without restriction, including without +limitation the rights to use, copy, modify, merge, publish, distribute, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, provided that the above copyright +notice(s) and this permission notice appear in all copies of the Soft- +ware and that both the above copyright notice(s) and this permission +notice appear in supporting documentation. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- +ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY +RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN +THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE- +QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR- +MANCE OF THIS SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization of +the copyright holder. X Window System is a trademark of The Open Group. 1. Introduction -This document is the installation notes that were provided with The Open -Group's X11R6.4 release. If you're building XFree86, it can be used as -a rough guide. Be aware that most of the details are not targetted +This document is the installation notes that were provided with X.Org's +X11R6.5.1 release. If you're building XFree86, it can be used as a +rough guide. Be aware that most of the details are not targetted specifically at the current XFree86 source tree. XFree86-specific docu- mentation can be found in the xc/programs/Xserver/hw/xfree86/doc direc- tory and on-line at http://www.xfree86.org/current/. Some of the docu- @@ -80,16 +86,17 @@ tions later in this document. Edit xc/config/cf/site.def for local preferences. If you want to -install somewhere other than /usr/X11R6.4, change ProjectRoot. (Do not +install somewhere other than /usr/X11R6.5.1, change ProjectRoot. (Do not use DESTDIR.) If you want to build with gcc uncomment the HasGcc2 line. If you have gcc, but not cc, please read the full build instructions. -If some time has elapsed since the initial release of R6.4, check to see -if any public patches have been released. The source tar files may have -been updated -- check the patch-level line in the bug-report template. -If the source in the tar files has not been updated then get all the -patches and apply them, following the instructions at the top of each -patch. Ignore the rebuild steps in the patch application instructions. +If some time has elapsed since the initial release of R6.5.1, check to +see if any public patches have been released. The source tar files may +have been updated -- check the patch-level line in the bug-report tem- +plate. If the source in the tar files has not been updated then get all +the patches and apply them, following the instructions at the top of +each patch. Ignore the rebuild steps in the patch application instruc- +tions. Check the appropriate vendor-specific .cf file in xc/config/cf/ to make sure that OSMajorVersion, OSMinorVersion, and OSTeenyVersion are set @@ -127,7 +134,7 @@ -3. Building and Installing R6.4 +3. Building and Installing R6.5.1 Historically the MIT X Consortium and The X Consortium, Inc., sample @@ -171,21 +178,21 @@ pressed tar files to extract the sources. There are several to chose from, we do not make recommendations about which one you should use. -Release 6.4 sources are distributed among the tar files as follows: +Release 6.5.1 sources are distributed among the tar files as follows: - tog-1.tar contains everything in xc/ that isn't in the other tar files - tog-2.tar contains xc/fonts - tog-3.tar contains xc/doc/specs, xc/util - tog-4.tar contains xc/doc/hardcopy + xorg-1.tar contains everything in xc/ that isn't in the other tar files + xorg-2.tar contains xc/fonts + xorg-3.tar contains xc/doc/specs, xc/util + xorg-4.tar contains xc/doc/hardcopy If you define BuildFonts to NO in your site.def file, then you only need -to unpack tog-1.tar to build. If you build fonts, then you will also -need tog-2.tar to build. If you already have the fonts from prior +to unpack xorg-1.tar to build. If you build fonts, then you will also +need xorg-2.tar to build. If you already have the fonts from prior releases you can use those instead of downloading them again. We presume that you know how to copy or move them from your old source tree to the -R6.4 source tree. +R6.5.1 source tree. 3.3. Unpacking the Distribution @@ -196,26 +203,27 @@ % mkdir sourcedir % cd sourcedir -Then for each tar file tog-*.tar.gz, execute this: +Then for each tar file xorg-*.tar.gz, execute this: - % gunzip -c ftp-dir/tog-N.tar.gz | tar xf - + % gunzip -c ftp-dir/xorg-N.tar.gz | tar xf - or if you have GNU's tar (FreeBSD, NetBSD, OpenBSD, or Linux too) - % tar xzf ftp-dir/tog-N.tar.gz + % tar xzf ftp-dir/xorg-N.tar.gz 3.4. Applying Patches -If some time has elapsed since the initial release of R6.4, check to see -if any public patches have been released. The source tar files may have -been updated -- check the patch-level line in the bug-report template. -If the source in the tar files has not been updated then get all the -patches and apply them, following the instructions at the top of each -patch. Ignore the rebuild steps in the patch application instructions. +If some time has elapsed since the initial release of R6.5.1, check to +see if any public patches have been released. The source tar files may +have been updated -- check the patch-level line in the bug-report tem- +plate. If the source in the tar files has not been updated then get all +the patches and apply them, following the instructions at the top of +each patch. Ignore the rebuild steps in the patch application instruc- +tions. See the section "Public Patches" later in this document. @@ -344,7 +352,8 @@ pegasus.cf, x386.cf. Amoeba.cf is known to require additional patches. The file xc/lib/Xdmcp/Wraphelp.c, for XDM-AUTHORIZATION-1, is not -included in this release. See ftp://ftp.x.org/pub/R6.4/xdm-auth/README. +included in this release. See ftp://ftp.x.org/pub/R6.5.1/xdm- +auth/README. 3.6. System Build Notes @@ -384,19 +393,19 @@ Use of the GNU BinUtils assembler, as, and linker, ld, is not supported -- period! If you have them installed on your system you must rename or -remove them for the duration of the R6.4 build. (You can restore them +remove them for the duration of the R6.5.1 build. (You can restore them afterwards.) -The system-supplied make works just fine for building R6.4 and that's +The system-supplied make works just fine for building R6.5.1 and that's what we suggest you use. If you've replaced your system's make with GNU make then we recommend that you restore the system make for the duration -of your R6.4 build. After R6.4 is done building you can revert to GNU -make. GNU make on most systems (except Linux, where it is the default -make) is not a supported build configuration. GNU make may work for you, -and if it does, great; but if it doesn't we do not consider it a bug in -R6.4. If, after this admonition, you still use GNU make and your build -fails, reread the above, and retry the build with the system's make -before you file a bug-report. +of your R6.5.1 build. After R6.5.1 is done building you can revert to +GNU make. GNU make on most systems (except Linux, where it is the +default make) is not a supported build configuration. GNU make may work +for you, and if it does, great; but if it doesn't we do not consider it +a bug in R6.5.1. If, after this admonition, you still use GNU make and +your build fails, reread the above, and retry the build with the sys- +tem's make before you file a bug-report. 3.6.3. IBM AIX 4.x @@ -545,8 +554,8 @@ The version number of some of the the shared libraries has been changed. On SunOS 4, which supports minor version numbers for shared libraries, -programs linked with the R6.4 libraries will use the new libraries with -no special action required. +programs linked with the R6.5.1 libraries will use the new libraries +with no special action required. On most other modern operating systems the version portion of the library name, i.e. "6.1" portion of "libX11.so.6.1" is a string. Even if @@ -783,8 +792,8 @@ for this release to fix any serious problems that are discovered. Such fixes are a subset of fixes available to X Project Team members. Public patches are available via anonymous FTP from -ftp://ftp.x.org/pub/R6.4/fixes, or from your local X mirror site. Check -the site closest to you first. +ftp://ftp.x.org/pub/R6.5.1/fixes, or from your local X mirror site. +Check the site closest to you first. You can determine which public patches have already been applied to your source tree by examining the "VERSION" line of xc/bug-report. The source Index: xc/Imakefile diff -u xc/Imakefile:3.20 xc/Imakefile:3.25 --- xc/Imakefile:3.20 Fri Jul 7 16:06:55 2000 +++ xc/Imakefile Wed Mar 21 12:36:43 2001 @@ -1,9 +1,14 @@ -XCOMM $TOG: Imakefile /main/138 1997/12/29 16:37:30 kaleb $ -XCOMM $XFree86: xc/Imakefile,v 3.20 2000/07/07 20:06:55 tsi Exp $ +XCOMM $Xorg: Imakefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ + + + + +XCOMM $XFree86: xc/Imakefile,v 3.25 2001/03/21 17:36:43 dawes Exp $ + #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" -RELEASE = "Release 6.4" +RELEASE = XOrgReleaseString #ifndef OSName #define OSName Unknown Operating System! #endif @@ -13,7 +18,9 @@ FONTSDIR = fonts #endif #ifndef Win32Architecture +#if BuildDocs DOCSDIR = doc +#endif NLSSUBDIR = nls #endif #endif @@ -45,16 +52,26 @@ @echo Building on OSName "("OSMajorVersion"."OSMinorVersion"."OSTeenyVersion")." @echo "" #ifdef LinuxArchitecture +VerifyOS:: @echo Linux Distribution: LinuxDistName @echo libc version: LinuxCLibMajorVersion"."LinuxCLibMinorVersion"."LinuxCLibTeenyVersion @echo binutils version: `expr LinuxBinUtilsMajorVersion / 10`.`expr LinuxBinUtilsMajorVersion % 10` @echo "" #endif #if defined(GccMajorVersion) && defined(GccMinorVersion) +VerifyOS:: @echo GCC version: GccMajorVersion"."GccMinorVersion @echo "" #endif +#ifdef XFree86Version +version.def:: + $(RM) $(IRULESRC)/version.def + $(LN) ../../$(XF86SRC)/xf86Version.h $(IRULESRC)/version.def +#else +version.def:: +#endif + includes:: MakeDir($(BUILDINCDIR)) MakeDir($(BUILDBINDIR)) @@ -97,9 +114,9 @@ XCOMM clean out link tree looking for stuff that should get checked in dangerous_strip_clean:: - $(MAKE) -k clean + $(MAKE) -k distclean find . -type l -exec rm {} \; - find . \( \! \( -type d -o -name Makefile \) \) -print + find . \( \! -type d \) -print #else /* OS2Architecture */ VerifyOS:: @@ -124,7 +141,7 @@ @echo : \indir $(IMAKESRC) $(MAKE) $(MFLAGS) SHELL= -f Makefile.ini BOOTSTRAPCFLAGS=-Zexe if exist Makefile.bak del Makefile.bak - if exist MAkefile ren Makefile Makefile.bak + if exist Makefile ren Makefile Makefile.bak $(MAKE) $(MFLAGS) -f Makefile.bak Makefile $(MAKE) $(MFLAGS) SHELL= VerifyOS $(MAKE) $(MFLAGS) SHELL= Makefiles Index: xc/Makefile diff -u xc/Makefile:3.16 xc/Makefile:3.21 --- xc/Makefile:3.16 Wed Mar 22 16:23:30 2000 +++ xc/Makefile Sat Mar 3 17:03:43 2001 @@ -1,10 +1,13 @@ -# $TOG: Makefile /main/37 1998/02/17 14:30:04 kaleb $ -# $XFree86: xc/Makefile,v 3.16 2000/03/22 21:23:30 dawes Exp $ +# $Xorg: Makefile,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ + + +# $XFree86: xc/Makefile,v 3.21 2001/03/03 22:03:43 tsi Exp $ + # Luna users will need to either run make as "make MAKE=make" # or add "MAKE = make" to this file. -RELEASE = "Release 6.4" +RELEASE = "Release 6.5" SHELL = /bin/sh RM = rm -f MV = mv @@ -46,6 +49,11 @@ ;; esac; @date @echo "" + @if [ -f xmakefile ]; then \ + $(MAKE_CMD) -k distclean || \ + $(MAKE_CMD) -k clean || \ + $(RM) xmakefile; \ + fi @if [ ! -f $(IRULESRC)/host.def ]; then \ if [ ! -f $(TOP)/lib/Xt/Imakefile ]; then \ echo "#define BuildServersOnly YES" > $(IRULESRC)/host.def; \ @@ -57,11 +65,15 @@ fi; \ fi; \ fi + @if [ ! -f $(IRULESRC)/version.def ]; then \ + echo "" > $(IRULESRC)/version.def; \ + fi cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean $(MAKE) $(MFLAGS) Makefile.boot $(MAKE_CMD) $(MFLAGS) VerifyOS + $(MAKE_CMD) $(MFLAGS) version.def $(MAKE_CMD) $(MFLAGS) Makefiles - $(MAKE_CMD) $(MFLAGS) clean BOOTSTRAPSUBDIRS= + $(MAKE_CMD) $(MFLAGS) BOOTSTRAPSUBDIRS= clean $(MAKE_CMD) $(MFLAGS) includes $(MAKE_CMD) $(MFLAGS) depend $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World @@ -78,6 +90,7 @@ # the Makefile.proto files. Makefile.boot: imake.bootstrap + $(RM) $(IMAKESRC)/Makefile.proto imake.proto: cd $(IMAKESRC) && $(MAKE) $(FLAGS) @@ -106,6 +119,7 @@ $(MAKE) $(MFLAGS) xmakefile xmakefile: Imakefile + $(RM) xmakefile $(IMAKE_CMD) -s xmakefile -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) World.Win32: @@ -168,6 +182,9 @@ $(MAKE_CMD) $@ dangerous_strip_clean: $(MAKE_CMD) $@ +distclean: + $(MAKE_CMD) $@ + $(RM) xmakefile $(IRULESRC)/version.def depend: $(MAKE_CMD) $@ Everything: Index: xc/RELNOTES diff -u xc/RELNOTES:1.1 xc/RELNOTES:1.2 --- xc/RELNOTES:1.1 Sun Dec 17 21:45:46 2000 +++ xc/RELNOTES Fri Mar 2 12:48:40 2001 @@ -17,7 +17,7 @@ drivers from 3.3.x have been ported to 4.x yet, but conversely, 4.x has some hardware support not present in 3.3.x. Our Driver Status document summarizes how the hardware driver support compares between 3.3.6 and 4.0.2. Please -check there first before downloading 4.0.2. +check there first before downloading 4.0.2. The 4.0.1 release introduced a new graphical configuration tool, "xf86cfg", and a text mode interface was added to it for the 4.0.2 release. It is work @@ -824,34 +824,35 @@ To allow a graceful transition for applications moving from core text render- ing to the Render extension, Xft can use either core fonts or FreeType and -the Render extension for text. By default, Xft is configured to support only -core fonts, see the section on building FreeType support for the changes -needed to add FreeType/Render fonts. +the Render extension for text. By default, Xft is configured to support both +core fonts and FreeType fonts using the supplied version of FreeType 2. See +the section on FreeType support in Xft for instructions on configuring +XFree86 to use an existing FreeType installation. The Xft library uses a configuration file, XftConfig, which contains informa- tion about which directories contain font files and also provides a sophisti- cated font aliasing mechanism. Documentation for that file is included in the Xft man page. -4.11.2 Building FreeType support for Xft +4.11.2 FreeType support in Xft -XFree86 4.0.2 includes sources for FreeType version 2.0.1, but they are not -built and installed automatically. As a result, Xft is configured to provide -only core fonts by default. +XFree86 4.0.2 includes sources for FreeType version 2.0.1, and, by default, +they are built and installed automatically. -To build FreeType support for Xft, first FreeType must be built and -installed, either from the sources included in XFree86 in extras/freetype2 or -from another FreeType (version 2.0.1 or later) release. Early FreeType ver- -sion 2 releases used a different header file installation and aren't compati- -ble with XFree86. Instructions for building and installing FreeType can be -found in the INSTALL file included with the FreeType release. +If you prefer, you can configure XFree86 4.0.2 to use an existing Freetype2 +installation by telling XFree86 not to build the internal copy and indicating +where that external version has been installed. Edit (or create) con- +fig/cf/host.def to include: -Second, XFree86 needs to know the installed location for FreeType, usually -/usr/local. Edit (or create) config/cf/host.def to include: + o #define BuildFreetype2Library NO - #define Freetype2Dir /usr/local + o #define Freetype2Dir /usr/local -Finally, build XFree86 with "make World" from the top. +Note that XFree86 assumes you'll be using a release FreeType no older than +version 2.0.1. Early FreeType version 2 releases used a different header +file installation and aren't compatible with XFree86. Instructions for build- +ing and installing FreeType can be found in the INSTALL file included with +the FreeType release. 4.11.3 Application Support For Anti-Aliased Text @@ -871,8 +872,8 @@ Xditview will use Xft instead of the core API by default. X11perf includes tests to measure the performance of text rendered in three ways, anti- aliased, anti-aliased with sub-pixel sampling and regular chunky text, but -through the Render extension, a path which has not been optimized within the -X server yet. +through the Render extension, a path which is currently somewhat slower than +core text. 4.12 Other extensions @@ -1081,7 +1082,7 @@ located under the appropriate subdirectories of /var, again with the relevant symbolic links in the old location. - Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.58 2000/12/17 23:01:10 dawes Exp $ + Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/RELNOTES.sgml,v 1.60 2001/03/02 17:40:48 dawes Exp $ -$XFree86: xc/RELNOTES,v 1.1 2000/12/18 02:45:46 dawes Exp $ +$XFree86: xc/RELNOTES,v 1.2 2001/03/02 17:48:40 dawes Exp $ Index: xc/RELNOTES-X.org diff -u xc/RELNOTES-X.org:1.1 xc/RELNOTES-X.org:1.2 --- xc/RELNOTES-X.org:1.1 Sun Dec 17 21:45:47 2000 +++ xc/RELNOTES-X.org Mon Jan 22 17:26:59 2001 @@ -9,7 +9,7 @@ X Window System, Version 11 - Release 6.4 + Release 6.5.1 Release Notes @@ -19,14 +19,13 @@ - The Open Group X Project Team - 30 January, 1998 + August 20, 2000 @@ -34,31 +33,40 @@ -Copyright (C) 1998 The Open Group +Copyright (C) 1999,2000 Compaq Computer Corporation +Copyright (C) 1999,2000 Hewlett-Packard Company +Copyright (C) 1999,2000 IBM Corporation +Copyright (C) 1999,2000 Hummingbird Communications Ltd. +Copyright (C) 1999,2000 Silicon Graphics, Inc. +Copyright (C) 1999,2000 Sun Microsystems, Inc. +Copyright (C) 1999,2000 The Open Group +All rights reserved. + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Soft- ware"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, -sublicense, and/or sell copies of the Software, and to permit persons to -whom the Software is furnished to do so, subject to the following condi- -tions: - -The above copyright notice and the following permission notice shall be -included in all copies of the Software: - -THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE WARRANTIES OF MERCHANTABIL- -ITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- INFRINGEMENT. IN NO EVENT -SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- -ITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THE USE OF OTHER DEALINGS -IN THE SOFTWARE. - -Except as contained in this notice, the name of The Open Group shall not -be used in advertising or otherwise to promote the use or other dealings -in this Software without prior written authorization from The Open -Group. +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, provided that the above copyright +notice(s) and this permission notice appear in all copies of the Soft- +ware and that both the above copyright notice(s) and this permission +notice appear in supporting documentation. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL- +ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY +RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN +THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE- +QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR- +MANCE OF THIS SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization of +the copyright holder. X Window System is a trademark of The Open Group. @@ -66,10 +74,10 @@ 1. Introductory Note -This document is the release notes that were provided with The Open -Group's X11R6.4 release. The XFree86-specific information in this docu- -ment is out of date. The XFree86-specific documentation can be found in -the xc/programs/Xserver/hw/xfree86/doc directory, and on-line at +This document is the release notes that were provided with X.Org's +X11R6.5.1 release. The XFree86-specific information in this document is +out of date. The XFree86-specific documentation can be found in the +xc/programs/Xserver/hw/xfree86/doc directory, and on-line at http://www.xfree86.org/current/. @@ -86,78 +94,55 @@ interface (the windows) on inexpensive desktop machines. -3. What is Release 6.4 +3. What is Release 6.5.1 -Release 6.4 (R6.4) is The Open Group X Project Team's update to the X -Consortium's Release 6.3 (R6.3) of X11 and all prior releases. It is -compatible with with all releases going back to R1 at both the source -and protocol levels. +Release 6.5.1 (R6.5.1) is X.Org's update to the Open Group's X Project +Release 6.4 patch 3 and all prior releases. It is compatible with with +all releases going back to R1 at both the source and protocol levels. +Note that Release 6.5 was an internal X.Org release, and Release 6.5.1 +supersedes it. The X Consortium was an independent, not-for-profit membership corpora- tion formed in 1993 as the successor to the MIT X Consortium. It was dissolved at the end of 1996 and all assets such as trademarks and copy- -rights were transferred to The Open Group. +rights were transferred to The Open Group. The Open Group's X Project +Team was formed to continue maintenance and development of X. The X +Project Team was disbanded after Release 6.4 patch 3. + +X.Org has employed the services of a third party contractor to establish +a CVS repository of the source and a web-based interface for submit- +ting/viewing bug reports. The CVS repository and web-based interface are +available to X.Org members. The contractor has been chartered to pro- +vide quarterly update releases to the X source. + +Membership information for X.Org may be found at http://www.x.org/mem- +bers.htm. -The Open Group's X Project Team was formed to continue maintenance and -development of X. Membership in The Open Group X Project Team does not -require membership in The Open Group. To join the X Project Team contact -the sales office near you -- you can find a list of sales offices at -http://www.opengroup.org/contacts/sales.htm, or download the membership -kit from http://www.opengroup.org/tech/desktop/x/projteam.htm. +This X.Org release addresses a portion of the backlog of bug reports +since Release 6.4 patch 3, along with additional fixes from the Xfree86 +community. -Instructions for building and installing R6.4 can be found in the file -INSTALL.PS (PostScript) or INSTALL.TXT (plain text), available sepa- -rately and also contained in the release. +Instructions for building and installing R6.5.1 can be found in the file +INSTALL.TXT (INSTALL-X.org), available separately and also contained in +the release. -4. Overview of the X Project Team Release +4. Overview of the X.Org Release -Like all the releases that preceded it, R6.4 is a source code release. +Like all the releases that preceded it, R6.5.1 is a source code release. In order to use the release it is necessary to first unpack the distri- bution, compile it, and then install it. The source contains the follow- ing items: + + + Documentation + Sample implemenations + Fonts and bitmaps + Utility libraries + Programs -X Consortium Standards and X Project Team Specifications - The X Consortium produced standards -- documents which define net- - work protocols, programming interfaces, and other aspects of the X - environment. These standards continue to exists in the X Project - Team release. The X Project Team produces specifications. Like X - Consortium Standards, these are documents which define network pro- - tocols, programming interfaces, and other aspects of the X environ- - ment. Under the aegis of The Open Group, X Consortium standards, X - Project Team specifications, and other specifications are the basis - for portions of The Open Group's various CAE Specifications. Some - of the new features in this release are not standard, that is, - there is no accompanying specification. - -Implementations - For most of X Consortium standards and X Project Team specifica- - tions, a high-quality implementations is provided to demonstrate - proof of concept, to give vendors a base to use, and early adopters - a chance to begin developing using the new features. These are not - reference implementations -- the written specifications are the - authoritative definition. - -Fonts - A collection of bitmap and outline fonts are included in the dis- - tribution, contributed by various individuals and companies. - -Utility Libraries - A number of libraries, such as Xmu and the Athena Widget Set, are - included. These are not standards, but are used in building the - applications contained in the release and may be useful in building - other applications. - -Programs - We also provide a number of application programs. A few of these - programs, such as xdm (or its equivalent), should be considered - essential in almost all environments. The rest of the applications - carry no special status; they are simply programs that have been - developed and/or maintained by X Consortium and X Project Team - staff. In some cases, you will find better substitutes for these - programs contributed by others. 5. Supported Operating Systems @@ -166,25 +151,11 @@ This release was built and tested on the following reference platforms: - Digital Unix 4.0A - Fujitsu UXP V20L10 + Compaq Tru64 UNIX V5.0 HPUX 10.20 - Solaris 2.5 - - -This release was also built on the following systems: - - - AIX 4.2 - IRIX 6.2 - FreeBSD 2.2.2 - S.u.S.E. Linux 5.0.0 (kernel 2.0.30, libc 5.4.33) - SunOS 4.1.4 - Windows NT 3.51 (NCD WinCenter) + Solaris 7.0 -In all cases except SunOS we have used the vendor's compiler. On SunOS -we build with the GNU C compiler (gcc). 6. Supported Graphics Devices @@ -195,7 +166,7 @@ HP-UX: Xhp - Digital Unix: Xdec on DECstation 3000/400 (Alpha) with PMAG-B + Compaq Tru64 UNIX: Xdec on DECstation 3000/400 (Alpha) with PMAG-B SunOS/Solaris: Xsun -- see the Xsun man page for supported cards XFree86: See the XF_* man pages for supported cards @@ -233,20 +204,20 @@ 8. X Registry -The X Project Team maintains a registry of certain X-related items to -aid in avoiding conflicts and to aid in sharing of such items. The reg- -istry is in the file xc/registry. +A registry of certain X-related items is maintained to aid in avoiding +conflicts and to aid in sharing of such items. The registry is in the +file xc/registry. 9. Extensions Supported -Release 6.4 includes source for the following extensions: BIG-REQUESTS, -DOUBLE-BUFFER, DPMS, Extended-Visual-Information, LBX, MIT-SHM, MIT- -SUNDRY-NONSTANDARD, Multi-Buffering, RECORD, SECURITY, SHAPE, SYNC, TOG- -CUP, X3D-PEX, XC-APPGROUP, XC-MISC, XFree86-VidModeExtension, XIE (X -Image Extension), XINERAMA. XInputExtension, XKEYBOARD, XpExtension -(printing), XTEST, and XTestExtension1, +Release 6.5.1 includes source for the following extensions: BIG- +REQUESTS, DOUBLE-BUFFER, DPMS, Extended-Visual-Information, LBX, MIT- +SHM, MIT-SUNDRY-NONSTANDARD, Multi-Buffering, RECORD, SECURITY, SHAPE, +SYNC, TOG-CUP, X3D-PEX, XC-APPGROUP, XC-MISC, XFree86-VidModeExtension, +XIE (X Image Extension), XINERAMA. XInputExtension, XKEYBOARD, XpExten- +sion (printing), XTEST, and XTestExtension1, Not all of these extensions are standard; see the Standards manual page. Some of these extensions may not be supported on every platform. @@ -256,9 +227,10 @@ Some of the specifications define some behavior as implementation-depen- -dent. Implementations of the X Consortium standards and X Project Team -specifications must document how those parameters are implemented. +dent. Implementations must document how those parameters are imple- +mented. + The default values in this release of the implementation dependent parameters are: @@ -270,7 +242,7 @@ instructions and xc/config/cf/X11.tmpl for details of how these configuration variables are used. - By default the imake variable ProjectRoot is /usr/X11R6.4 and + By default the imake variable ProjectRoot is /usr/X11R6.5 and XFILESEARCHPATH has these components: $ProjectRoot/lib/X11/%L/%T/%N%C%S @@ -345,169 +317,51 @@ The Input Method Server Development Kit (IMdkit) is at ftp://ftp.x.org/pub/unsupported/lib/IMdkit/. - -11. What Is New in Release 6.4 - - -This section describes changes in the X Project Team distribution since -Release 6.3. - -The major new functionality in R6.4 is: Display Power Management Signal- -ing (DPMS) to set "green" computer monitors into power saving mode; -Extended Visual Information to allow applications to discover more about -the graphics capabilities of the server than the core protocol allows; -Colormap Utilization Policy (TOG-CUP) allows applications to discover -desktop special colors, e.g. MS-Windows reserved (pre-allocated) colors -on PC-Xservers, and store read-only (sharable) colors in specific loca- -tions in a colormap; and Xinerama, a wide screen server that combines -two or more screens into a single virtual screen. - -The X Toolkit Intrinsics library (libXt) now has IBM's Easy Resource -Configuration support included. - -Xlib (libX11) has two new APIs: XkbSetPerClientControls and XkbGetPer- -ClientControls. These two functions were unintentionally omitted from -the library in previous releases. - -The XFree86 servers are now based on XFree86 3.3.1. +11. What is Unchanged in Release 6.5.1 -12. What is Unchanged in Release 6.4 - As this is an update release, there is a great deal of stability in the standards, libraries, and clients. No existing standards have changed in -a material way; although some documents have been updated with minor -corrections. The extension library, libXext, is updated to include the -DPMS, Extended-Visual-Information, TOG-CUP, and XINERAMA extension -interfaces. All previous interfaces in these and all other libraries are -unchanged. +a material way. All previous interfaces in these and all other +libraries are unchanged. -13. New OS Support +12. New OS Support The following table shows the versions of the operating systems that were used to develop this and prior releases: -System R6 R6.1 R6.[23] R6.4 +System R6 R6.1 R6.[23] R6.4 R6.5.1 -AIX 3.2.5 4.1.4 4.2 4.2 -A/UX 3.0.1 - - - -BSD/386 1.0 - - - -Digital Unix (OSF/1) 1.0/1.3 3.2C 4.0A4.0A -FreeBSD - 2.1.0 2.1.6 2.2.2 -Fujitsu UXP - - - V20L10 -HP-UX 9.1 10.01 10.01 10.20 -IRIX 5.2 5.3 6.2 6.2 +AIX 3.2.5 4.1.4 4.2 4.2 - +A/UX 3.0.1 - - - - +BSD/386 1.0 - - - - +Compaq Tru64 UNIX 1.0/1.3 3.2C 4.0A 4.0A 5.0 +FreeBSD - 2.1.0 2.1.6 2.2.2 - +Fujitsu UXP - - - V20L10 - +HP-UX 9.1 10.01 10.01 10.20 10.20 +IRIX 5.2 5.3 6.2 6.2 - Linux (kernel) - Slackware 2.3 - 1.2.11 -- - Slackware 3.1 - - 2.0- - S.u.S.E. 5.0 - - - 2.0.30 -Mach 2.5 - - - -NEWS-OS 6.0 - - - -Solaris 2.3 2.4 2.5 2.5 -SunOS 4.1.3 4.1.3 4.1.4 4.1.4 -Ultrix-32 4.3 4.4 - - -UNICOS 8.0 - - - -Unixware SVR4.2 1.0 2.02 2.02- -Windows NT 3.1 3.5 4.0 3.51 - - - -14. New Specifications - - -The following are the new X Project Team specifications in Release 6.4. -Each is described in its own section below. - - Display Power Management Signalling (DPMS) - Extended Visual Information (EVI) - Colormap Utilization Policy (TOG-CUP) - - - -14.1. Display Power Management Signaling - - -This extension provides X Protocol control over the VESA Display Power -Management Signaling (DPMS) characteristics of video boards under con- -trol of the X Window System. - -Traditionally, the X Window System has provided for both blanking and -non-blanking screen savers. Timeouts associated with these built-in -screen saver mechanisms are limited to idle (dwell) time, and a change -timeout that specifies the change interval for non-blanking screen -savers. - -The United States' Environmental Protection Agency (EPA) Energy Star -program requires that monitors power down after some idle time by -default. While it is possible to simply overload the existing screen -saver timeouts, this solution leaves the non-privileged user little to -no control over the DPMS characteristics of his or her system. For -example, disabling DPMS would require some unintended side effect in the -core screen saver, such as disabling the changing of a non-blanking -screen saver. - - -14.2. Extended Visual Information + Slackware 2.3 - 1.2.11 - - - + Slackware 3.1 - - 2.0 - - + S.u.S.E. 5.0 - - - 2.0.30 - +Mach 2.5 - - - - +NEWS-OS 6.0 - - - - +Solaris 2.3 2.4 2.5 2.5 7.0 +SunOS 4.1.3 4.1.3 4.1.4 4.1.4 - +Ultrix-32 4.3 4.4 - - - +UNICOS 8.0 - - - - +Unixware SVR4.2 1.0 2.02 2.02 - - +Windows NT 3.1 3.5 4.0 3.51 - -The Extended Visual Information (EVI) extension allows a client to -determine information about core X visuals beyond what the core protocol -provides. -As the X Window System has evolved, it has become clear that the infor- -mation returned by the core X protocol regarding Visuals is often insuf- -ficient for a client to determine which is the most appropriate visual -for its needs. This extension allows clients to query the X server for -additional visual information, specifically as regards colormaps and -framebuffer levels. +13. Easy Resource Configuration -This extension is meant to address the needs of pure X clients only. It -is specifically and purposefully not designed to address the needs of X -extensions. Extensions that have an impact on visual information should -provide their own mechanisms for delivering that information. For exam- -ple, the Double Buffering Extension (DBE) provides its own mechanism for -determining which visuals support double-buffering. - -14.3. Colormap Utilization Policy - - -This extension has three purposes: a) to provide mechanism for a special -application (a colormap manager) to discover any special colormap -requirements, e.g. the colormap entries that are nominally reserved for -desktop colors in the MS-Windows environment and initialize the default -colormap so that it can be more easily shared; and b) to encourage col- -ormap sharing and reduce colormap flashing on low-end 8-bit frame -buffers by providing a policy for sharing; and c) when colormaps aren't -shared, define a behavior in the X server color allocation scheme to -reduce colormap flashing. - -To encourage colormap sharing and accommodate special colormap require- -ments two new protocols are defined: the first provides a way to query -the server for a list of reserved colormap entries, and the second is a -way to initialize read-only (sharable) colormap entries at specific -locations in a colormap. - -To minimize colormap flashing when the root window's default visual is -one of GrayScale, PseudoColor, or DirectColor, and a private colormap -for the default visual is being used, a minor (but compatible) change to -the server implementation of the AllocColor and AllocNamedColor requests -is required. Where the core protocol says nothing about the pixel values -returned, when this extension is in effect, the AllocColor and Alloc- -NamedColor requests will first look for a matching color in the default -colormap, and, if a match is found and the same cell in the private col- -ormap has not already been allocated, the color will be allocated in the -private colormap at the same location as in the default colormap -(instead of in the first available location.) - - -15. Easy Resource Configuration - - Setting and changing resources in X applications can be difficult for both the application programmer and the end user. Resource Configura- tion Management (RCM) addresses this problem by changing the X Intrin- @@ -528,46 +382,18 @@ Intrinsics (libXt). It is neither an X Consortium standard nor an X Pro- ject Team specification. - -16. Xinerama - - -The Xinerama extension provides a way for a multi-headed system to func- -tion as one large screen. Windows can span multiple screens and can move -from one screen to another. - -Currently, the Xinerama Extension works in a homogeneous graphics envi- -ronment. A graphics environment is considered homogeneous if, for exam- -ple, all of the graphics cards have 8 planes with 6 visuals. Mixing a -24-plane graphics card with a 8-plane card creates a heterogeneous envi- -ronment. - -Unlike other multiple screen implementations, Xinerama provides a solu- -tion at the device-independent level. The advantage of this approach is -that it reduces the amount of work involved in supporting and maintain- -ing the extension. The number of graphics devices on the market contin- -ues to grow; embedding the extension functionality into the device -dependent code for each device would be a maintenance nightmare. Since -the Xinerama implementation does not require any low-level graphics mod- -ifications, existing device-dependent code does not have to be recom- -piled. In the loadable server world, the Xinerama Extension will work -with existing device-dependent shared libraries. -The Xinerama extension is not a standard. It is neither an X Consortium -standard nor an X Project Team specification. +14. ANSIfication -17. ANSIfication - - R6.1 was officially the last release that supported traditional K&R C. -Like R6.3, R6.4 assumes a Standard C compiler and environment. We have -not intentionally removed any K&R C support from old code, and most of -the release will continue to build on platforms without an ANSI C com- -piler. +Like R6.3 and R6.4, R6.5 assumes a Standard C compiler and environment. +We have not intentionally removed any K&R C support from old code, and +most of the release will continue to build on platforms without an ANSI +C compiler. -18. VSW5 +15. VSW5 We have tested this release with VSW5 version 5.0.0. This release passes @@ -583,35 +409,40 @@ http://www.rdg.opengroup.org/interpretations/database/. -19. Year 2000 (Y2K) Compliance +16. XtAppPeekEvent() behavior -For a statement of compliance see http://www.camb.open- -group.org/tech/desktop/faq/y2k.htm +XtAppPeekEvent() has been modified in R6.5.1 to behave as it is docu- +mented in the Xt spec. The routine will now process timer events with- +out returning to the caller. However, there are applications which rely +on the previous behavior of XtAppPeekEvent(). One such application is +Netscape, as of version 4.7. +To allow these applications to work with R6.5.1, the environment vari- +able XTAPPPEEKEVENT_SKIPTIMER can be set to any value prior to starting +the application. If the environment variable is set, XtAppPeekEvent() +will revert to its previous behavior. For example, the following shell +commands -20. Memory Testing + export XTAPPPEEKEVENT_SKIPTIMER=1 + /opt/netscape/netscape +can be used to make Netscape function properly with R6.5.1. -Beginning circa X11R5 the MIT X Consortium staff, and later the X Con- -sortium, Inc. staff, and now the X Project Team staff have routinely -tested this implementation for a variety of memory-type errors such as -leaks, array bounds writes, uninitialized memory reads, and a variety of -other errors; using a combination of commercial and "home grown" memory -testing tools. All the real problems were fixed long ago; however we -aren't so naive as to believe that there no remaining bugs. If you find -a memory problem in this implementation please file a bug-report. If you -find a memory problem in your vendor's implementation, tell your vendor. -The popular commercial memory checking tools emit lots of false or spu- -rious warnings, most of which can be safely ignored. +17. Year 2000 (Y2K) Compliance -21. Security Considerations +For a statement of compliance see http://www.camb.open- +group.org/tech/desktop/faq/y2k.htm + + +18. Security Considerations -On UNIX and UNIX-like operating systems there are serious security -implications associated with running suid-root programs. +On UNIX and similar operating systems there are serious security impli- +cations associated with running suid-root programs. + By default the xterm terminal emulation program is installed suid-root in order to be able to update utmp or utmpx entries. All the known (as of this writing) exploitable security holes in the X libraries have been @@ -625,22 +456,20 @@ server. Some people, who prefer not to use xdm, often work around the need for the X server to run with root privileges by making their X server a suid-root program. While all the known (as of this writing) -exploitable security holes in the server have been eliminated, the X -Project Team still recommends that you not make your X server suid-root. -There are safe suid-root wrapper programs available (but not in this -release) that you can use to start your server if you don't want to use -xdm. +exploitable security holes in the server have been eliminated, it is +still recommended that you not make your X server suid-root. There are +safe suid-root wrapper programs available (but not in this release) that +you can use to start your server if you don't want to use xdm. -22. Filing Bug Reports +19. Filing Bug Reports If you find a reproducible bug in software built from the source in this distribution or find bugs in its documentation, please complete a bug- -report using the form in the file xc/bug-report and send it to The Open -Group X Project Team at +report using the form in the file xc/bug-report and send it to: - mailto:xbugs@opengroup.org + mailto:xbugs@x.org Please try to provide all of the information requested on the form if it @@ -651,37 +480,16 @@ handled on any official basis. Consult the documentation for the indi- vidual software to see where (if anywhere) to report the bug. - -23. Acknowledgements - - -Release 6.4 of X11 was brought to you by the X Project Team staff at The -Open Group: Arthur Barstow, Kaleb Keithley, Sekhar Makkapati, M.S. -Ramesh, Jingping Ge, Ken Flowers, and Dave Knorr. -Several companies and individuals have cooperated and worked hard to -make this release a reality, and our thanks go out to them: +20. Acknowledgements -Madeline Asmus of Digital for Xinerama. -Peter Daifuku of Silicon Graphics for Extended-Visual-Information. - -Scott Revelt of Sun Microsystems for preliminary work on TOG-CUP. - -Rob Lembree, formerly of Digital, for DPMS. - Jeff Walls of Hewlett Packard. -Wojtek Jarosz of Attachmate. - -Bob Schulman of Seaweed. - -Brian Bobryk of Digital. - -Tom Brown of NetManage. - Garry Paxinos of Metro Link. + +Irene McCartney of Compaq. -Victor Gold of Peritek. +Paul Shearer of IBM. -Jackie Drane of IBM. +Steve Swales of Sun Microsystems, Inc. Index: xc/bug-report diff -u xc/bug-report:1.3 xc/bug-report:1.4 --- xc/bug-report:1.3 Fri Oct 2 01:05:35 1998 +++ xc/bug-report Mon Jan 22 17:21:32 2001 @@ -1,16 +1,15 @@ [PLEASE make your Subject: line as descriptive as possible. Subjects like "xterm bug" or "bug report" are not helpful!] [Remove all the explanatory text in brackets before mailing.] -[Send to xbugs@opengroup.org, as shown in the sample message +[Send to xbugs@x.org, as shown in the sample message header below] -To: xbugs@opengroup.org +To: xbugs@x.org Subject: [area]: [synopsis] [replace with actual area and short description] VERSION: -R6.4, public-patch-3 -[X Project Team public patches edit this line to indicate the patch level] +R6.5.1, public-patch-1 CLIENT MACHINE and OPERATING SYSTEM: Index: xc/registry diff -u xc/registry:1.3 xc/registry:1.4 --- xc/registry:1.3 Fri Oct 2 01:05:36 1998 +++ xc/registry Mon Jan 22 17:21:32 2001 @@ -1,24 +1,25 @@ -/* $TOG: registry /main/121 1998/06/26 15:34:21 kaleb $ */ +/* $Xorg: registry,v 1.5 2000/08/17 19:41:44 cpqbld Exp $ */ X Registry -The Open Group X Project Team is maintaining a registry of certain X-related +The X.Org Group is maintaining a registry of certain X-related items, to aid in avoiding conflicts and to aid in sharing of such items. Requests to register items, or questions about registration, should be addressed to - xregistry@opengroup.org + xregistry@x.org or to - X Project Team -- X11 Registry - The Open Group - 11 Cambridge Center - Cambridge MA 02142 - USA + The X.Org Group -- X11 Registry + c/o X.Org Chair + Steve Swales + Sun Microsystems, Inc. + 901 San Antonio Road, MS MPK29-203 + Palo Alto, CA 94303-4900 -Electronic mail will be acknowledged upon receipt. Please allow up to 4 weeks -for a formal response to registration and inquiries. +Electronic mail will be acknowledged upon receipt. +Please allow up to 4 weeks for a formal response to registration and inquiries. -The registry is published as part of the X software distribution from The -Open Group X Project Team. +The registry is published as part of the X software distribution +from The X.Org Group. All registered items must have the postal address of someone responsible for the item, or a reference to a document describing the item and the postal @@ -41,6 +42,7 @@ "Apple" [22] "ARDENT" [2] "BBN" [61] +"Compaq" [82] "CRAB" [84] "CRUC" [30] "DEC" [82] @@ -51,6 +53,7 @@ "ES" [75] "FXD" [55] "FUJITSU" [87] +"HP" [35] "IBM" [33] "ICS" [31] "ILA" [62] @@ -98,7 +101,7 @@ 2. KEYSYMS Only "private" keysyms (with 29th bit set) can be registered by organizations; -standard keysyms must be approved by the X Project Team. Since keysym numeric +standard keysyms must be approved by the X.Org Group. Since keysym numeric values are explicitly private, we will permit (but not encourage) conflicting registration here. @@ -307,6 +310,7 @@ "Apollo Computer Inc." [1] "Apple Computer, Inc." [22] "Ardent Computer Corporation" [2] +"Compaq Computer Corporation" [82] "Crab Advanced Technologies Ltd" [84] "Crucible" [30] "Data General Corporation" [48] @@ -314,6 +318,7 @@ "EFW, Inc." [124] "Evans & Sutherland" [75] "FUJITSU LIMITED" [87] +"Hewlett-Packard Company" [35] "International Business Machines" [33] "JAPAN COMPUTER CORP." [90] "Jupiter Systems Inc." [93] @@ -333,6 +338,8 @@ "Sun Microsystems, Inc." [101] "Tech-Source Inc." [106] "The XFree86 Project, Inc" [113] +"The X.Org Group" [8] +"The X.Org Group / The XFree86 Project, Inc" [113] [8] "VIT-Visual Information Technologies, Inc (VITec)" [46] "Wolfram Research, Inc." [102] "Wyse Technology Inc." [68] @@ -433,8 +440,7 @@ 6. HOST FAMILIES See the "family" component of the HOST structure in the protocol. -Values for private families will be assigned by The Open Group's X Project -Team. +Values for private families will be assigned by The X.Org Group. Value Name Reference ----- ---- --------- @@ -727,7 +733,7 @@ "JISX0208.1983-1" [40] (deprecated) Japanese Graphic Character Set, - GL encoding + GR encoding "JISX0212.1990-0" [72] Supplementary Japanese Graphic Character Set, GL encoding @@ -739,7 +745,7 @@ "KSC5601.1987-1" [41] (deprecated) Korean Graphic Character Set, - GL encoding + GR encoding "omron_CNS11643-0" [45] "omron_CNS11643-1" [45] "omron_BIG5-0" [45] @@ -1033,13 +1039,49 @@ 2011 N. Shoreline Blvd. Mountain View, CA 94309-7311 -[7] The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 - -[8] The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 +[7] The Open Group + Apex Plaza,Forbury Road, + Reading,Berks.RG1 1AX,England + Howard Greenwell + h.greenwell@opengroup.org + +[8] The X standards body maintaining X11 and related standards: + 1988-1993 The MIT X Consortium + 1993-1996 The X Consortium + 1997-1998 The Open Group X Project Team + 1998- The X.Org Group + + The X.Org Group current contact information + (website, mail-lists, Manager, Chair, Co-Chair) + + X.Org website: + www.x.org + + X.Org mail-lists: (See web site for additional mail-lists.) + xregistry@x.org X.Org X registry + xorg_team@x.org X.Org general business + xorg_stds@x.org X.Org standards + + X.Org Non-Profit Business Manager: + The Open Group + Apex Plaza,Forbury Road, + Reading,Berks.RG1 1AX,England + Howard Greenwell + h.greenwell@opengroup.org + + X.Org Chair: + Steve Swales + Sun Microsystems, Inc. + 901 San Antonio Road, MS MPK29-203 + Palo Alto, CA 94303-4900 + steve.swales@eng.sun.com + + X.Org Co-Chair: + Irene McCartney + Compaq Computer Corporation + 110 Spitbrook Road, ZKO3-3/T79 + Nashua, NH 03062 + irene@zk3.dec.com [9] PEX Protocol Specification PEX Protocol Encoding @@ -1047,24 +1089,20 @@ Randi Rost, Digital, document editor [10] Extending X for Double-Buffering, Multi-Buffering, and Stereo - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [11] X Display Manager Control Protocol - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [12] Compound Text Encoding - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [13] X11 Nonrectangular Window Shape Extension - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [14] VEX - Video Extension to X Todd Brunhoff, Tektronix @@ -1073,21 +1111,18 @@ character sets, parts 1 through 10 [16] Inter-Client Communication Conventions Manual - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [17] Obsolete [18] Xlib Manual - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [19] X Logical Font Description Conventions - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [20] IXI Limited @@ -1096,20 +1131,23 @@ [22] Apple Computer, Inc. [23] X Window System Protocol - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [24] Adobe Systems, Inc. [25] Bitstream, Inc. [26] Xt Intrinsics Manual - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [27] Digital Equipment Corporation + Irene McCartney + Compaq Computer Corporation + 110 Spitbrook Road, ZKO3-3/T79 + Nashua, NH 03062 + irene@zk3.dec.com [28] Steve Pitschke Stellar Computer, Inc. @@ -1124,18 +1162,17 @@ [30] Crucible Santa Cruz, CA -[31] Chris D. Peterson +[31] Mark Hatch Integrated Computer Solutions, Inc. - 11 Cambridge Center - Cambridge, MA 02139 + 201 Broadway + Cambridge, MA 02139 [32] Kyou Katoh PFU LIMITED 687-1 Tsuruma 7 Gou Machida-shi Tokyo 194, Japan -[33] Jeanne K. Smith - D46/996 3500 +[33] Dan McNichol /IMAD 9564 International Business Machines 11400 Burnet Road Austin, TX 78758 @@ -1143,18 +1180,15 @@ [34] Anonymous MIT Software Distribution -[35] Larry Woestman - Hewlett Packard Co. - Corvallis Workstation Operation - 1000 NE Circle Blvd. - Corvallis, OR 97330 - -[36] Tom McFarland - Hewlett-Packard, Co. - Corvallis Information Systems - 1000 N.E. Circle Blvd. - Covallis, OR 97330 +[35] (Originally Larry Woestman) + Paul Anderson + Hewlett Packard + 3404 E. Harmony Road, MS-74 + Fort Collins, CO 80528-9599 +[36] (Originally Tom McFarland) + See Reference [35] + [37] Hideo Irie Work Station Division SuperMicro Systems Group @@ -1175,7 +1209,7 @@ PO Box 7900 Mountain View, CA 94039-7900 -[43] Dave Cassing +[43] (Originally Dave Cassing) X Strategy Team Tektronix, Inc. PO Box 1000 @@ -1223,6 +1257,7 @@ Plano, TX 75075 [47] X11R4 + See Reference [8] [48] Data General Corp. 62 T.W. Alexander Dr. @@ -1273,16 +1308,15 @@ MIT Station Cambridge, MA 02139-0901 -[57] David Rosenthal +[57] (Originally David Rosenthal) + Steve Swales Sun Microsystems, Inc. - 2550 Garcia Avenue - Mountain View, CA 94043 + 901 San Antonio Road, MS MPK29-203 + Palo Alto, CA 94303-4900 + steve.swales@eng.sun.com -[58] Murali V. Srinivasan - MTV21-228 - Sun Microsystems, Inc. - 2550 Garcia Avenue - Mountain View, CA 94043-1100 +[58] (Originally Murali V. Srinivasan) + See Reference [57] [59] Keith Robson Ipsys Software plc @@ -1294,6 +1328,7 @@ Lewis, Trachtenberg & Associates One Kendall Square (Building 200, Fourth Floor) Cambridge, MA 02139-1564 + dbl@ics.com [61] James J Dempsey Bolt Beranek and Newman Inc. @@ -1377,15 +1412,13 @@ No. 30 Kowa Bldg. 2-4-5 Roppongi, Minato-ku Tokyo, 106 Japan -[78] Jeff Stevenson; MS 74 - Hewlett-Packard Co. - 3404 E. Harmony Road - Fort Collins, CO 80525-9599 +[78] (Originally Jeff Stevenson) + See Reference [35] [79] Garry M. Paxinos Metro Link Incorporated - 2213 W. McNab Rd - Pompano Beach, FL 33069 + 5807 N. Andrews Way + Ft. Lauderdale, FL 33309 [80] John Dennis Stardent Computer @@ -1404,6 +1437,11 @@ 146 Main St. Maynard, MA 01754 + Irene McCartney + Compaq Computer Corporation + 110 Spitbrook Road, ZKO3-3/T79 + Nashua, NH 03062 + [83] Mark W. Snitily Snitily Graphics Consulting Services 894 Brookgrove Lane @@ -1449,10 +1487,8 @@ 3333 Coyote Hill Rd. Palo Alto, CA 94304 -[92] Rick Heli - Sun Microsystems, Inc. - 2550 Garcia Avenue - Mountain View, CA 94043-1100 +[92] (Originally Rick Heli) + See Reference [57] [93] Russell Leefer Jupiter Systems @@ -1460,9 +1496,8 @@ 1351 Harbor Bay Parkway Alameda, CA 94501 -[94] The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 +[94] The X.Org Group + See Reference [8] [95] Greg Stiehl Kubota Pacific Computer @@ -1470,14 +1505,12 @@ Santa Clara, CA 95051-0905 [96] MIT Screen Saver Extension - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [97] Big Requests Extension - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [98] Randi Rost Kubota Pacific Computer @@ -1494,11 +1527,8 @@ Omika Works, Hitatchi Ltd. 5-2-1 Omika-cho, Hitachi-shi, Ibaraki-ken, 319-12 Japan -[101] Milind Pansare - Mailstop MTV21-228 - Sun Microsystems, Inc. - 2550 Garcia Ave., - Mountain View CA. 94043 +[101] (Originally Milind Pansare) + See Reference [57] [102] John L. Cwikla Wolfram Research, Inc. @@ -1508,13 +1538,11 @@ [103] University of Washington for WM Tamil fonts -[104] The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 +[104] The X Consortium + See Reference [8] [105] The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + See Reference [8] [106] Selwyn Henriques Tech-Source, Inc. @@ -1525,24 +1553,20 @@ character set for information interchange [108] X Synchronization Extension - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [109] XC-MISC Extension - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [110] X Image Extension - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [111] X Keyboard Extension - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 01242 + The X.Org Group + See Reference [8] [112] Allan Frankel Megatek Corporation @@ -1555,10 +1579,8 @@ 46030 Manekin Plaza, Suite 160 Dulles, VA 20166 -[114] Stuart W. Marks - SunSoft, Inc. - 2550 Garcia Avenue, Mail Stop UMTV 21-122 - Mountain View, CA 94043-1100 +[114] (Originally Stuart W. Marks) + See Reference [57] [115] Michael Gehret X/software @@ -1590,22 +1612,16 @@ E-mail: info@cronyx.ru [121] Sun Microsystems Federal, Inc. Trusted Solaris Extension, - Milind Pansare - Secure User Interface Group, - Sun Microsystems Federal, Inc. - Mail Stop MIL06-94 - 2550 Garcia Avenue, - Mountain View, CA 94043-1100 + (Originally Milind Pansare) + See Reference [57] [122] Record Extension - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 + The X.Org Group + See Reference [8] [123] Double Buffer Extension Specification - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 + The X.Org Group + See Reference [8] [124] James A. Moulton EFW, Inc @@ -1613,44 +1629,36 @@ Ft. Worth, Texas 76136 [125] Low Bandwidth X Extension Specification - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 + The X.Org Group + See Reference [8] [126] Security Extension Specification - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 + The X.Org Group + See Reference [8] [127] Application Group Extension Specification - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 + The X.Org Group + See Reference [8] [128] X11 Input Extension Protocol Specification - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 + The X.Org Group + See Reference [8] [129] X Print Extension Protocol Specification - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 + The X.Org Group + See Reference [8] [130] XINERAMA - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 + The X.Org Group + See Reference [8] [131] Colormap Utilization Policy Extension Protocol Specification - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 + The X.Org Group + See Reference [8] [132] Display Power Management Signaling Extension Protocol Specification - The Open Group X Project Team - 11 Cambridge Center - Cambridge MA 02142 + The X.Org Group + See Reference [8] [133] ISO10646 Information technology -- Universal Multiple-Octet Coded Character Set (UCS), part 1 @@ -1660,3 +1668,4 @@ New Museums Site, Pembroke Street Cambridge CB2 3QG United Kingdom + Index: xc/config/Imakefile diff -u xc/config/Imakefile:1.2 xc/config/Imakefile:1.3.2.1 --- xc/config/Imakefile:1.2 Sat Feb 12 19:12:18 2000 +++ xc/config/Imakefile Thu May 31 18:20:18 2001 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: Imakefile /main/6 1996/09/28 16:04:42 rws $ -XCOMM $XFree86: xc/config/Imakefile,v 1.2 2000/02/13 00:12:18 dawes Exp $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ +XCOMM $XFree86: xc/config/Imakefile,v 1.3.2.1 2001/05/31 22:20:18 dawes Exp $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" @@ -11,6 +11,20 @@ PSWRAPDIR = pswrap #endif SUBDIRS = cf $(BOOTSTRAPSUBDIRS) util $(PSWRAPDIR) + +#if defined(XFree86VersionString) && defined(ProjectRoot) && \ + defined(BuildBindist) +all:: version + +version: cf/version.def + RemoveFile(version) + echo XFree86VersionString > version + +InstallNamedNonExec(version,.XFree86_Version,ProjectRoot) + +clean:: + RemoveFile(version) +#endif MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) Index: xc/config/cf/Amoeba.cf diff -u xc/config/cf/Amoeba.cf:3.9 xc/config/cf/Amoeba.cf:3.10 --- xc/config/cf/Amoeba.cf:3.9 Mon Dec 23 00:50:00 1996 +++ xc/config/cf/Amoeba.cf Wed Jan 17 11:22:29 2001 @@ -1,5 +1,5 @@ -XCOMM platform: $XConsortium: Amoeba.cf /main/12 1996/09/28 16:04:48 rws $ -XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.9 1996/12/23 05:50:00 dawes Exp $ +XCOMM platform: $Xorg: Amoeba.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/Amoeba.cf,v 3.10 2001/01/17 16:22:29 dawes Exp $ /* The presence of this configuration file in the X distribution * does not imply full support for the system it describes. Index: xc/config/cf/DGUX.cf diff -u xc/config/cf/DGUX.cf:1.5 xc/config/cf/DGUX.cf:1.6 --- xc/config/cf/DGUX.cf:1.5 Fri Jul 7 16:06:56 2000 +++ xc/config/cf/DGUX.cf Fri Jan 12 14:28:20 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.5 2000/07/07 20:06:56 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/DGUX.cf,v 1.6 2001/01/12 19:28:20 dawes Exp $ /* Copyright Takis Psarogiannakopoulos * This is the DG/ux configuration file of X11R6.3 */ @@ -101,7 +101,9 @@ #define ToolkitStringsABIOptions -intelabi -earlyR6bc #endif +#ifndef DefaultCCOptions #define DefaultCCOptions /* -ansi -pedantic */ +#endif #define OptimizedCDebugFlags -O2 /* Add -g -mstandard for full debuging info */ #define OptimizedCplusplusDebugFlags #define DebuggableCDebugFlags -g -mstandard Index: xc/config/cf/FreeBSD.cf diff -u xc/config/cf/FreeBSD.cf:3.101 xc/config/cf/FreeBSD.cf:3.109 --- xc/config/cf/FreeBSD.cf:3.101 Mon Dec 4 13:49:09 2000 +++ xc/config/cf/FreeBSD.cf Thu May 3 16:12:35 2001 @@ -1,8 +1,8 @@ -XCOMM platform: $TOG: FreeBSD.cf /main/21 1997/10/05 20:42:34 kaleb $ +XCOMM platform: $Xorg: FreeBSD.cf,v 1.3 2000/08/17 19:41:45 cpqbld Exp $ XCOMM XCOMM XCOMM -XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.101 2000/12/04 18:49:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/FreeBSD.cf,v 3.109 2001/05/03 20:12:35 alanh Exp $ #ifndef UseElfFormat #define UseElfFormat DefaultToElfFormat @@ -36,7 +36,7 @@ #define OSRelVersion __FreeBSD_version #endif -XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OsRelVersion) +XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion) (OSRelVersion) #define HasCplusplus YES @@ -60,6 +60,44 @@ #define HasVarRun YES #define HasVarDb YES +#if (OSMajorVersion > 1) +#define InstallXloadSetGID NO +#else +#define InstallXloadSetGID YES +#endif + +/* + * Multi-thread safe libs + */ +/* 2.2.7 and later has libc_r (POSIX threads) */ +#if OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7 || \ + OSMajorVersion >= 3 +# ifndef HasLibPthread +# define HasLibPthread NO +# endif +# define HasPosixThreads YES +# define ThreadedX YES +/* + * math.h uses _REENTRANT and stdio.h uses _THREAD_SAFE, so define both. + */ +# define SystemMTDefines -D_REENTRANT -D_THREAD_SAFE +/* + * FreeBSD has tread-safe api but no getpwnam_r yet. + */ +# define HasThreadSafeAPI YES +# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI +# if HasLibPthread +# define ThreadsLibraries -lpthread +# else +# define BuildThreadStubLibrary YES +# define NeedUIThrStubs YES +# define ThreadsCompileFlags -pthread +# define ThreadsLibraries -pthread +# define SharedX11Reqs $(LDPRELIB) $(XTHRSTUBLIB) +# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) $(XTHRSTUBLIB) +# endif +#endif + #define AvoidNullMakeCommand YES #define StripInstalledPrograms YES #define CompressAllFonts YES @@ -81,17 +119,50 @@ #ifndef HasFlex #define HasFlex YES #endif + +#ifndef HasMktemp +#if (OSMajorVersion >= 4) || (OSMajorVersion == 3 && OSMinorVersion >= 1) || \ + (OSMajorVersion == 2 && OSMinorVersion == 2 && OSTeenyVersion >= 7) +#define HasMktemp YES +#else +#define HasMktemp NO +#endif +#endif -#define CcCmd cc +/* + * 2.2.x has perl 4 by default, not perl 5. + */ +#if (OSMajorVersion <= 2) +#ifndef HasPerl5 +#define HasPerl5 NO +#endif +#endif + +/* + * Add an LD_LIBRARY_PATH environment variable, defined by $(CLIENTENVSETUP), + * when building X to avoid that for each client ld give the message + * + * ld: warning: libXThrStub.so.6, needed by libX11.so, not found + */ +#if BuildThreadStubLibrary && !UseInstalled +# define CcCmd $(CLIENTENVSETUP) cc +# define CplusplusCmd $(CLIENTENVSETUP) c++ +#else +# define CcCmd cc +# define CplusplusCmd c++ +#endif + #define CppCmd /usr/bin/cpp #define PreProcessCmd CppCmd #define StandardCppOptions -traditional #define StandardCppDefines /**/ +#ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ #else #define DefaultCCOptions -ansi -pedantic -Dasm=__asm GccWarningOptions #endif +#endif #ifndef ExtraLibraries /* support for multi-byte locales is in libxpg4 rather than libc */ #if (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 2)) && \ @@ -210,8 +281,10 @@ /* PAM appeared in FreeBSD 3.1 */ #if (OSMajorVersion > 3) || (OSMajorVersion == 3 && OSMinorVersion >=1 ) +#ifndef HasPam #define HasPam YES #endif +#endif /* * For FreeBSD 2.2.5 and later don't make any assumptions about the version @@ -385,7 +458,7 @@ # define PreIncDir /usr/include #endif -#define TroffCmd groff -Tps +#define HasGroff YES #define NroffCmd groff -Tascii #define SetTtyGroup YES @@ -406,85 +479,6 @@ */ #ifndef CompressManPages # define CompressManPages YES -#endif - -#if CompressManPages - -#ifndef CompressManCmd -# define CompressManCmd gzip -n -#endif - COMPRESSMANCMD = CompressManCmd - -#ifndef InstallManPageLong -#define InstallManPageLong(file,destdir,dest) @@\ -BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ - @@\ -install.man:: file.man @@\ - MakeDir($(DESTDIR)destdir) @@\ - $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\ - $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ - -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX) -#endif - -#ifndef InstallGenManPageLong -#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ -BuildInstallHtmlManPage(file,dest,suffix) @@\ - @@\ -install.man:: file.man @@\ - MakeDir($(DESTDIR)destdir) @@\ - $(RM) $(DESTDIR)destdir/dest.suffix* @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.man \ @@\ - $(DESTDIR)destdir/dest.suffix @@\ - -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix -#endif - -#ifndef InstallMultipleMan -#define InstallMultipleMan(list,dest) @@\ -install.man:: list @@\ - MakeDir($(DESTDIR)dest) @@\ - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ - for i in list; do \ @@\ - (MNAME=`echo $$i | cut -f1 -d.`; \ @@\ - set -x; \ @@\ - $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\ - $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\ - $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\ - done -#endif - -/* - * InstallManPageAliases - install soft links for aliases. - */ -#ifndef InstallManPageAliasesBase -#define InstallManPageAliasesBase(file,destdir,aliases) @@\ -install.man:: @@\ - @(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\ - for i in aliases; do (set -x; \ @@\ - $(RM) $(DESTDIR)destdir/$$i.*; \ @@\ - (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\ - $$i.$${SUFFIX})); \ @@\ - done) -#endif - -#ifndef InstallManPageAliases -#define InstallManPageAliases(file,destdir,aliases) @@\ -InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ - @@\ -InstallManPageAliasesBase(file,destdir,aliases) -#endif - - -/* - * InstallGenManPageAliases - install soft links for aliases. - */ -#ifndef InstallGenManPageAliases -#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ -InstallHtmlManPageAliases(file,aliases,suffix) @@\ - @@\ -InstallManPageAliasesBase(file,destdir,aliases) -#endif #endif #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 1) Index: xc/config/cf/Imake.cf diff -u xc/config/cf/Imake.cf:3.63 xc/config/cf/Imake.cf:3.67 --- xc/config/cf/Imake.cf:3.63 Mon Nov 6 14:24:00 2000 +++ xc/config/cf/Imake.cf Wed Apr 18 13:13:58 2001 @@ -1,4 +1,4 @@ -XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ +XCOMM $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ /* * To add support for another platform: * @@ -17,13 +17,21 @@ * * 4. Create a .cf file with the name given by MacroFile. */ -XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.63 2000/11/06 19:24:00 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Imake.cf,v 3.67 2001/04/18 17:13:58 dawes Exp $ #if defined(__APPLE__) # undef __APPLE__ # define MacroIncludeFile # define MacroFile darwin.cf # define DarwinArchitecture +# ifdef __ppc__ +# define PpcDarwinArchitecture +# undef __ppc__ +# endif +# ifdef __i386__ +# define i386DarwinArchitecture +# undef __i386__ +# endif #endif #if defined(clipper) || defined(__clipper__) @@ -41,6 +49,7 @@ #undef i386 #undef __i386__ #undef _X86_ +#undef __CYGWIN__ #endif /* CYGWIN */ #ifdef ultrix @@ -53,6 +62,7 @@ # ifdef mips # undef mips # define MipsArchitecture +# define MipselArchitecture # endif # undef ultrix # define UltrixArchitecture @@ -567,6 +577,7 @@ # ifdef __mips__ # undef __mips__ # define MipsArchitecture +# define MipselArchitecture # endif # ifdef __alpha # undef __alpha @@ -743,6 +754,11 @@ # define MipsArchitecture # undef mips # undef __mips__ +# if defined(MIPSEL) || defined(_MIPSEL) +# define MipselArchitecture +# endif +# undef MIPSEL +# undef _MIPSEL # endif XCOMM for compatibility with 3.3.x # ifdef PpcArchitecture @@ -799,17 +815,14 @@ # define mc68000Architecture #endif /* __sxg__ */ -#if defined(sequent) || defined(_SEQUENT_) +#ifdef _SEQUENT_ +/* undefine assignments resulting from -DSVR4 */ +# undef MacroIncludeFile # define MacroIncludeFile +# undef MacroFile # define MacroFile sequent.cf -# ifdef sequent -# undef sequent -# define Dynix3Architecture -# endif -# ifdef _SEQUENT_ -# undef _SEQUENT_ -# define DynixPtxArchitecture -# endif +# undef _SEQUENT_ +# define DynixPtxArchitecture # define SequentArchitecture #endif Index: xc/config/cf/Imake.rules diff -u xc/config/cf/Imake.rules:3.86 xc/config/cf/Imake.rules:3.94 --- xc/config/cf/Imake.rules:3.86 Tue Dec 12 12:05:30 2000 +++ xc/config/cf/Imake.rules Thu Apr 26 17:27:48 2001 @@ -1,11 +1,11 @@ XCOMM --------------------------------------------------------------------- XCOMM Imake rules for building libraries, programs, scripts, and data files -XCOMM rules: $TOG: Imake.rules /main/227 1998/02/02 12:07:57 kaleb $ +XCOMM rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM XCOMM XCOMM -XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.86 2000/12/12 17:05:30 dawes Exp $ +XCOMM rules: $XFree86: xc/config/cf/Imake.rules,v 3.94 2001/04/26 21:27:48 dawes Exp $ /* * MACHINE-INDEPENDENT RULES; DO NOT MODIFY @@ -466,7 +466,7 @@ RemoveTargetProgram($@) @@\ $(CCENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CC) -o $@ $(LDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\ @@\ -clean clean.tc:: @@\ +clean cleantc:: @@\ RemoveFiles(program.tc program.tc.*.*) #else #define ProofProgramTarget(program,deplist,linklist) /**/ @@ -483,7 +483,7 @@ RemoveTargetProgram($@) @@\ $(CXXENVSETUP) $(PROOF) $(PROOFOPTIONS) $(CXX) -o $@ $(CXXLDOPTIONS) linklist $(EXTRA_LOAD_FLAGS) @@\ @@\ -clean clean.tc:: @@\ +clean cleantc:: @@\ RemoveFiles(program.tc program.tc.*.*) #else #define ProofCplusplusProgramTarget(program,deplist,linklist) /**/ @@ -493,7 +493,7 @@ #ifndef ProofCleanTarget #if HasTestCenter #define ProofCleanTarget() @@\ -clean clean.tc:: @@\ +clean cleantc:: @@\ $(RM) -r TC.Cache #else #define ProofCleanTarget() /**/ @@ -1185,6 +1185,7 @@ #endif /* InstallLintLibrary */ +#if !CompressManPages /* * InstallManPageLong - generate rules to install the indicated manual page, * giving it an alternate name. This is used for installing man pages whose @@ -1196,20 +1197,13 @@ #define InstallManPageLong(file,destdir,dest) @@\ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ @@\ -InstallNamedTarget(install.man,file.man,$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX)) +CppManTarget(file,$(EXTRAMANDEFS)) @@\ + @@\ +InstallNamedTarget(install.man,file.$(MANNEWSUFFIX),$(INSTMANFLAGS),destdir,dest.$(MANSUFFIX)) #endif /* InstallManPageLong */ /* - * InstallManPage - generate rules to install the indicated manual page. - */ -#ifndef InstallManPage -#define InstallManPage(file,destdir) @@\ -InstallManPageLong(file,destdir,file) -#endif /* InstallManPage */ - - -/* * InstallManPageAliases - generate rules to install manual page aliases. */ #ifndef InstallManPageAliases @@ -1217,7 +1211,7 @@ InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ @@\ install.man:: @@\ - @(TMP=/tmp/tmp.$$$$; \ @@\ + @(TMP=#tmp.$$$$; \ @@\ RemoveFile($${TMP}); \ @@\ echo .so `basename destdir`/file.$(MANSUFFIX) > $${TMP}; \ @@\ for i in aliases; do (set -x; \ @@\ @@ -1234,23 +1228,17 @@ #ifndef InstallGenManPageLong #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ BuildInstallHtmlManPage(file,dest,suffix) @@\ + @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ @@\ -install.man:: file.man @@\ +install.man:: file.$(MANNEWSUFFIX) @@\ MakeDir($(DESTDIR)destdir) @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.man $(DESTDIR)destdir/dest.suffix + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ + $(DESTDIR)destdir/dest.suffix #endif /* InstallGenManPageLong */ /* - * InstallGenManPage - general equivalent of InstallManPage - */ -#ifndef InstallGenManPage -#define InstallGenManPage(file,destdir,suffix) @@\ -InstallGenManPageLong(file,destdir,file,suffix) -#endif /* InstallGenManPage */ - - -/* * InstallGenManPageAliases - general equivalent of InstallManPageAliases */ #ifndef InstallGenManPageAliases @@ -1258,7 +1246,7 @@ InstallHtmlManPageAliases(file,aliases,suffix) @@\ @@\ install.man:: @@\ - @(TMP=/tmp/tmp.$$$$; \ @@\ + @(TMP=#tmp.$$$$; \ @@\ RemoveFile($${TMP}); \ @@\ echo .so `basename destdir`/file.suffix > $${TMP}; \ @@\ for i in aliases; do (set -x; \ @@\ @@ -1267,6 +1255,103 @@ RemoveFile($${TMP})) #endif /* InstallGenManPageAliases */ +#else /* CompressManPages */ + +#ifndef InstallManPageLong +#define InstallManPageLong(file,destdir,dest) @@\ +BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ + @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +install.man:: file.$(MANNEWSUFFIX) @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ + $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ + -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.$(MANSUFFIX) +#endif + +#ifndef InstallGenManPageLong +#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ +BuildInstallHtmlManPage(file,dest,suffix) @@\ + @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ +install.man:: file.$(MANNEWSUFFIX) @@\ + MakeDir($(DESTDIR)destdir) @@\ + $(RM) $(DESTDIR)destdir/dest.suffix* @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANNEWSUFFIX) \ @@\ + $(DESTDIR)destdir/dest.suffix @@\ + -$(COMPRESSMANCMD) $(DESTDIR)destdir/dest.suffix +#endif + +#ifndef InstallMultipleMan +#define InstallMultipleMan(list,dest) @@\ +install.man:: list @@\ + MakeDir($(DESTDIR)dest) @@\ + @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ + for i in list; do \ @@\ + (MNAME=`echo $$i | cut -f1 -d.`; \ @@\ + set -x; \ @@\ + $(RM) $(DESTDIR)dest/$${MNAME}*; \ @@\ + $(INSTALL) -c $(INSTMANFLAGS) $$i \ @@\ + $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX); \ @@\ + $(COMPRESSMANCMD) $(DESTDIR)dest/$${MNAME}.$(MANSUFFIX)); \ @@\ + done +#endif + +/* + * InstallManPageAliases - install soft links for aliases. + */ +#ifndef InstallManPageAliasesBase +#define InstallManPageAliasesBase(file,destdir,aliases) @@\ +install.man:: @@\ + @(SUFFIX=`echo $(DESTDIR)destdir/file.* | sed -e 's,.*/[^\.]*.,,'`; \ @@\ + for i in aliases; do (set -x; \ @@\ + $(RM) $(DESTDIR)destdir/$$i.*; \ @@\ + (cd $(DESTDIR)destdir; $(LN) file.$${SUFFIX} \ @@\ + $$i.$${SUFFIX})); \ @@\ + done) +#endif + +#ifndef InstallManPageAliases +#define InstallManPageAliases(file,destdir,aliases) @@\ +InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ + @@\ +InstallManPageAliasesBase(file,destdir,aliases) +#endif + + +/* + * InstallGenManPageAliases - install soft links for aliases. + */ +#ifndef InstallGenManPageAliases +#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ +InstallHtmlManPageAliases(file,aliases,suffix) @@\ + @@\ +InstallManPageAliasesBase(file,destdir,aliases) +#endif + +#endif /* CompressManPages */ + + +/* + * InstallManPage - generate rules to install the indicated manual page. + */ +#ifndef InstallManPage +#define InstallManPage(file,destdir) @@\ +InstallManPageLong(file,destdir,file) +#endif /* InstallManPage */ + + +/* + * InstallGenManPage - general equivalent of InstallManPage + */ +#ifndef InstallGenManPage +#define InstallGenManPage(file,destdir,suffix) @@\ +InstallGenManPageLong(file,destdir,file,suffix) +#endif /* InstallGenManPage */ + /* * RmanDependency - generate rules to build the rman program if @@ -1300,10 +1385,10 @@ #define BuildInstallHtmlManPage(file,dest,suffix) @@\ AllTarget(dest.suffix.html) @@\ @@\ -dest.suffix.html: file.man RmanCmdDependency @@\ +dest.suffix.html: file.$(MANNEWSUFFIX) RmanCmdDependency @@\ RemoveFiles(dest.suffix.html dest.suffix-html) @@\ - RunProgram(RMAN,$(RMANOPTIONS) < file.man > dest.suffix-html) && \ @@\ - $(MV) dest.suffix-html $@ @@\ + RunProgram(RMAN,$(RMANOPTIONS) < file.$(MANNEWSUFFIX) \ @@\ + > dest.suffix-html) && $(MV) dest.suffix-html $@ @@\ @@\ install.man:: dest.suffix.html @@\ MakeDir($(DESTDIR)$(DOCHTMLDIR)) @@\ @@ -2188,7 +2273,7 @@ #ifndef SwitchYYPrefix #define SwitchYYPrefix(in,out,prefix) \ - sed 's/yy/prefix/g' in > out && RemoveFile(in) + sed 's/yy/prefix/g' in | sed 's/__REALLY_YY__/yy/' > out && RemoveFile(in) #endif #ifndef LexFilePrefix @@ -3069,13 +3154,24 @@ #endif /* CppFileTarget */ /* - * CppManTarget - generates rules to create man source from a file with a .cpp - * suffix. OS-specific man sections are replaced. + * CppManTarget - preprocess man pages. OS-specific man sections are replaced. */ #ifndef CppManTarget +#if !DontPreprocessManPages || defined(PreprocessManPages) +#define CppManTarget(name,defs) @@\ +AllTarget(name.$(MANNEWSUFFIX)) @@\ +CppRawFileTarget(name.$(MANNEWSUFFIX),name.$(MANSRCSUFFIX),$(MANDEFS) defs,NullParameter) +#else #define CppManTarget(name,defs) @@\ -AllTarget(name.man) @@\ -CppRawFileTarget(name.man,name.cpp,$(MANDEFS) defs,NullParameter) +AllTarget(name.$(MANNEWSUFFIX)) @@\ + @@\ +name.$(MANNEWSUFFIX): name.$(MANSRCSUFFIX) @@\ + RemoveFile($@) @@\ + $(LN) name.$(MANSRCSUFFIX) $@ @@\ + @@\ +clean:: @@\ + RemoveFile(name.$(MANNEWSUFFIX)) +#endif #endif /* CppManTarget */ /* @@ -3158,7 +3254,7 @@ * ObjectModuleTarget - build a module as a single object file */ #ifndef ObjectModuleTarget -#if MakeDllModules +#if MakeDllModules && DoLoadableServer #define ObjectModuleTarget(module,objects) @@\ DynamicModuleTarget(Concat(module,_drv.so), objects) #else @@ -3171,7 +3267,7 @@ * LibraryModuleTarget */ #ifndef LibraryModuleTarget -#if MakeDllModules +#if MakeDllModules && DoLoadableServer #define LibraryModuleTarget(module,objects) @@\ NormalLibraryTarget(module, objects) @@\ DynamicModuleTarget(Concat3(lib,module,.so), objects) @@ -3185,7 +3281,7 @@ * DepLibraryModuleTarget */ #ifndef DepLibraryModuleTarget -#if MakeDllModules +#if MakeDllModules && DoLoadableServer #define DepLibraryModuleTarget(module,deplist,objects) @@\ NormalDepLibraryTarget(module, deplist, objects) @@\ DepDynamicModuleTarget(Concat3(lib,module,.so), deplist, objects) Index: xc/config/cf/Imake.tmpl diff -u xc/config/cf/Imake.tmpl:3.87 xc/config/cf/Imake.tmpl:3.102 --- xc/config/cf/Imake.tmpl:3.87 Sat Dec 2 14:06:57 2000 +++ xc/config/cf/Imake.tmpl Thu Apr 26 17:09:38 2001 @@ -1,11 +1,11 @@ XCOMM ---------------------------------------------------------------------- XCOMM Makefile generated from IMAKE_TEMPLATE and INCLUDE_IMAKEFILE -XCOMM $TOG: Imake.tmpl /main/249 1997/10/13 15:28:56 kaleb $ +XCOMM $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.87 2000/12/02 19:06:57 herrb Exp $ +XCOMM $XFree86: xc/config/cf/Imake.tmpl,v 3.102 2001/04/26 21:09:38 dawes Exp $ XCOMM ---------------------------------------------------------------------- /* @@ -32,6 +32,10 @@ .SUFFIXES: .i +/* Intercept clean rules for current directory */ +#undef clean +#define clean cleandir + #include XCOMM ----------------------------------------------------------------------- @@ -190,6 +194,10 @@ #define HasPerl YES #endif +#ifndef HasPerl5 +#define HasPerl5 HasPerl +#endif + #ifndef PerlCmd #define PerlCmd perl #endif @@ -231,6 +239,18 @@ #define BuildHtmlManPages NO #endif +#ifndef DontPreprocessManPages +#ifdef UseInstalled +#define DontPreprocessManPages YES +#else +#define DontPreprocessManPages NO +#endif +#endif + +#ifndef HasGroff +#define HasGroff NO +#endif + #ifndef HasCookieMaker #define HasCookieMaker NO #endif @@ -362,7 +382,7 @@ #ifndef ByteOrder #if defined(VaxArchitecture) #define ByteOrder X_LITTLE_ENDIAN -#elif defined(MipsArchitecture) && (defined(UltrixArchitecture) || defined(OSF1Architecture)) +#elif defined(MipsArchitecture) && defined(MipselArchitecture) #define ByteOrder X_LITTLE_ENDIAN #elif defined(MipsArchitecture) #define ByteOrder X_BIG_ENDIAN @@ -396,6 +416,9 @@ #define HasCplusplus NO #endif #endif +#ifndef HasMktemp +#define HasMktemp NO /* if you have the mktemp command */ +#endif #ifndef HasNdbm #define HasNdbm NO #endif @@ -433,6 +456,10 @@ #ifndef GzipLibrary /* if OS config didn't define it, assume it's -lz */ #define GzipLibrary -lz #endif +/* If the system has the Freetype2 library */ +#ifndef HasFreetype2 +#define HasFreetype2 NO +#endif #if HasKrbIV #ifndef KrbIVIncludes #define KrbIVIncludes /**/ @@ -728,11 +755,20 @@ #endif #ifndef DriverManDefs #define DriverManDefs -D__drivermansuffix__=$(DRIVERMANSUFFIX) +#endif +#ifndef ProjectManDefs +#define ProjectManDefs -D__projectroot__=$(PROJECTROOT) #endif -#ifndef ExtraManDefs -#define ExtraManDefs -D__projectroot__=$(PROJECTROOT) + + +#ifndef CompressManPages +#define CompressManPages NO #endif +#ifndef CompressManCmd +#define CompressManCmd gzip -n +#endif + #ifndef HtmlIndexCmd #if BuildHtmlManPages #define HtmlIndexCmd $(MKHTMLINDEX) @@ -778,7 +814,7 @@ #endif #endif #ifndef UNCOMPRESSPATH -#define UNCOMPRESSPATH /usr/ucb/uncompress +#define UNCOMPRESSPATH /usr/ucb/uncompress /* obsolete */ #endif #ifndef OptimizedCDebugFlags #define OptimizedCDebugFlags -O @@ -879,6 +915,9 @@ #ifndef HasGcc2ForCplusplus #define HasGcc2ForCplusplus NO #endif +#ifndef HasBrokenCCForLink +#define HasBrokenCCForLink NO +#endif #ifndef HasCenterLineC #define HasCenterLineC NO #endif @@ -1198,7 +1237,13 @@ #else #define DependCmd $(DEPENDSRC)/gccmakedep #endif +#elif UseCCMakeDepend +#ifdef UseInstalled /* assume BINDIR in path */ +#define DependCmd ccmakedep #else +#define DependCmd $(DEPENDSRC)/ccmakedep +#endif +#else #ifdef UseInstalled /* assume BINDIR in path */ #define DependCmd makedepend #else @@ -1206,6 +1251,13 @@ #endif #endif #endif +#ifndef DependDefines +# if UseCCMakedepend || UseGccMakedepend +# define DependDefines /**/ +# else +# define DependDefines -DUSE_MAKEDEPEND +# endif +#endif #ifndef DependFlags #define DependFlags /**/ #endif @@ -1240,7 +1292,11 @@ #endif #endif #ifndef TroffCmd +#if HasGroff #define TroffCmd groff -Tps +#else +#define TroffCmd troff -Tps +#endif #endif #ifndef NroffCmd #define NroffCmd nroff @@ -1342,6 +1398,12 @@ #define ExpandManNames YES #endif #endif +#ifndef ManSrcSuffix +#define ManSrcSuffix man +#endif +#ifndef ManNewSuffix +#define ManNewSuffix _man +#endif #ifndef TOPDIR #define TOPDIR . #endif @@ -1424,7 +1486,7 @@ CXXSTD_DEFINES = CplusplusStandardDefines $(CXXPROJECT_DEFINES) CXXOPTIONS = CplusplusOptions CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) - CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(CXXEXTRA_DEFINES) $(DEFINES) + CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) #endif COMPRESS = CompressCmd @@ -1460,8 +1522,12 @@ FILEMANSUFFIX = FileManSuffix /* suffix for file format man pages */ MISCMANSUFFIX = MiscManSuffix /* suffix for misc man pages */ DRIVERMANSUFFIX = DriverManSuffix /* suffix for driver man pages */ - MANDEFS = FileManDefs MiscManDefs DriverManDefs ExtraManDefs + MANSRCSUFFIX = ManSrcSuffix /* suffix for man page source */ + MANNEWSUFFIX = ManNewSuffix /* suffix for preprocessed man source */ + MANDEFS = FileManDefs MiscManDefs DriverManDefs ProjectManDefs $(XORGMANDEFS) $(VENDORMANDEFS) + COMPRESSMANCMD = CompressManCmd + TROFF = TroffCmd NROFF = NroffCmd MSMACROS = MsMacros @@ -1615,7 +1681,7 @@ * LOCAL_LDFLAGS contains client-specific ld flags flags set in Imakefile */ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) LDPRELIB = LdPreLib @@ -1643,6 +1709,7 @@ LDSTRIPFLAGS = LdStripFlags LDCOMBINEFLAGS = LdCombineFlags DEPENDFLAGS = DependFlags + DEPEND_DEFINES = DependDefines XCOMM Not sure this belongs here TKLIBDIR = TkLibDir @@ -1764,6 +1831,13 @@ HtmlManIndex +/* Generate the "real" clean rules */ +#undef clean + +clean:: cleandir + +distclean:: cleandir + #ifdef IHaveSubdirs XCOMM ---------------------------------------------------------------------- XCOMM rules for building in SUBDIRS - do not edit @@ -1776,6 +1850,13 @@ MakefileSubdirs($(SUBDIRS)) IncludesSubdirs($(SUBDIRS)) +/* "distclean" subdirectories */ +#undef BootstrapCleanSubdirs +#define BootstrapCleanSubdirs /**/ +#define clean distclean +CleanSubdirs($(SUBDIRS)) +#undef clean + #endif /* must be after all install.man rules that install anything */ @@ -1808,6 +1889,12 @@ depend:: #endif /* if subdirectory rules are needed */ + +#ifndef IHaveSpecialMakefileTarget +/* "distclean" also removes the Makefile */ +distclean:: + RemoveFile(Makefile) +#endif XCOMM ---------------------------------------------------------------------- XCOMM dependencies generated by makedepend Index: xc/config/cf/Imakefile diff -u xc/config/cf/Imakefile:3.24 xc/config/cf/Imakefile:3.26 --- xc/config/cf/Imakefile:3.24 Wed Nov 1 21:51:06 2000 +++ xc/config/cf/Imakefile Wed Jan 17 11:22:30 2001 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: Imakefile /main/38 1996/11/07 14:43:46 kaleb $ -XCOMM $XFree86: xc/config/cf/Imakefile,v 3.24 2000/11/02 02:51:06 dawes Exp $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/Imakefile,v 3.26 2001/01/17 16:22:30 dawes Exp $ XCOMM Some compilers generate fatal errors if an -L directory does XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. @@ -17,6 +17,7 @@ DEFFILES = \ xf86site.def \ +version.def \ $(HOSTDEFFILES) \ site.def Index: xc/config/cf/Library.tmpl diff -u xc/config/cf/Library.tmpl:3.12 xc/config/cf/Library.tmpl:3.13 --- xc/config/cf/Library.tmpl:3.12 Wed Oct 13 00:20:41 1999 +++ xc/config/cf/Library.tmpl Wed Jan 17 11:22:30 2001 @@ -14,12 +14,12 @@ * Define LargePICTable YES if large (32-bit) PIC tables are needed. */ -XCOMM $TOG: Library.tmpl /main/44 1997/04/28 11:47:53 kaleb $ +XCOMM $Xorg: Library.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.12 1999/10/13 04:20:41 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Library.tmpl,v 3.13 2001/01/17 16:22:30 dawes Exp $ #ifndef LibraryCplusplusOptions # if DoSharedLib && defined(SharedLibraryCplusplusOptions) Index: xc/config/cf/Mips.cf diff -u xc/config/cf/Mips.cf:1.1.1.4 xc/config/cf/Mips.cf:1.1.1.5 --- xc/config/cf/Mips.cf:1.1.1.4 Sat Dec 21 22:14:31 1996 +++ xc/config/cf/Mips.cf Tue Jan 16 16:52:46 2001 @@ -15,7 +15,7 @@ #define OSMinorVersion 50 #endif -XCOMM platform: $XConsortium: Mips.cf /main/17 1996/09/28 16:06:25 rws $ +XCOMM platform: $Xorg: Mips.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ XCOMM operating system: OSName /*************************************************************************** Index: xc/config/cf/Motif.rules diff -u xc/config/cf/Motif.rules:1.3 xc/config/cf/Motif.rules:1.4 --- xc/config/cf/Motif.rules:1.3 Fri Oct 2 02:15:00 1998 +++ xc/config/cf/Motif.rules Wed Jan 17 11:22:30 2001 @@ -13,7 +13,7 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ -XCOMM $TOG: Motif.rules /main/4 1998/02/06 10:53:37 kaleb $ +XCOMM $Xorg: Motif.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject Index: xc/config/cf/Motif.tmpl diff -u xc/config/cf/Motif.tmpl:1.1.1.2 xc/config/cf/Motif.tmpl:1.1.1.3 --- xc/config/cf/Motif.tmpl:1.1.1.2 Sun Sep 27 03:48:50 1998 +++ xc/config/cf/Motif.tmpl Tue Jan 16 16:52:49 2001 @@ -13,7 +13,7 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ -XCOMM $TOG: Motif.tmpl /main/5 1998/02/06 10:53:46 kaleb $ +XCOMM $Xorg: Motif.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ /* Include the X11 project template file. */ #include Index: xc/config/cf/NetBSD.cf diff -u xc/config/cf/NetBSD.cf:3.87 xc/config/cf/NetBSD.cf:3.95 --- xc/config/cf/NetBSD.cf:3.87 Sun Dec 3 11:14:08 2000 +++ xc/config/cf/NetBSD.cf Sun Apr 22 04:54:03 2001 @@ -1,8 +1,8 @@ -XCOMM platform: $XConsortium: NetBSD.cf /main/16 1996/10/31 14:47:14 kaleb $ +XCOMM platform: $Xorg: NetBSD.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.87 2000/12/03 16:14:08 herrb Exp $ +XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.95 2001/04/22 08:54:03 herrb Exp $ #ifndef OSName @@ -67,11 +67,20 @@ (OSMajorVersion == 1 && OSMinorVersion < 2))) #define HasMkstemp YES #endif +/* But the standalone mktemp doesn't exist before NetBSD 1.5*/ +#if (OSMajorVersion ==0 || (OSMajorVersion == 1 && OSMinorVersion <= 4)) +# define HasMktemp NO +#else +# define HasMktemp YES +#endif + #define HasUsableFileMmap YES #define HasVarRun YES #define HasVarDb YES +#define InstallXloadSetGID NO + /* Defines for using the GNU pth thread library -- experimental */ #ifdef NetBSDPth @@ -107,6 +116,7 @@ #undef CcCmd #define CcCmd gcc +#ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ #else @@ -116,6 +126,7 @@ #define DefaultCCOptions -ansi -Dasm=__asm GccWarningOptions #endif #endif +#endif #define GccGasOption -DGCCUSESGAS #define AsmDefines -DUSE_GAS @@ -215,7 +226,14 @@ #endif #define StandardDefines -DCSRG_BASED +/* Citrus mb locale were added in 1.5P */ +#if ((OSMajorVersion > 1) || \ + (OSMajorVersion == 1 && OSMinorVersion > 5) || \ + (OSMajorVersion == 1 && OSMinorVersion == 5 && OSTeenyVersion >= 15)) +#define XawI18nDefines -DHAS_WCHAR_H -DHAS_WCTYPE_H -DNO_WIDEC_H +#else #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC +#endif #ifndef ExtraLibraries #define ExtraLibraries /**/ @@ -282,7 +300,7 @@ #define NeqnCmd neqn -Tlatin1 #define NroffCmd nroff -Tlatin1 #define EqnCmd eqn -Tps -#define TroffCmd groff -Tps +#define HasGroff YES /* * To use the NetBSD Aperture driver @@ -341,10 +359,10 @@ @@\ all:: file.0 @@\ @@\ -file.0:: file.man @@\ - @if [ -f file.man ]; \ @@\ +file.0:: file.$(MANNEWSUFFIX) @@\ + @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\ then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ + cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ cp /tmp/$$$$.man file.0; \ @@\ $(RM) /tmp/$$$$.man; \ @@\ fi @@\ @@ -362,11 +380,15 @@ #define InstallManPageLong(file,destdir,dest) @@\ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ InstallManPageLongBase(file,destdir,dest) #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ BuildInstallHtmlManPage(file,dest,suffix) @@\ @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ InstallManPageLongBase(file,destdir,dest) #define InstallMultipleMan(list,dest) @@\ @@ -509,6 +531,13 @@ #define BuildServer NO #endif +/* + * General settings for all platforms + */ #ifndef SharedLibXdmGreet #define SharedLibXdmGreet NO +#endif + +#ifndef BuildHtmlManPages +#define BuildHtmlManPages NO /* We don't want HTML manpages */ #endif Index: xc/config/cf/Oki.cf diff -u xc/config/cf/Oki.cf:3.3 xc/config/cf/Oki.cf:3.4 --- xc/config/cf/Oki.cf:3.3 Mon Dec 23 00:50:10 1996 +++ xc/config/cf/Oki.cf Wed Jan 17 11:22:30 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: Oki.cf /main/16 1996/09/28 16:06:53 rws $ +XCOMM platform: $Xorg: Oki.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ #ifndef OSName #define OSName Unix System V/860 Release 4.0 Version 3 Index: xc/config/cf/OpenBSD.cf diff -u xc/config/cf/OpenBSD.cf:3.44 xc/config/cf/OpenBSD.cf:3.54 --- xc/config/cf/OpenBSD.cf:3.44 Sat Dec 2 15:15:03 2000 +++ xc/config/cf/OpenBSD.cf Sun Apr 22 12:28:18 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.44 2000/12/02 20:15:03 herrb Exp $ +XCOMM platform: $XFree86: xc/config/cf/OpenBSD.cf,v 3.54 2001/04/22 16:28:18 herrb Exp $ XCOMM #ifndef OSName @@ -72,31 +72,20 @@ #define HasVarRun YES #define HasVarDb YES +#define InstallXloadSetGID NO + #ifndef HasLibPthread #define HasLibPthread NO #endif -/* - * Multi-thread safe libs - */ -#if !defined(PpcArchitecture) && (OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3) -# define HasPosixThreads YES -# define ThreadedX YES -# define SystemMTDefines -D_REENTRANT -# if HasLibPthread -# define ThreadsLibraries -lpthread +#ifndef HasMktemp +# if (OSMajorVersion > 2) || (OSMajorVersion == 2 && OSMinorVersion >= 1) +# define HasMktemp YES # else -# define BuildThreadStubLibrary YES -# define NeedUIThrStubs YES -# define ThreadsCompileFlags -pthread -# define ThreadsLibraries -lc_r +# define HasMktemp NO # endif #endif -#if OSMajorVersion == 2 && OSMinorVersion > 6 || OSMajorVersion >= 3 -# define HasThreadSafeAPI YES -#endif - /* * Compiler Features */ @@ -121,6 +110,7 @@ #undef CcCmd #define CcCmd gcc +#ifndef DefaultCCOptions #if defined(UseInstalled) #define DefaultCCOptions /**/ #else @@ -130,64 +120,11 @@ # define DefaultCCOptions -ansi -Dasm=__asm GccWarningOptions # endif #endif +#endif #define GccGasOption -DGCCUSESGAS #define AsmDefines -DUSE_GAS -#ifdef i386Architecture -# ifndef DefaultGcc2i386Opt -# if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2 - /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */ -# define DefaultGcc2i386Opt -O2 -# endif -# endif -# define OptimizedCDebugFlags DefaultGcc2i386Opt -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -# define ServerExtraSysLibs -li386 -# define LdPostLib /**/ -# define ServerExtraDefines GccGasOption XFree86ServerDefines -# ifndef XFree86ConsoleDefines -# define XFree86ConsoleDefines -DPCCONS_SUPPORT -DPCVT_SUPPORT -# endif -#endif - -#ifdef SparcArchitecture -# define OptimizedCDebugFlags -O2 -# define ServerOSDefines -DDDXOSINIT -# define ServerExtraDefines XFree86ServerDefines -#endif - -#ifdef AlphaArchitecture -# define OptimizedCDebugFlags -O2 -# define ServerOSDefines -DDDXOSINIT -# define ServerExtraDefines GccGasOption -D_XSERVER64 -#endif - -#ifdef ArcArchitecture -# define ServerExtraDefines GccGasOption XFree86ServerDefines -# ifndef XFree86ConsoleDefines -# define XFree86ConsoleDefines -DPCCONS_SUPPORT -# endif -#endif - -#ifdef PpcArchitecture -# define OptimizedCDebugFlags -O2 -# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT -# define ServerExtraDefines GccGasOption XFree86ServerDefines -# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT -# ifndef XFree86ConsoleDefines -# define XFree86ConsoleDefines -DWSCONS_SUPPORT -# endif -#endif /* Ppc */ - -#ifndef ServerOSDefines -# define ServerOSDefines /**/ -#endif - -#ifndef ServerExtraDefines -# define ServerExtraDefines GccGasOption -#endif - #define StandardDefines -DCSRG_BASED #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC @@ -228,17 +165,11 @@ #define NeqnCmd neqn -Tlatin1 #define NroffCmd nroff -Tlatin1 #define EqnCmd eqn -Tps -#define TroffCmd groff -Tps +#define HasGroff YES +/* Don't build HTML manual pages */ +#define BuildRman NO +#define BuildHtmlManPages NO -/* - * To use the NetBSD Aperture driver - */ -#if defined(i386Architecture) -#ifndef HasNetBSDApertureDriver -#define HasNetBSDApertureDriver YES -#endif -#endif - #ifndef HasCookieMaker # define HasCookieMaker YES # define MkCookieCmd \ @@ -257,11 +188,11 @@ #define InstallManPageLongBase(file,destdir,dest) @@\ all:: file.0 @@\ @@\ -file.0:: file.man @@\ - @if [ -f file.man ]; \ @@\ +file.0:: file.$(MANNEWSUFFIX) @@\ + @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\ then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) \ @@\ - | $(COL) > file.0; \ @@\ + cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | \ @@\ + $(NROFF) $(MANMACROS) | $(COL) > file.0; \ @@\ fi @@\ @@\ install.man:: @@\ @@ -277,11 +208,15 @@ #define InstallManPageLong(file,destdir,dest) @@\ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ InstallManPageLongBase(file,destdir,dest) #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ BuildInstallHtmlManPage(file,dest,suffix) @@\ @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ InstallManPageLongBase(file,destdir,dest) #define InstallMultipleMan(list,dest) @@\ @@ -366,31 +301,24 @@ */ #ifdef AlphaArchitecture -/* - * The code for an Alpha XF86_TGA server compiles, but it DOES NOT work - */ -# define BuildAlphaXF86 NO +# define OptimizedCDebugFlags -O2 +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines GccGasOption -D_XSERVER64 -DXFree86Server -# if BuildAlphaXF86 -# include -# endif +# define HasWeakSymbols NO - /* - * For the current ECOFF system - */ -# define HasSharedLibraries NO -# define UseElfFormat NO - /* - * For the upcoming ELF system - */ -# if 0 /* NOT YET */ -# define HasSharedLibraries YES +# if (OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 9)) # define UseElfFormat YES # endif +# if 1 +# define HasSharedLibraries NO +# define SharedLibXThrStub NO +# else /* NOT YET */ +# define HasSharedLibraries YES +# endif -# define BuildServer YES -# define XnestServer YES -# define XVirtualFramebufferServer YES + +# define XF86Server NO # define BuildDPMSLibrary NO # define BuildDPMSExt NO @@ -398,9 +326,7 @@ # define BuildXF86DGALibrary NO # define BuildXF86DGA NO -# if BuildAlphaXF86 -# include -# endif +# include #endif /* AlphaArchitecture */ @@ -411,10 +337,15 @@ #ifdef i386Architecture # ifndef DoLoadableServer -# define DoLoadableServer YES +# define DoLoadableServer YES # endif -/* 2.7 and later will have support for setting MTRRs */ +/* To use the NetBSD Aperture driver */ +# ifndef HasNetBSDApertureDriver +# define HasNetBSDApertureDriver YES +# endif + +/* 2.7 and later have support for setting MTRRs */ # ifndef HasMTRRSupport # if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 6) # define HasMTRRSupport YES @@ -423,14 +354,32 @@ # endif # endif +# ifndef DefaultGcc2i386Opt +# if (OSMajorVersion == 2 && OSMinorVersion >= 3) || OSMajorVersion > 2 + /* The GCC strength-reduce bug is fixed for OpenBSD 2.3 and later */ +# define DefaultGcc2i386Opt -O2 +# endif +# endif +# define OptimizedCDebugFlags DefaultGcc2i386Opt +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +# define ServerExtraSysLibs -li386 +# define LdPostLib /**/ +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# ifndef XFree86ConsoleDefines +# define XFree86ConsoleDefines -DWSCONS_SUPPORT -DPCVT_SUPPORT +# endif + +#define JoystickSupport NO + /* Support for USB Mices */ -# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6) -# define UsbMouseSupport YES +# ifndef UsbMouseSupport +# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 6) +# define UsbMouseSupport YES +# endif # endif -/* - * A hack to work around an optimization problem with gcc 2.95.2 - */ + +/* A hack to work around an optimization problem with gcc 2.95.2 */ # if OSMajorVersion == 2 && OSMinorVersion >= 6 # define GccOptBug295 # endif @@ -454,6 +403,9 @@ */ # define PositionIndependentCFlags -fpic -fno-function-cse +# define HasWeakSymbols NO +# define BuildGlxExt NO +# define BuildGLXLibrary YES #endif /* Mc68020Architecture */ @@ -468,6 +420,8 @@ # define BuildServer NO # endif +# define ServerExtraDefines -DXFree86Server + #endif /* AmigaArchitecture */ @@ -476,7 +430,6 @@ */ #ifdef Hp300Architecture -# include # ifndef BuildServer # define BuildServer NO # endif @@ -485,6 +438,10 @@ # define InstallFontAliases InstallFontAliasesNoComment # define UseRgbTxt NO +# define ServerExtraDefines -DXFree86Server + +#include + #endif /* Hp300Architecture */ @@ -493,11 +450,15 @@ */ #ifdef Mac68kArchitecture -# include + # ifndef BuildServer # define BuildServer NO # endif +# define ServerExtraDefines -DXFree86Server + +# include + #endif /* mac68kArchitecture */ @@ -506,11 +467,14 @@ */ #ifdef Mvme68kArchitecture -# include # ifndef BuildServer # define BuildServer NO # endif +# define ServerExtraDefines -DXFree86Server + +# include + #endif /* Mvme68kArchitecture */ @@ -526,7 +490,7 @@ # define BootstrapCFlags -Dsun3 # define UnalignedReferencesAllowed YES /* changes _XtCopyArgs() */ /* Note: -ansi turns off -Dmc68000 */ -# define ServerExtraDefines GccGasOption -Dmc68000 -Dmc68020 +# define ServerExtraDefines GccGasOption -Dmc68000 -Dmc68020 -DXFree86Server # ifndef Xsun24Server # define Xsun24Server NO @@ -540,16 +504,6 @@ #define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT -#if 0 -# ifndef BuildXKB -# define BuildXKB NO -# endif - -# ifndef BuildXKBlib -# define BuildXKBlib NO -# endif -#endif - # ifndef BuildPexExt # define BuildPexExt (XsunServer || Xsun24Server) # endif @@ -578,6 +532,11 @@ */ #ifdef ArcArchitecture +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# ifndef XFree86ConsoleDefines +# define XFree86ConsoleDefines -DPCCONS_SUPPORT +# endif + # include #endif /* ArcArchitecture */ @@ -604,34 +563,51 @@ */ #ifdef PpcArchitecture +# define OptimizedCDebugFlags -O2 +# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT +# ifndef XFree86ConsoleDefines +# define XFree86ConsoleDefines -DWSCONS_SUPPORT +# endif + # define UseElfFormat YES +# define HasWeakSymbols NO -# if XFree86Devel +# if XFree86Devel # define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations \ -Wnested-externs -# else +# else # define GccWarningOptions -Wall -Wpointer-arith -# endif +# endif -# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 8) -# ifndef DoLoadableServer -# define DoLoadableServer YES -# endif -# define DevelDrivers cirrus ati - /* Support for USB Mices */ -# define UsbMouseSupport YES -# include +# ifndef XF86Server +# define XF86Server NO +# endif -# else /* 2.7 and earlier */ -# include -# ifndef BuildServer -# define BuildServer YES -# endif +/* Definitions for building the XFree86 server */ +# if XF86Server +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT +# define ServerExtraDefines GccGasOption XFree86ServerDefines +# if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 8) +# ifndef DoLoadableServer +# define DoLoadableServer YES +# endif +# define DevelDrivers cirrus ati + /* Support for USB Mices */ +# define UsbMouseSupport YES +# include + +# else /* 2.7 and earlier */ +# include +# ifndef BuildServer +# define BuildServer NO +# endif -# define HasSharedLibraries NO -# define BuildDynamicLoading NO -# endif +# define HasSharedLibraries NO +# define BuildDynamicLoading NO +# endif +# endif /* XF86Server */ + #endif /* PpcArchitecture */ /* @@ -639,20 +615,28 @@ */ #ifdef SparcArchitecture +# define OptimizedCDebugFlags -O2 +# define ServerOSDefines -DDDXOSINIT +# define ServerExtraDefines -DAVOID_GLYPHBLT -DPIXPRIV -DXFree86Server \ + ServerSnprintfDefines DebugDefines \ + -DX_BYTE_ORDER=ByteOrder +# define BuildXF86MiscExt NO +# define BuildMITMiscExt NO + # ifndef Xsun24Server -# define Xsun24Server NO +# define Xsun24Server YES # endif # ifndef XsunServer -# define XsunServer YES +# define XsunServer YES # endif # ifndef XsunMonoServer -# define XsunMonoServer NO +# define XsunMonoServer YES # endif -#define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT +# define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT # ifndef BuildPexExt -# define BuildPexExt (XsunServer || Xsun24Server) +# define BuildPexExt (XsunServer || Xsun24Server) # endif # define BuildXF86VidModeExt NO @@ -662,7 +646,6 @@ #endif /* SparcArchitecture */ - /* End or architecture specific section */ /* @@ -670,8 +653,51 @@ * which can be overridden by architecture specific sections above */ +#ifndef ServerOSDefines +# define ServerOSDefines /**/ +#endif + +#ifndef ServerExtraDefines +# define ServerExtraDefines GccGasOption +#endif + +#ifndef BuildCyrillicFonts +# define BuildCyrillicFonts YES +#endif +#ifndef BuildLatin2Fonts +# define BuildLatin2Fonts YES +#endif +#ifndef UseKoi8RForCyrillic +# define UseKoi8RForCyrillic YES +#endif + +#ifndef HasWeakSymbols +# define HasWeakSymbols YES +#endif + +/* + * Multi-thread safe libs + */ +#if HasWeakSymbols == YES && (OSMajorVersion == 2 && OSMinorVersion >= 6 || OSMajorVersion >= 3) +# define HasPosixThreads YES +# define ThreadedX YES +# define SystemMTDefines -D_REENTRANT +# if HasLibPthread +# define ThreadsLibraries -lpthread +# else +# define BuildThreadStubLibrary YES +# define NeedUIThrStubs YES +# define ThreadsCompileFlags -pthread +# define ThreadsLibraries -pthread +# endif +#endif + +/* Set this to YES when getpwuid_r is added to libc_r */ +#define HasThreadSafeAPI NO + + #ifndef DoLoadableServer -#define DoLoadableServer NO +#define DoLoadableServer NO #endif #ifndef XVirtualFramebufferServer @@ -719,6 +745,10 @@ # define OSBinaryType /**/ # endif #endif + +# if !defined(GccWarningOptions) +# define GccWarningOptions -Wall -Wpointer-arith +# endif /* This must come last */ #if OSMajorVersion == 2 && OSMinorVersion >= 8 || OSMajorVersion > 2 Index: xc/config/cf/README diff -u xc/config/cf/README:1.12 xc/config/cf/README:1.13 --- xc/config/cf/README:1.12 Sat Dec 2 14:06:57 2000 +++ xc/config/cf/README Wed Jan 17 11:22:30 2001 @@ -1,9 +1,9 @@ -$TOG: README /main/76 1998/05/11 14:35:10 barstow $ +$Xorg: README,v 1.4 2000/08/18 04:03:58 coskrey Exp $ -$XFree86: xc/config/cf/README,v 1.12 2000/12/02 19:06:57 herrb Exp $ +$XFree86: xc/config/cf/README,v 1.13 2001/01/17 16:22:30 dawes Exp $ The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! @@ -133,6 +133,8 @@ NoRConst YES if const for structs of funcs is bad OSMajorVersion major version number of operating system OSMinorVersion minor version number of operating system + OSName operating system name + OSTeenyVersion maintenance version number of operating system OptimizedCDebugFlags C compiler flags to turn on optimization XtPopdownConformance XtPopdown conformans to the specification PreProcessCmd command to run /lib/cpp on scripts @@ -152,7 +154,7 @@ TagsCmd command to run tags TblCmd command to run tbl TroffCmd command to run troff to get PostScript - UNCOMPRESSPATH command to run uncompress + UNCOMPRESSPATH command to run uncompress (obsolete) UnalignedReferencesAllowed boolean for unaligned copies ok UsrLibDir directory in which to install libraries YaccCmd command to run yacc @@ -265,7 +267,7 @@ NormalLibXtst build libXtst.a NormalLibXag build libXag.a NormalOldX build liboldX.a - OsNameDefines beats me + OsNameDefines If uname(2) unavailable, set to -DOS_NAME=OSName PexApiDir PEX include file location PexCCOptions special options for building PEX library PexCDebugFlags special flags for building PEX library @@ -339,7 +341,7 @@ XtErrorPrefix leading text in XtError() msg; eg. 'X Toolkit ' XtWarningPrefix leading text in XtWarning()msg, same as above XtMalloc0ReturnsNullDefines -D's specifically for libXt - ZBDFTOSNFFILT -D to run uncompress and bdftosnf + ZBDFTOSNFFILT -D to run uncompress and bdftosnf (obsolete) Library.tmpl provides defaults for the following variables: Index: xc/config/cf/Server.tmpl diff -u xc/config/cf/Server.tmpl:3.16 xc/config/cf/Server.tmpl:3.18 --- xc/config/cf/Server.tmpl:3.16 Fri Feb 18 11:23:07 2000 +++ xc/config/cf/Server.tmpl Fri Apr 20 11:51:15 2001 @@ -1,10 +1,10 @@ -XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.16 2000/02/18 16:23:07 dawes Exp $ +XCOMM $XFree86: xc/config/cf/Server.tmpl,v 3.18 2001/04/20 15:51:15 tsi Exp $ /* * Server imakefile info - this contains any special redefinitions, etc. * that Imakefiles in the server subtree will need. */ -XCOMM $TOG: Server.tmpl /main/15 1997/07/16 14:43:38 kaleb $ +XCOMM $Xorg: Server.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" LDSTRIPFLAGS="$(LDSTRIPFLAGS)" @@ -55,6 +55,7 @@ STD_DEFINES = ServerDefines $(SERVER_THREAD_DEFINES) CDEBUGFLAGS = ServerCDebugFlags EXT_DEFINES = ExtensionDefines +OS_DEFINES = ServerOSDefines GLX_DEFINES = GlxDefines Index: xc/config/cf/Threads.tmpl diff -u xc/config/cf/Threads.tmpl:3.2 xc/config/cf/Threads.tmpl:3.3 --- xc/config/cf/Threads.tmpl:3.2 Mon Dec 23 00:50:12 1996 +++ xc/config/cf/Threads.tmpl Wed Jan 17 11:22:31 2001 @@ -1,5 +1,8 @@ -XCOMM $XConsortium: Threads.tmpl /main/11 1996/09/28 16:07:06 rws $ -XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.2 1996/12/23 05:50:12 dawes Exp $ +XCOMM $Xorg: Threads.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ + + + +XCOMM $XFree86: xc/config/cf/Threads.tmpl,v 3.3 2001/01/17 16:22:31 dawes Exp $ /* * For a multi-threaded application or library, Index: xc/config/cf/Win32.cf diff -u xc/config/cf/Win32.cf:1.4 xc/config/cf/Win32.cf:1.5 --- xc/config/cf/Win32.cf:1.4 Sat Dec 13 21:55:24 1997 +++ xc/config/cf/Win32.cf Wed Jan 17 11:22:31 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: Win32.cf /main/57 1997/12/04 11:03:33 kaleb $ +XCOMM platform: $Xorg: Win32.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ #ifndef OSName #define OSName DefaultOSName Index: xc/config/cf/Win32.rules diff -u xc/config/cf/Win32.rules:1.3 xc/config/cf/Win32.rules:1.4 --- xc/config/cf/Win32.rules:1.3 Sat Dec 13 21:55:24 1997 +++ xc/config/cf/Win32.rules Wed Jan 17 11:22:31 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: Win32.rules /main/51 1997/12/02 14:48:29 kaleb $ +XCOMM platform: $Xorg: Win32.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ #define HasSharedLibraries YES #define NeedLibInsideFlag YES Index: xc/config/cf/WinLib.tmpl diff -u xc/config/cf/WinLib.tmpl:1.2 xc/config/cf/WinLib.tmpl:1.3 --- xc/config/cf/WinLib.tmpl:1.2 Mon Jan 11 09:39:59 1999 +++ xc/config/cf/WinLib.tmpl Wed Jan 17 11:22:31 2001 @@ -1,5 +1,8 @@ -XCOMM $XConsortium: WinLib.tmpl /main/3 1996/11/13 14:43:09 lehors $ -XCOMM $XFree86: xc/config/cf/WinLib.tmpl,v 1.2 1999/01/11 14:39:59 dawes Exp $ +XCOMM $Xorg: WinLib.tmpl,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ + + + +XCOMM $XFree86: xc/config/cf/WinLib.tmpl,v 1.3 2001/01/17 16:22:31 dawes Exp $ #define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY) #define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) Index: xc/config/cf/X11.rules diff -u xc/config/cf/X11.rules:1.5 xc/config/cf/X11.rules:1.6 --- xc/config/cf/X11.rules:1.5 Mon Nov 6 14:24:00 2000 +++ xc/config/cf/X11.rules Wed Jan 17 11:22:31 2001 @@ -1,7 +1,7 @@ -XCOMM $TOG: X11.rules /main/4 1997/04/30 15:23:24 kaleb $ +XCOMM $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/X11.rules,v 1.5 2000/11/06 19:24:00 dawes Exp $ +XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject @@ -94,10 +94,13 @@ #else # define X11BuildLibPath $(TOP)/exports/lib #endif + +#ifndef BuildLibPath #ifdef SystemBuildLibPath # define BuildLibPath $(XENVLIBDIR):$(SYSTEMENVLIBDIR) #else # define BuildLibPath $(XENVLIBDIR) +#endif #endif #ifndef X11ProjectDefines Index: xc/config/cf/X11.tmpl diff -u xc/config/cf/X11.tmpl:1.93 xc/config/cf/X11.tmpl:1.115.2.3 --- xc/config/cf/X11.tmpl:1.93 Fri Dec 15 13:18:04 2000 +++ xc/config/cf/X11.tmpl Thu May 31 22:24:14 2001 @@ -1,11 +1,11 @@ XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules -XCOMM $TOG: X11.tmpl /main/308 1998/06/16 15:14:24 msr $ +XCOMM $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.93 2000/12/15 18:18:04 keithp Exp $ +XCOMM $XFree86: xc/config/cf/X11.tmpl,v 1.115.2.3 2001/06/01 02:24:14 dawes Exp $ /*************************************************************************** * * @@ -23,10 +23,12 @@ * InstallAppDefaults (class) * InstallAppDefaultsLong (file,class) * MakeFontsDir (deplist) + * MakeXftCache (deplist) * MakeFonts () * InstallFontObjs (objs,dest) * InstallFonts (dest) * InstallFontAliases (dest) + * InstallXftCache (dest) * FontSrc (basename) * FontBaseObj (basename) * InstallFontScale (dest) @@ -37,6 +39,36 @@ * MakeXkbDir (basedir,subdir) */ +/* X.Org release string */ +#ifndef XOrgReleaseString +#define XOrgReleaseString Release 6.5 +#endif + +#ifndef XOrgManNameString +#define XOrgManNameString X Version 11 +#endif + +XORGRELSTRING = XOrgReleaseString +XORGMANNAME = XOrgManNameString + +#ifndef XOrgManDefs +#define XOrgManDefs -D__xorgversion__='"$(XORGRELSTRING)" "$(XORGMANNAME)"' +#endif + +#ifndef XVendorManNameString +#define XVendorManNameString XOrgManNameString +#endif +#ifndef XVendorManVersionString +#define XVendorManVersionString XOrgReleaseString +#endif + +VENDORMANNAME = XVendorManNameString +VENDORMANVERSION = XVendorManVersionString + +#ifndef VendorManDefs +#define VendorManDefs -D__vendorversion__='"$(VENDORMANVERSION)" "$(VENDORMANNAME)"' +#endif + /* * X-specific things */ @@ -49,6 +81,15 @@ #ifndef BuildServersOnly #define BuildServersOnly NO #endif +#ifndef BuildClients +#define BuildClients !BuildServersOnly +#endif +#ifndef BuildDocs +#define BuildDocs !BuildServersOnly +#endif +#ifndef BuildLibraries +#define BuildLibraries (!BuildServersOnly || BuildClients) +#endif #ifndef BuildFontServer #define BuildFontServer YES #endif @@ -91,15 +132,94 @@ #ifndef BuildCIDFonts #define BuildCIDFonts YES #endif +/* Not used now */ #ifndef BuildLatin2Fonts -#define BuildLatin2Fonts NO +#define BuildLatin2Fonts YES #endif #ifndef BuildCyrillicFonts -#define BuildCyrillicFonts NO +#define BuildCyrillicFonts YES #endif #ifndef UseKoi8RForCyrillic -#define UseKoi8RForCyrillic NO +#define UseKoi8RForCyrillic YES +#endif +/* Some bdf font generation details. The scripts for this require perl. */ +#ifndef TruncateUCSFonts +#define TruncateUCSFonts HasPerl5 +#endif +#ifndef MaxUCSChar +#define MaxUCSChar 0x3200 +#endif +#ifndef DerivedUCSFonts +#define DerivedUCSFonts HasPerl5 +#endif +/* These primarily control generation of derived 8-bit fonts. */ +#ifndef BuildUCSFonts +#define BuildUCSFonts YES +#endif +/* Setting BuildISO8859_1Fonts to NO may result in problems. */ +#ifndef BuildISO8859_1Fonts +#define BuildISO8859_1Fonts YES +#endif +#ifndef BuildISO8859_2Fonts +#define BuildISO8859_2Fonts YES +#endif +#ifndef BuildISO8859_3Fonts +#define BuildISO8859_3Fonts YES #endif +#ifndef BuildISO8859_4Fonts +#define BuildISO8859_4Fonts YES +#endif +#ifndef BuildISO8859_5Fonts +#define BuildISO8859_5Fonts BuildCyrillicFonts +#endif +#ifndef BuildArabicFonts +#define BuildArabicFonts YES +#endif +#ifndef BuildISO8859_6Fonts +#define BuildISO8859_6Fonts BuildArabicFonts +#endif +#ifndef BuildGreekFonts +#define BuildGreekFonts YES +#endif +#ifndef BuildISO8859_7Fonts +#define BuildISO8859_7Fonts BuildGreekFonts +#endif +#ifndef BuildHebrewFonts +#define BuildHebrewFonts YES +#endif +#ifndef BuildISO8859_8Fonts +#define BuildISO8859_8Fonts BuildHebrewFonts +#endif +#ifndef BuildISO8859_9Fonts +#define BuildISO8859_9Fonts YES +#endif +#ifndef BuildISO8859_10Fonts +#define BuildISO8859_10Fonts YES +#endif +#ifndef BuildISO8859_13Fonts +#define BuildISO8859_13Fonts YES +#endif +#ifndef BuildISO8859_14Fonts +#define BuildISO8859_14Fonts YES +#endif +#ifndef BuildISO8859_15Fonts +#define BuildISO8859_15Fonts YES +#endif +#ifndef BuildKOI8_RFonts +#define BuildKOI8_RFonts BuildCyrillicFonts +#endif +#ifndef BuildJapaneseFonts +#define BuildJapaneseFonts YES +#endif +#ifndef BuildJISX0201Fonts +#define BuildJISX0201Fonts BuildJapaneseFonts +#endif +#ifndef BuildKoreanFonts +#define BuildKoreanFonts YES +#endif +#ifndef BuildChineseFonts +#define BuildChineseFonts YES +#endif #ifndef HasXAudio #define HasXAudio NO #endif @@ -136,9 +256,15 @@ #ifndef BuildPexExt #define BuildPexExt NO #endif +#ifndef BuildPexLib +#define BuildPexLib (BuildPexExt && !BuildServersOnly) +#endif #ifndef BuildXInputExt #define BuildXInputExt NO #endif +#ifndef BuildXInputLib +#define BuildXInputLib (BuildXInputExt && !BuildServersOnly) +#endif #ifndef BuildEVI #define BuildEVI YES #endif @@ -158,7 +284,7 @@ #define BuildFontCache YES #endif #ifndef BuildFontCacheLib -#define BuildFontCacheLib BuildFontCache +#define BuildFontCacheLib (BuildFontCache && !BuildServersOnly) #endif #ifndef BuildLowMem #define BuildLowMem NO @@ -178,16 +304,16 @@ #endif #endif #ifndef BuildXIElib -#define BuildXIElib BuildXIE +#define BuildXIElib (BuildXIE && !BuildServersOnly) #endif #ifndef BuildXKB #define BuildXKB YES #endif #ifndef BuildXKBlib -#define BuildXKBlib BuildXKB +#define BuildXKBlib (BuildXKB && !BuildServersOnly) #endif #ifndef BuildXKBuilib -#define BuildXKBuilib BuildXKB +#define BuildXKBuilib (BuildXKB && !BuildServersOnly) #endif /* * WARNING: Setting UseXKBInClients to YES cause incompatibilities @@ -210,7 +336,7 @@ #define BuildXinerama NO #endif #ifndef BuildXineramaLibrary -#define BuildXineramaLibrary BuildXinerama +#define BuildXineramaLibrary (BuildXinerama && !BuildServersOnly) #endif #ifndef BuildXCSecurity #define BuildXCSecurity YES @@ -244,23 +370,26 @@ #define BuildXprint NO #endif #endif +#ifndef BuildXprintLib +#define BuildXprintLib (BuildXprint && !BuildServersOnly) +#endif #ifndef BuildScreenSaverExt #define BuildScreenSaverExt NO #endif #ifndef BuildScreenSaverLibrary -#define BuildScreenSaverLibrary BuildScreenSaverExt +#define BuildScreenSaverLibrary (BuildScreenSaverExt && !BuildServersOnly) #endif #ifndef BuildXF86VidModeExt #define BuildXF86VidModeExt NO #endif #ifndef BuildXF86VidModeLibrary -#define BuildXF86VidModeLibrary BuildXF86VidModeExt +#define BuildXF86VidModeLibrary (BuildXF86VidModeExt && !BuildServersOnly) #endif #ifndef BuildXF86MiscExt #define BuildXF86MiscExt NO #endif #ifndef BuildXF86MiscLibrary -#define BuildXF86MiscLibrary BuildXF86MiscExt +#define BuildXF86MiscLibrary (BuildXF86MiscExt && !BuildServersOnly) #endif #ifndef BuildXF86BigfontExt #define BuildXF86BigfontExt NO @@ -269,28 +398,31 @@ #define BuildXF86DGA NO #endif #ifndef BuildXF86DGALibrary -#define BuildXF86DGALibrary BuildXF86DGA +#define BuildXF86DGALibrary (BuildXF86DGA && !BuildServersOnly) #endif #ifndef BuildXvExt #define BuildXvExt NO #endif #ifndef BuildXvLibrary -#define BuildXvLibrary BuildXvExt +#define BuildXvLibrary (BuildXvExt && !BuildServersOnly) #endif #ifndef BuildGlxExt #define BuildGlxExt NO #endif #ifndef BuildGLXLibrary -#define BuildGLXLibrary BuildGlxExt +#define BuildGLXLibrary (BuildGlxExt && !BuildServersOnly) #endif +#ifndef BuildGLULibrary +#define BuildGLULibrary (BuildGLXLibrary && HasCplusplus) +#endif #ifndef BuildXF86RushExt #define BuildXF86RushExt NO #endif #ifndef BuildXF86RushLibrary -#define BuildXF86RushLibrary BuildXF86RushExt +#define BuildXF86RushLibrary (BuildXF86RushExt && !BuildServersOnly) #endif #ifndef BuildDPSLibraries -#define BuildDPSLibraries YES +#define BuildDPSLibraries !BuildServersOnly #endif #ifndef BuildDPSLibrary #define BuildDPSLibrary BuildDPSLibraries @@ -301,15 +433,24 @@ #ifndef BuildPSResLibrary #define BuildPSResLibrary BuildDPSLibraries #endif +#ifndef BuildDPSClients +#define BuildDPSClients BuildDPSLibraries +#endif #ifndef BuildRender #define BuildRender NO #endif #ifndef BuildRenderLibrary -#define BuildRenderLibrary YES +#define BuildRenderLibrary !BuildServersOnly #endif #ifndef BuildXftLibrary #define BuildXftLibrary BuildRenderLibrary #endif +#ifndef UseFreetype2 +#define UseFreetype2 BuildXftLibrary +#endif +#ifndef BuildFreetype2Library +#define BuildFreetype2Library (UseFreetype2 && !HasFreetype2) +#endif #ifndef BuildMiscDocs #define BuildMiscDocs NO @@ -339,6 +480,9 @@ #ifndef InstallXtermSetUID #define InstallXtermSetUID YES /* xterm needs to be set uid */ #endif +#ifndef InstallXloadSetGID +#define InstallXloadSetGID YES /* xload often needs set gid kmem */ +#endif #ifndef InstallXinitConfig #define InstallXinitConfig NO /* install sample xinit config */ #endif @@ -358,6 +502,12 @@ #ifndef InstallAppDefFiles #define InstallAppDefFiles YES /* install application defaults */ #endif +#ifndef UseConfDirForAppDefaults +#define UseConfDirForAppDefaults YES +#endif +#ifndef UseConfDirForXkb +#define UseConfDirForXkb YES +#endif #ifndef CompressAllFonts #define CompressAllFonts NO #endif @@ -371,6 +521,9 @@ #ifndef ThreadedProject #define ThreadedProject ThreadedX #endif +#ifndef BuildThreadStubLibrary +#define BuildThreadStubLibrary NO +#endif #ifndef HasWChar32 #define HasWChar32 SystemV4 #endif @@ -483,7 +636,7 @@ #define XMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines #endif #ifndef XtMalloc0ReturnsNullDefines -#define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines +#define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC #endif #endif #ifndef ExtensionOSDefines @@ -1195,6 +1348,7 @@ RGB = $(BINDIR)/rgb FONTC = $(BINDIR)/bdftopcf MKFONTDIR = $(BINDIR)/mkfontdir + XFTCACHE = $(BINDIR)/xftcache MKHTMLINDEX = $(BINDIR)/mkhtmlindex UCS2ANY = $(BINDIR)/ucs2any.pl BDFTRUNCATE = $(BINDIR)/bdftruncate.pl @@ -1203,7 +1357,12 @@ RGB = $(CLIENTENVSETUP) $(XBUILDBINDIR)/rgb FONTC = $(CLIENTENVSETUP) $(XBUILDBINDIR)/bdftopcf MKFONTDIR = $(CLIENTENVSETUP) $(XBUILDBINDIR)/mkfontdir + XFTCACHE = $(CLIENTENVSETUP) XFT_CONFIG=$(XFTLIBSRC)/XftConfig $(XBUILDBINDIR)/xftcache +#if HasPerl + MKHTMLINDEX = RunPerlScript($(CONFIGSRC)/util/mkhtmlindex.pl,) +#else MKHTMLINDEX = $(SHELL) $(CONFIGSRC)/util/mkhtmlindex.sh +#endif UCS2ANY = $(FONTSRC)/util/ucs2any.pl BDFTRUNCATE = $(FONTSRC)/util/bdftruncate.pl UCSMAPPREFIX = $(FONTSRC)/util/map- @@ -1243,6 +1402,10 @@ #ifdef X11ProjectRoot XPROJECTROOT = X11ProjectRoot #endif + + XORGMANDEFS = XOrgManDefs + VENDORMANDEFS = VendorManDefs + #if HasSharedLibraries #ifndef DontUseLibPathVar #ifndef BuildLibPathVar @@ -1484,6 +1647,21 @@ #endif #endif +#if BuildGLULibrary +#ifndef SharedLibGlu +#define SharedLibGlu HasSharedLibraries +#endif +#ifndef NormalLibGlu +#define NormalLibGlu (!SharedLibX11 | ForceNormalLib) +#endif +#ifndef DebugLibGlu +#define DebugLibGlu NO +#endif +#ifndef ProfileLibGlu +#define ProfileLibGlu NO +#endif +#endif + #if BuildGLXLibrary #ifndef SharedLibGlx #define SharedLibGlx HasSharedLibraries @@ -1497,6 +1675,12 @@ #ifndef ProfileLibGlx #define ProfileLibGlx NO #endif +#ifndef BuildLibGlxWithoutPIC +#define BuildLibGlxWithoutPIC NO +#endif +#if BuildLibGlxWithoutPIC && SharedLibGlx +#define SharedLibGlxWithoutPIC YES +#endif #ifndef LinkGLToUsrLib #define LinkGLToUsrLib NO #endif @@ -1643,18 +1827,6 @@ #endif #endif -#if BuildXineramaLibrary - XINERAMALIBSRC = $(LIBSRC)/Xinerama -#if SharedLibXinerama -#ifndef SharedXineramaRev -#define SharedXineramaRev 1.0 -#endif -SharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),SOXINERAMAREV,SharedXineramaRev) -#else -ProjectUnsharedLibReferences(XINERAMA,Xinerama,$(XINERAMALIBSRC),XBuildLibDir) -#endif -#endif - #if BuildDPSLibrary DPSLIBSRC = $(LIBSRC)/dps #if SharedLibDps @@ -1691,6 +1863,18 @@ #endif #endif +#if BuildGLULibrary + GLULIBSRC = $(LIBSRC)/GLU +#if SharedLibGlu +#ifndef SharedGluRev +#define SharedGluRev 1.3 +#endif +SharedLibReferences(GLU,GLU,$(GLULIBSRC),SOGLUREV,SharedGluRev) +#else +ProjectUnsharedLibReferences(GLU,GLU,$(GLULIBSRC),XBuildLibDir) +#endif +#endif + #if BuildGLXLibrary GLXLIBSRC = $(LIBSRC)/GL #if SharedLibGlx @@ -1814,6 +1998,28 @@ ProjectUnsharedLibReferences(XMU,Xmu,$(XMUSRC),XBuildLibDir) #endif +#ifndef SharedLibXmuu +#define SharedLibXmuu HasSharedLibraries +#endif +#ifndef NormalLibXmuu +#define NormalLibXmuu (!SharedLibXmuu | ForceNormalLib) +#endif +#ifndef DebugLibXmuu +#define DebugLibXmuu NO /* debugged Xmuu library */ +#endif +#ifndef ProfileLibXmuu +#define ProfileLibXmuu NO /* profiled Xmuu library */ +#endif + XMUUSRC = $(LIBSRC)/Xmuu +#if SharedLibXmuu +#ifndef SharedXmuuRev +#define SharedXmuuRev 1.0 +#endif +SharedLibReferences(XMUU,Xmuu,$(XMUUSRC),SOXMUUREV,SharedXmuuRev) +#else +ProjectUnsharedLibReferences(XMUU,Xmuu,$(XMUUSRC),XBuildLibDir) +#endif + #ifndef SharedOldX #define SharedOldX HasSharedLibraries #endif @@ -2201,29 +2407,41 @@ ProjectUnsharedLibReferences(XPM,Xpm,$(XPMLIBSRC),XBuildLibDir) #endif -#ifndef SharedLibXft -#define SharedLibXft HasSharedLibraries +#ifndef SharedLibFreetype2 +#define SharedLibFreetype2 HasSharedLibraries #endif -#ifndef NormalLibXft -#define NormalLibXft (!SharedLibXft | ForceNormalLib) +#ifndef NormalLibFreetype2 +#define NormalLibFreetype2 (!SharedLibFreetype2 | ForceNormalLib) #endif -#ifndef DebugLibXft -#define DebugLibXft NO +#ifndef DebugLibFreetype2 +#define DebugLibFreetype2 NO #endif -#ifndef ProfileLibXft -#define ProfileLibXft NO +#ifndef ProfileLibFreetype2 +#define ProfileLibFreetype2 NO #endif - XFTLIBSRC = $(LIBSRC)/Xft -#if SharedLibXft -#ifndef SharedXftRev -#define SharedXftRev 1.0 + FREETYPE2LIBSRC = $(LIBSRC)/freetype2 +#if SharedLibFreetype2 +#ifndef SharedFreetype2Rev +#define SharedFreetype2Rev 6.0 #endif -SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) +SharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),SOFREETYPE2REV,SharedFreetype2Rev) #else -ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) +ProjectUnsharedLibReferences(FREETYPE2,freetype,$(FREETYPE2LIBSRC),XBuildLibDir) #endif -#ifdef Freetype2Dir +#if UseFreetype2 + +#if BuildFreetype2Library +FREETYPE2INCLUDES=$(TOP_X_INCLUDES)/freetype2 +FREETYPE2DEFINES=-DFREETYPE2 +#else + +#if HasFreetype2 + +#ifndef Freetype2Dir +#define Freetype2Dir /usr +#endif + #ifndef Freetype2LibDir #define Freetype2LibDir Freetype2Dir/lib #endif @@ -2238,21 +2456,60 @@ FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR) FREETYPE2LIB = -L$(FREETYPE2LIBDIR) -lfreetype FREETYPE2DEFINES = -DFREETYPE2 +#endif #endif +#endif + +#ifndef SharedLibXft +#define SharedLibXft HasSharedLibraries +#endif +#ifndef NormalLibXft +#define NormalLibXft (!SharedLibXft | ForceNormalLib) +#endif +#ifndef DebugLibXft +#define DebugLibXft NO +#endif +#ifndef ProfileLibXft +#define ProfileLibXft NO +#endif + XFTLIBSRC = $(LIBSRC)/Xft +#if SharedLibXft +#ifndef SharedXftRev +#define SharedXftRev 1.0 +#endif +SharedLibReferences(XFT,Xft,$(XFTLIBSRC),SOXFTREV,SharedXftRev) +#else +ProjectUnsharedLibReferences(XFT,Xft,$(XFTLIBSRC),XBuildLibDir) +#endif #ifndef XftClientDepLibs +#if UseFreetype2 +#define XftClientDepLibs $(DEPXFTLIB) $(DEPFREETYPE2LIB) $(DEPXRENDERLIB) +#else #define XftClientDepLibs $(DEPXFTLIB) $(DEPXRENDERLIB) #endif +#endif #ifndef XftClientLibs +#if UseFreetype2 #define XftClientLibs $(XFTLIB) $(FREETYPE2LIB) $(XRENDERLIB) +#else +#define XftClientLibs $(XFTLIB) $(XRENDERLIB) +#endif #endif +#ifndef XmuuClientDepLibs +#define XmuuClientDepLibs $(DEPXMUULIB) $(DEPXLIB) +#endif +#ifndef XmuuClientLibs +#define XmuuClientLibs $(XMUULIB) $(XLIB) +#endif + #ifndef LdLibraryPath #define LdLibraryPath LD_LIBRARY_PATH #endif -#ifdef BuildXKBlib +#if BuildXKBlib XKBFILELIBSRC = $(LIBSRC)/xkbfile ProjectUnsharedLibReferences(XKBFILE,xkbfile,$(XKBFILELIBSRC),XBuildLibDir) #ifndef XkbClientDepLibs @@ -2284,7 +2541,7 @@ #endif #endif /* BuildXKBlib */ -#ifdef BuildXKBuilib +#if BuildXKBuilib XKBUILIBSRC = $(LIBSRC)/xkbui ProjectUnsharedLibReferences(XKBUI,xkbui,$(XKBUILIBSRC),XBuildLibDir) #ifndef XkbuiLibs @@ -2347,6 +2604,7 @@ * if the InstallAppDefFiles configuration parameter is set. */ #ifndef InstallAppDefaultsLong +#if UseConfDirForAppDefaults #if InstallAppDefFiles #define InstallAppDefaultsLong(file,class) @@\ LinkConfDirectory(app-defaults,.,app-defaults,.) @@\ @@ -2356,9 +2614,53 @@ LinkConfDirectory(app-defaults,.,app-defaults,.) @@\ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) #endif /* InstallAppDefFiles */ +#else /* UseConfDirForAppDefaults */ +#if InstallAppDefFiles +#define InstallAppDefaultsLong(file,class) @@\ +InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) +#else +#define InstallAppDefaultsLong(file,class) @@\ +InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) +#endif /* InstallAppDefFiles */ +#endif /* UseConfDirForAppDefaults */ #endif /* InstallAppDefaultsLong */ /* + * MakeXftCache - generate rules to build XftCache database + */ + +#ifdef UseFreetype2 + +#ifndef MakeXftCache +#define MakeXftCache(deplist) @@\ +all:: XftCache @@\ + @@\ +XftCache: deplist @@\ + RunProgram(XFTCACHE, $(XFTCACHEOPTS) .) @@\ + @@\ +clean:: @@\ + RemoveFile(XftCache) +#endif /* MakeXftCache */ + +#ifndef InstallXftCache +#define InstallXftCache(dest) @@\ +InstallTarget(install,XftCache,$(INSTDATFLAGS),dest) +#endif /* InstallXftCache */ + +#else + +#ifndef MakeXftCache +#define MakeXftCache(deplist) +#endif + +#ifndef InstallXftCache +#define InstallXftCache(dest) +#endif + +#endif + + +/* * MakeFontsDir - generate rules to build fonts.dir database. */ #ifndef MakeFontsDir @@ -2562,7 +2864,7 @@ #ifndef MakeBdfFontFromUCSMaster -#if HasPerl +#if HasPerl5 #define MakeBdfFontFromUCSMaster(font,enc) @@\ includes:: font-enc.bdf @@\ @@\ @@ -2576,7 +2878,7 @@ #endif #ifndef MakeTruncatedUCSBdfFont -#if HasPerl +#if HasPerl5 #define MakeTruncatedUCSBdfFont(font,trunc,name) @@\ includes:: name.bdf @@\ @@\ @@ -2615,23 +2917,27 @@ #define PostProcessTroffPS(temp,real) $(MV) temp real #endif -#ifndef MakeSimpleDoc -#define MakeSimpleDoc(file,srcs) @@\ +#ifndef MakeDepSimpleDoc +#define MakeDepSimpleDoc(file,deps,srcs) @@\ all:: file.PS file.txt @@\ .PRECIOUS: file.PS @@\ @@\ -file.PS: srcs @@\ +file.PS: deps @@\ -$(TROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw > file.nPS \@@\ && PostProcessTroffPS(file.nPS,$@) @@\ @if grep '^[^1-9.]' index.raw; then exit 1; else test $$? -le 1; fi @@\ @@\ -file.txt: srcs @@\ +file.txt: deps @@\ $(NROFF) $(MSMACROS) $(XDOCMACROS) srcs 2> index.raw | $(COL) $(COLFLAGS) > $@ @@\ @@\ clean:: @@\ $(RM) index.raw file.nPS file.PS file.txt #endif +#ifndef MakeSimpleDoc(file,srcs) +#define MakeSimpleDoc(file,srcs) MakeDepSimpleDoc(file,srcs,srcs) +#endif + #ifndef MakeTblDoc #define MakeTblDoc(file,srcs) @@\ all:: file.PS file.txt @@\ @@ -2720,6 +3026,14 @@ #define InstallRoffDoc(name) InstallDoc(name,name.PS name.txt) #endif +#ifndef InstallLatexDoc +#if HasLatex +#define InstallLatexDoc(name) InstallDoc(name,name.PS) +#else +#define InstallLatexDoc(name) +#endif +#endif + #ifndef InstallHardcopyDoc #define InstallHardcopyDoc(name,deps) @@\ all:: deps @@\ @@ -2734,5 +3048,35 @@ fi @@\ @@\ InstallDoc(name,deps) +#endif + + +/* + * Rule for maintainers to use to updated generated copies of fonts in the + * source tree. Use with care. + */ + +#ifndef UpdateDerivedFont +#define UpdateDerivedFont(src,dst) @@\ +update.fonts:: src @@\ + -@if [ -f dst ]; then \ @@\ + if [ "$(FORCEUPDATE)" = yes ]; then \ @@\ + if [ "$(FOLLOWLINK)" = no ]; then \ @@\ + (set -x; $(RM) dst); \ @@\ + fi; \ @@\ + set -x; cp src dst; \ @@\ + else \ @@\ + grep -v "XFree86:" src > __tmp1__; \ @@\ + grep -v "XFree86:" dst > __tmp2__; \ @@\ + if diff __tmp1__ __tmp2__ > /dev/null 2>&1; then :; \ @@\ + else \ @@\ + if [ "$(FOLLOWLINK)" = no ]; then \ @@\ + (set -x; $(RM) dst); \ @@\ + fi; \ @@\ + set -x; cp src dst; \ @@\ + fi; \ @@\ + fi; \ @@\ + fi @@\ + @$(RM) __tmp1__ __tmp2__ #endif Index: xc/config/cf/apollo.cf diff -u xc/config/cf/apollo.cf:1.1.1.4 xc/config/cf/apollo.cf:1.1.1.5 --- xc/config/cf/apollo.cf:1.1.1.4 Sat Dec 21 22:14:41 1996 +++ xc/config/cf/apollo.cf Tue Jan 16 16:53:13 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: apollo.cf /main/34 1996/09/28 16:09:07 rws $ +XCOMM platform: $Xorg: apollo.cf,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ /* * Minimally tested, and only in the bsd4.3 environment. X_NOT_POSIX is not Index: xc/config/cf/bsd.cf diff -u xc/config/cf/bsd.cf:1.2 xc/config/cf/bsd.cf:1.3 --- xc/config/cf/bsd.cf:1.2 Sun Sep 6 00:46:50 1998 +++ xc/config/cf/bsd.cf Wed Jan 17 11:22:31 2001 @@ -1,5 +1,8 @@ -XCOMM platform: $XConsortium: bsd.cf /main/24 1996/09/28 16:09:13 rws $ -XCOMM $XFree86: xc/config/cf/bsd.cf,v 1.2 1998/09/06 04:46:50 dawes Exp $ +XCOMM platform: $Xorg: bsd.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + + + +XCOMM $XFree86: xc/config/cf/bsd.cf,v 1.3 2001/01/17 16:22:31 dawes Exp $ #ifndef OSName #define OSName 4.3bsd Index: xc/config/cf/bsdLib.rules diff -u xc/config/cf/bsdLib.rules:3.13 xc/config/cf/bsdLib.rules:3.15.2.1 --- xc/config/cf/bsdLib.rules:3.13 Sun Feb 13 01:15:18 2000 +++ xc/config/cf/bsdLib.rules Thu May 24 12:35:38 2001 @@ -1,10 +1,10 @@ -XCOMM $XConsortium: bsdLib.rules /main/3 1996/09/28 16:09:18 rws $ +XCOMM $Xorg: bsdLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.13 2000/02/13 06:15:18 dawes Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.rules,v 3.15.2.1 2001/05/24 16:35:38 dawes Exp $ /* * NetBSD/FreeBSD shared library rules */ @@ -185,7 +185,7 @@ #define ShLibIncludeFile #endif #ifndef SharedLibraryLoadFlags -#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIR) +#define SharedLibraryLoadFlags -shared -Wl,-rpath,$(USRLIBDIRPATH) #endif #ifndef PositionIndependentCFlags #define PositionIndependentCFlags -fPIC @@ -320,6 +320,23 @@ $(RM) name #endif /* SharedDepModuleTarget */ + +#ifndef SharedDriModuleTarget +#define SharedDriModuleTarget(name,deps,solist) @@\ +AllTarget(name) @@\ + @@\ +name: deps @@\ + $(RM) $@~ $@.map @@\ + @(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map) @@\ + $(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\ + $(RM) $@ $@.map @@\ + $(MV) $@~ $@ @@\ + @@\ +clean:: @@\ + $(RM) name @@\ + $(RM) name.map + +#endif /* SharedDriModuleTarget */ /* * SharedLibraryDataTarget - generate rules to create shlib data file; Index: xc/config/cf/bsdLib.tmpl diff -u xc/config/cf/bsdLib.tmpl:3.6 xc/config/cf/bsdLib.tmpl:3.8.2.1 --- xc/config/cf/bsdLib.tmpl:3.6 Mon Aug 28 11:29:08 2000 +++ xc/config/cf/bsdLib.tmpl Thu May 24 12:35:38 2001 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: bsdLib.tmpl /main/3 1996/09/28 16:09:25 rws $ -XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.6 2000/08/28 15:29:08 dawes Exp $ +XCOMM $Xorg: bsdLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/bsdLib.tmpl,v 3.8.2.1 2001/05/24 16:35:38 dawes Exp $ /* * NetBSD/FreeBSD/OpenBSD shared library template @@ -46,18 +46,20 @@ #if !defined(SharedX11Reqs) #define SharedX11Reqs #endif -#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -#define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -#define SharedXiReqs $(LDPRELIB) $(XLIB) -#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary -#define SharedXtstReqs $(LDPRELIB) $(XLIB) -#define SharedXieReqs $(LDPRELIB) $(XLIBONLY) -#define SharedSMReqs $(LDPRELIB) $(ICELIB) -#define SharedFrescoReqs $(LDPRELIB) $(XLIBONLY) FrescoSysLibs -#define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs +#define SharedOldXReqs $(LDPRELIBS) $(XLIBONLY) +#ifndef SharedXtReqs +#define SharedXtReqs $(LDPRELIBS) $(XLIBONLY) $(SMLIB) $(ICELIB) +#endif +#define SharedXawReqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXaw6Reqs $(LDPRELIBS) $(XMULIB) $(XTOOLLIB) $(XLIB) +#define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB) +#define SharedXextReqs $(LDPRELIBS) $(XLIBONLY) +#define SharedXiReqs $(LDPRELIBS) $(XLIB) +#define SharedPexReqs $(LDPRELIBS) $(XLIBONLY) MathLibrary +#define SharedXtstReqs $(LDPRELIBS) $(XLIB) +#define SharedXieReqs $(LDPRELIBS) $(XLIBONLY) +#define SharedSMReqs $(LDPRELIBS) $(ICELIB) +#define SharedFrescoReqs $(LDPRELIBS) $(XLIBONLY) FrescoSysLibs +#define SharedXtfReqs $(LDPRELIBS) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs #endif /* UseElfFormat */ Index: xc/config/cf/bsdi.cf diff -u xc/config/cf/bsdi.cf:3.32 xc/config/cf/bsdi.cf:3.36 --- xc/config/cf/bsdi.cf:3.32 Tue Oct 24 18:45:00 2000 +++ xc/config/cf/bsdi.cf Thu Apr 19 15:54:42 2001 @@ -1,6 +1,8 @@ -XCOMM platform: $XConsortium: bsdi.cf /main/22 1996/09/28 16:09:30 rws $ -XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.32 2000/10/24 22:45:00 dawes Exp $ +XCOMM platform: $Xorg: bsdi.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + + +XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.36 2001/04/19 19:54:42 dawes Exp $ #ifndef OSName #define OSName DefaultOSName #endif @@ -95,7 +97,7 @@ #endif #define CppCmd /usr/bin/cpp -#define TroffCmd groff -Tps +#define HasGroff YES #define MkdirHierCmd mkdir -p #define SetTtyGroup YES #define HasNdbm YES @@ -110,12 +112,14 @@ # define GccUsesGas YES # endif #if HasGcc +#ifndef DefaultCCOptions #if defined(UseInstalled) && (!defined(XF86LinkKit) || !XF86LinkKit) #define DefaultCCOptions /**/ #else #define DefaultCCOptions /* -ansi */ #endif #endif +#endif #if GccUsesGas # define GccGasOption -DGCCUSESGAS @@ -215,12 +219,14 @@ #define ManSourcePath $(MANPATH)/cat #define InstallManPageLong(file,destdir,dest) @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ all:: file.0 @@\ @@\ -file.0:: file.man @@\ - @if [ -f file.man ]; \ @@\ +file.0:: file.$(MANNEWSUFFIX) @@\ + @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\ then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ + cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ cp /tmp/$$$$.man file.0; \ @@\ $(RM) /tmp/$$$$.man; \ @@\ fi @@\ Index: xc/config/cf/cde.rules diff -u xc/config/cf/cde.rules:1.3 xc/config/cf/cde.rules:1.4 --- xc/config/cf/cde.rules:1.3 Fri Oct 2 02:15:03 1998 +++ xc/config/cf/cde.rules Wed Jan 17 11:22:31 2001 @@ -13,7 +13,7 @@ * (c) Copyright 1996 FUJITSU LIMITED. * (c) Copyright 1996 Hitachi. */ -XCOMM $TOG: cde.rules /main/4 1998/02/06 10:53:52 kaleb $ +XCOMM $Xorg: cde.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* Note whether we are the top level project. */ #ifndef SeenTopLevelProject Index: xc/config/cf/cde.tmpl diff -u xc/config/cf/cde.tmpl:1.1.1.1 xc/config/cf/cde.tmpl:1.1.1.2 --- xc/config/cf/cde.tmpl:1.1.1.1 Sat Dec 21 22:15:33 1996 +++ xc/config/cf/cde.tmpl Tue Jan 16 16:53:23 2001 @@ -1,4 +1,4 @@ -XCOMM $XConsortium: cde.tmpl /main/2 1996/12/04 10:13:09 swick $ +XCOMM $Xorg: cde.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* Include the Motif project template file. */ #include Index: xc/config/cf/convex.cf diff -u xc/config/cf/convex.cf:1.1.1.4 xc/config/cf/convex.cf:1.1.1.5 --- xc/config/cf/convex.cf:1.1.1.4 Sat Dec 21 22:14:47 1996 +++ xc/config/cf/convex.cf Tue Jan 16 16:53:26 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: convex.cf /main/4 1996/09/28 16:09:50 rws $ +XCOMM platform: $Xorg: convex.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName #define OSName ConvexOS V9.0 Index: xc/config/cf/cray.cf diff -u xc/config/cf/cray.cf:1.1.1.3 xc/config/cf/cray.cf:1.1.1.4 --- xc/config/cf/cray.cf:1.1.1.3 Sat Dec 21 22:14:48 1996 +++ xc/config/cf/cray.cf Tue Jan 16 16:53:28 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: cray.cf /main/52 1996/09/28 16:09:55 rws $ +XCOMM platform: $Xorg: cray.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName #define OSName UNICOS 8.0 Index: xc/config/cf/cross.def diff -u xc/config/cf/cross.def:1.1 xc/config/cf/cross.def:1.2 --- xc/config/cf/cross.def:1.1 Fri Dec 8 17:09:34 2000 +++ xc/config/cf/cross.def Thu Mar 29 21:15:17 2001 @@ -1,4 +1,4 @@ -/* $XFree86: xc/config/cf/cross.def,v 1.1 2000/12/08 22:09:34 keithp Exp $ */ +/* $XFree86: xc/config/cf/cross.def,v 1.2 2001/03/30 02:15:17 keithp Exp $ */ /* * This file contains redefinitions of some symbols to enable * cross compilation: e.g. paths for include files and paths to @@ -20,6 +20,9 @@ #undef PostIncDir #define PostIncDir /skiff/local/lib/gcc-lib/arm-linux/2.95.2/include #define CcCmd /skiff/local/bin/arm-linux-gcc +#undef CplusplusCmd +#define HasCplusplus YES +#define CplusplusCmd /skiff/local/bin/arm-linux-g++ #define DoRanlibCmd YES #define RanlibCmd /skiff/local/bin/arm-linux-ranlib #undef ExtraLoadFlags Index: xc/config/cf/cygwin.cf diff -u xc/config/cf/cygwin.cf:3.2 xc/config/cf/cygwin.cf:3.16.2.1 --- xc/config/cf/cygwin.cf:3.2 Thu Nov 30 18:29:55 2000 +++ xc/config/cf/cygwin.cf Wed May 30 10:29:27 2001 @@ -1,18 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.2 2000/11/30 23:29:55 dawes Exp $ -XCOMM -XCOMM - changes since B20 Cygwin32 release -XCOMM - avoided tons of "not in XXX directory" messages; -XCOMM - dlls are built stripped; -XCOMM - search for cpp in a default location; -XCOMM - fixed problem with missing netinet/tcp.h; -XCOMM - Added AF_UNIX socket support; -XCOMM - xterm compiles and works; -XCOMM - more libs are built as a DLLs; -XCOMM - all DLLs have different base addresses; -XCOMM - changes since B20 Cygwin32 release -XCOMM - dllwrap is used to build DLLs; -XCOMM - Plan to add WATCOM TCP headers support; -XCOMM - gcc -E is invoked instead of cpp; +XCOMM platform: $XFree86: xc/config/cf/cygwin.cf,v 3.16.2.1 2001/05/30 14:29:27 alanh Exp $ #ifndef OSName #define OSName Cygwin @@ -24,14 +10,12 @@ #define OSMajorVersion 1 #endif #ifndef OSMinorVersion -#define OSMinorVersion 1 +#define OSMinorVersion 3 #endif -#ifndef OSTeenyVersion 2 -#define OSTeenyVersion +#ifndef OSTeenyVersion +#define OSTeenyVersion 1 #endif -XCOMM #define OSDefines -DSYSV -DSYSV386 - #define ProjectRoot /usr/X11R6 #define BuildServer YES @@ -40,26 +24,39 @@ #define UnixCpp #endif -#define HasGcc YES -#define HasGcc2 YES #define HasGcc2ForCplusplus YES #define GccUsesGas YES #define UseGas YES #define GnuCpp YES +#define BootstrapCFlags -L/lib/automode.o + #define HasShadowPasswd NO #define HasLibCrypt YES #define HasPutenv YES #define HasPoll NO -#define HasShm NO +#if UseCygIPC +# define HasShm YES +# define ServerExtraSysLibs -lcygipc +#else +# define HasShm NO +# define ServerExtraSysLibs /**/ +#endif +#define HasSnprintf YES + +/* + * Cygwin has Tcl/Tk, but you need to keep the version numbers + * of the libs in sync. These version numbers may change + * occassionally. + */ #define Hastcl YES #define Hastk YES #define TclLibName tcl80 #define TkLibName tk80 + #define HasSockets YES #define GzipFontCompression YES -#define BuildXKB YES -#define BuildXF86MiscExt YES -#define BuildXF86VidModeExt YES /* need -fpcc-struct-return for gcc-2.95.2 or it will fail*/ +#define HasZlib YES + #define SharedLibFont NO #define AvoidNullMakeCommand YES #define StripInstalledPrograms NO @@ -74,21 +71,19 @@ #define ExpandManNames NO #define HasDlopen NO #define HasGnuMake YES -XCOMM #define ExtraLoaderDefines DlopenHack -#define DefaultCCOptions -Wall -#define DefaultGcc2i386Opt -O2 -#define LibraryCDebugFlags -O2 #define UseGccMakeDepend YES - - +/* + * This options may depend on the state of POSIX thread + * support in Cygwin, which is improving as of 2001-04-12. + */ #define ThreadedX NO #define HasThreadSafeAPI NO + #define LnCmd ln -s #define CcCmd gcc #define CpluplusCmd c++ -fpermissive #define AsCmd as -XCOMM #define AsCmd gcc -S #define GccGasOption -DGCCUSESGAS #define AsmDefines -DUSE_GAS -DGCCUSESGAS #define LdCmd ld @@ -98,18 +93,30 @@ #define LexCmd flex -l #define LexLib -lfl #define HasFlex YES + #define PreProcessCmd CcCmd -E -XCOMM #define StdIncDir `CcCmd --print-libgcc-file-name | sed ':libgcc.a:../../../../i586-cygwin32/include:'|sed 's,\\\\,/,g'` -XCOMM #define PostIncDir `CcCmd --print-libgcc-file-name | sed ':libgcc.a:/include:'|sed 's,\\\\,/,g'` + #define StdIncDir `CcCmd --print-libgcc-file-name | sed 's,\\\\,/,g' | sed 's,libgcc.a,../../../../i686-pc-cygwin/include,'` + #define PostIncDir `CcCmd --print-libgcc-file-name | sed 's,\\\\,/,g' | sed 's,libgcc.a,include,'` + #define LdCombineFlags -r -#define OptimizedCDebugFlags -O2 -pedantic -fno-strength-reduce -fpcc-struct-return -fvtable-thunks -m486 -#define StandardDefines -D__i386__ -DWIN32_LEAN_AND_MEAN -DX_LOCALE -D_MT -D_X86_ -D__STDC__ -DNO_TCP_H -D__CYGWIN__ -D_XOPEN_SOURCE -D_REENTRANT -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DX_SOURCE + +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags DefaultGcc2i386Opt +# endif + +#define StandardDefines -D__i386__ -DWIN32_LEAN_AND_MEAN -DX_LOCALE -D_X86_ -D__STDC__ -DNO_TCP_H -D__CYGWIN__ -D_XOPEN_SOURCE -D_POSIX_C_SOURCE=199309L -D_BSD_SOURCE -D_SVID_SOURCE -D_GNU_SOURCE -DX_SOURCE + #define XawI18nDefines -DUSE_XWCHAR_STRING -DUSE_XMBTOWC #define HasWChar32 YES -#define StandardCppDefines -traditional StandardDefines -#define ServerOSDefines XFree86ServerDefines -DDDXTIME -DFD_SETSIZE=256 -DDXOSINIT +#define StandardCppOptions -traditional +#if UseCygIPC +# define StandardCppDefines -DHAS_SHM StandardDefines +#else +# define StandardCppDefines StandardDefines +#endif +#define ServerOSDefines XFree86ServerDefines -DDDXTIME -DFD_SETSIZE=256 -DDXOSINIT #define XkbServerDefines -DXKB_ALWAYS_USES_SOFT_REPEAT #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #define ConnectionFlags -DTCPCONN -DUNIXCONN @@ -117,22 +124,121 @@ #define InstUidFlags -m 4711 #define UseRgbTxt YES #define ExtraFilesToClean *.obj *.orig *.rej junk.c *.exe *.dll *.lib *~ - -/* This a must to compile for xfddx display driver, or your server will NOT work on Win32. DO NOT change to NO */ - -#define BuildSurfLibrary YES -/* The DRM module requires Linux kernel services, thus useless for CYGWIN compilers*/ - +/* + * You'll probably want BuildDebug to be YES if you are debugging :) + */ +#define BuildDebug NO +#define XFree86Devel NO + +/* + * Xinerama is multiple monitor support and will require special code, + * if it even makes sense to enable such a beast in Cygwin/XFree86. + */ +#define BuildXinerama NO + +/* + * PEX and XIE were deprecated on 2001-05-29, as Keith Packard says, + * "they are so broken as to be unusable in real applications," furthermore, + * "neither PEX nor XIE have seen any development for almost a decade". + * + * XIE is the X Image Extension Protocol, not to be confused with + * XInputExt, which is the X Input Extension. + */ +#define BuildPexExt NO +#define BuildXIE NO + +/* + * Rush is a non standard extension for cooperation between the glide + * library and the X server. Cygwin/XFree86 will never need Rush, + * as all graphics requests are processed through GDI or DirectDraw. + */ +#define BuildXF86RushExt NO + +/* + * DPMS is the Display Power Management System. Cygwin/XFree86 doesn't + * own the display hardware, Windows does, so it doesn't make sense + * for Cygwin/XFree86 to try to provide power management. + */ +#define BuildDPMS NO +#define BuildDPMSExt NO +#define DPMSDefines /**/ + +#define BuildGlxExt YES +#define BuildXInputExt YES +#define BuildXF86VidModeExt YES +#define BuildXF86DGA NO +#define BuildXvExt YES +#define BuildXF86MiscExt YES +#define BuildRender YES #define BuildXF86DRI NO #define BuildXF86DRM NO -#define BuildGlxExt YES -#define BuildXinrama YES +#define BuildXKB YES +#define BuildXCMiscExt YES +#define BuildTestExt YES +#define BuildMITMiscExt YES +#define BuildSyncExt YES +#define BuildBigReqsExt YES +#define BuildEVI YES +#define BuildXF86BigfontExt YES +#define BuildRECORD YES +#define BuildDBE YES +#define BuildFontCache YES +#define BuildLBX YES +#define BuildCup YES +#define BuildXCSecurity YES +#define BuildAppgroup YES +#define BuildShapeExt YES +#define BuildScanpci NO + +#define BuildScreenSaverExt NO + +/* + * What is Plugin? + */ #define BuildPlugin NO -#define BuildDPSLibrary YES -XCOMM #define GlxStaticServerLib YES -#define DoLoadableServer NO +/* + * DPS is the Adobe Display Postscript (r) library. + * It seems that we do not yet have a postscript client library + * to work in conjunction with DPS; the remedy to this may be + * as simple as flipping a build switch or instaling Ghostscript. + * In any case, some work needs to be done before DPS will work. + */ +#define BuildDPS NO + +/* + * Doing a loadable server would probably take some extra work. + */ +#define DoLoadableServer NO + +/* + * Don't build the XFree86 server + */ +#define XF86Server NO + +/* + * Try to avoid building anything related to graphics cards + */ +#define XFShadowFB NO +#define XF24_32Bpp NO +#define XF8_16Bpp NO +#define XF8_32Bpp NO +#define XF4Bpp NO +#define XF1Bpp NO +#define XF86VgaHw NO +#define XF86FBDevHw NO +#define XF86XAA NO +#define XF86Ramdac NO +#define XF86I2C NO +#define XF86DDC NO +#define XF86RAC NO +#define XF86Int10 NO + +#define XF86AFB NO + +#define XF86CardDrivers /**/ + /* Some of these man page defaults are overriden in the above OS sections */ #ifndef ManSuffix # define ManSuffix 1x @@ -153,13 +259,19 @@ # define FileManDir $(MANSOURCEPATH)5 #endif +/* we don't need -lm */ +#define MathLibrary /**/ #define TermcapLibrary -ltermcap -#define XnestServer YES -#define BuildXprint YES -#define XprtServer YES +#define XnestServer YES +#define BuildXprint YES +#define XprtServer YES #define XVirtualFramebufferServer YES -#define XWinServer YES -#define UseSmartScheduler NO +#define XWinServer YES + +/* + * Why we don't use the smart scheduler? + */ +#define UseSmartScheduler NO /* --unix option of cygwin make fools the standard MakeFlagsToShellFlags macro */ #define MakeFlagsToShellFlags(makeflags,shellcmd)\ @@ -168,4 +280,3 @@ #include #include -/*#include */ Index: xc/config/cf/cygwin.rules diff -u xc/config/cf/cygwin.rules:3.2 xc/config/cf/cygwin.rules:3.5 --- xc/config/cf/cygwin.rules:3.2 Wed Aug 23 17:06:18 2000 +++ xc/config/cf/cygwin.rules Fri Apr 27 08:32:42 2001 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.2 2000/08/23 21:06:18 dawes Exp $ +XCOMM $XFree86: xc/config/cf/cygwin.rules,v 3.5 2001/04/27 12:32:42 alanh Exp $ #define CPPOnlyAsm(basename,options) RemoveFile(basename.i) @@\ $(CPP) AsmDefines $(DEFINES) $(INCLUDES) options basename.S | grep -v '^\#' > basename.i @@ -30,8 +30,9 @@ #define SharedLibgetsurf NO #define SharedLibDps YES #define SharedLibDpsTk YES +#define NormalLibGlu YES +#define SharedLibGlu YES - #ifndef SharedDataSeparation #define SharedDataSeparation NO #endif @@ -120,8 +121,8 @@ @@\ junk.c: @@\ echo "#include " >junk.c @@\ - echo "/*DECLARE_CYGWIN_DLL(dll_main);*/" >>junk.c @@\ - echo "int WINAPI dll_main(HANDLE a, DWORD reason, void *q)" >>junk.c @@\ + echo "DECLARE_CYGWIN_DLL(dll_main);" >>junk.c @@\ + echo "int WINAPI dll_main(HINSTANCE a, DWORD reason, void *q)" >>junk.c @@\ echo "{ return 1; }" >>junk.c @@\ Concat3(lib,libname,.dll): solist junk.o libname.def @@\ RemoveFile(LibraryTargetName(libname)) @@\ @@ -143,15 +144,6 @@ #define ProgramTargetName(target)target.exe /* - * LinkBuildBinary - export a *.exe to exports/bin. - */ -#define LinkBuildBinary(program) @@\ -all:: $(BUILDBINDIR)/program program @@\ - $(BUILDBINDIR)/program: program @@\ - RemoveFile$(@) @@\ - cd $(BUILDBINDIR) && $(CP) $(BUILDBINTOP)/$(CURRENT_DIR)/program . - -/* * LinkBuildDLL - export a .dll to exports/bin. */ #ifdef UseInstalled @@ -168,13 +160,11 @@ #ifndef LinkBuildBinary -#define LinkBuildBinary -all:: $(BUILDBINDIR)/ProgramTargetName(binary) ProgramTargetName(binary) @@\ - @@\ -$(BUILDBINDIR)/ProgramTargetName(binary): ProgramTargetName(binary) @@\ +#define LinkBuildBinary(program) @@\ +all:: program @@\ MakeDir($(BUILDBINDIR)) @@\ - RemoveFile($(BUILDBINDIR)/ProgramTargetName(binary))) @@\ - cd $(BUILDBINDIR) && $(LN) $(BUILDBINTOP)/$(CURRENT_DIR)/ProgramTargetName(binary) . + RemoveFile($(BUILDBINDIR)/program) @@\ + $(CP) $(BUILDBINTOP)/$(CURRENT_DIR)/program $(BUILDBINDIR) #endif /* LinkBuildBinary */ /* This is to replace an ugly hack in /xc/nls/XLC_LOCALE */ Index: xc/config/cf/cygwin.tmpl diff -u xc/config/cf/cygwin.tmpl:3.2 xc/config/cf/cygwin.tmpl:3.4 --- xc/config/cf/cygwin.tmpl:3.2 Mon Dec 4 13:49:13 2000 +++ xc/config/cf/cygwin.tmpl Wed Apr 18 13:13:58 2001 @@ -1,5 +1,5 @@ XCOMM $XConsortium: WinLib.tmpl,v 1.1 94/01/08 18:32:51 rws Exp $ -XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.2 2000/12/04 18:49:13 dawes Exp $ +XCOMM $XFree86: xc/config/cf/cygwin.tmpl,v 3.4 2001/04/18 17:13:58 dawes Exp $ #define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) #define SharedXtReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XLIBONLY) @@ -15,6 +15,7 @@ #define SharedXpReqs $(LDPRELIB) $(XAUTHLIB) $(EXTENSIONLIB) $(XLIBONLY) #define SharedXvReqs $(LDPRELIB) $(XLIB) #define SharedGLReqs $(LDPRELIB) $(XLIB) +#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB) XCOMM #define SharedXfontReqs $(LDPRELIB) $(XLIB) #define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) #define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) @@ -25,6 +26,7 @@ #define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB) #define SharedXrenderReqs $(LDPRELIB) $(EXTENSIONLIB) $(XLIB) #define SharedpsresReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB) +#define SharedXmuuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) #ifndef FixupLibReferences Index: xc/config/cf/darwin.cf diff -u xc/config/cf/darwin.cf:1.2 xc/config/cf/darwin.cf:1.14 --- xc/config/cf/darwin.cf:1.2 Tue Nov 28 12:25:07 2000 +++ xc/config/cf/darwin.cf Fri May 18 13:48:23 2001 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.2 2000/11/28 17:25:07 dawes Exp $ +XCOMM $XFree86: xc/config/cf/darwin.cf,v 1.14 2001/05/18 17:48:23 torrey Exp $ -/* Darwin / MacOS-X configuration by John Carmack */ +/* Darwin / Mac OS X configuration by John Carmack */ /* imake determines the default values by parsing uname */ #define OSName DefaultOSName @@ -19,27 +19,34 @@ /* * This enables some settings for developers. */ -#define XFree86Devel NO +#ifndef XFree86Devel +# define XFree86Devel NO +#endif +/* + * This enables Quartz compatibility. + * Turn off to build on raw Darwin systems. + */ +#ifndef DarwinQuartzSupport +# define DarwinQuartzSupport YES +#endif + /* we don't need -lm */ #define MathLibrary /**/ /* we don't have a termcap library */ -#define TermcapLibrary /**/ +#define TermcapLibrary /**/ /* we don't have a dbm library */ -#define DBMLibrary /**/ +#define DBMLibrary /**/ -/* our cpp isn't in /lib/cpp */ +/* our cpp isn't in /lib/cpp and it doesn't like -undef */ #define CppCmd /usr/bin/cpp +#define RawCppCmd CppCmd /* we have a gcc compatible compiler, but its not called gcc */ #define CcCmd /usr/bin/cc - -/* if -c isn't passed, there are problems with the cfb libs when - * they include an object file without any symbols - */ -#define RanlibCmd ranlib -c +#define CplusplusCmd /usr/bin/c++ /* uncommenting this line will get -g instead of -O, which builds * a lot faster and gets debug info @@ -49,6 +56,7 @@ #endif /* default flags to pass to cc */ +#ifndef DefaultCCOptions #if XFree86Devel # define DefaultCCOptions -Wall -Wpointer-arith -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations \ @@ -57,17 +65,25 @@ #else # define DefaultCCOptions -Wall -Wpointer-arith -traditional-cpp #endif +#endif -/* a lot of xfree86 code needs __powerpc__ to avoid doing outport asm - * +/* flags to pass to cc when building libraries */ +#ifndef LibraryCCOptions +# define LibraryCCOptions DefaultCCOptions -fno-common +#endif + +/* * __DARWIN__ will be used for platform specific #ifdefs that can't - * be handled by existing X defines - * - * there is an unfortunate symbol collision with the appkit for TIFFFaxBlackCodes + * be handled by existing X defines. * - * We need to define BSD44SOCKETS to get unix domain socket namelen calculated right + * Darwin's alloca() seg faults (rather than returning NULL) on failed + * allocations, so we can't use it. */ -#define StandardDefines -D__powerpc__ -D__DARWIN__ +#ifdef PpcDarwinArchitecture +#define StandardDefines -D__powerpc__ -D__DARWIN__ -DNO_ALLOCA +#else +#define StandardDefines -D__DARWIN__ -DNO_ALLOCA +#endif /* programs/rgb/rgb.h and others needs this */ #define HasNdbm YES @@ -80,6 +96,11 @@ /* our custom X server */ #define XDarwinServer YES +/* Thanks to the IOKit, the X server does not have to be SetUID. */ +#ifndef InstallXserverSetUID +# define InstallXserverSetUID NO +#endif + /* pex? bah. I'm not going to bother getting the device * dependent part of this working. If I get the time, i'll * get glx working instead. @@ -89,17 +110,37 @@ /* no direct graphics extension */ #define BuildXF86DGA NO -/* no extra tablets and weird input devices */ +/* no server support for extra tablets and weird input devices */ #define BuildXInputExt NO +#define BuildXInputLib YES /* no Display Power Management extension */ #define BuildDPMSExt NO -/* no Render extension */ -#define BuildRender NO - #define BuildXvExt NO + +/* no OpenGL libraries */ +#ifndef BuildGLXLibrary +# define BuildGLXLibrary NO +#endif +#ifndef BuildGLULibrary +# define BuildGLULibrary NO +#endif -/* include all the xfree rules */ -/* I haven't tracked down why this is needed, but it is... */ +#define BuildLibPathVar DYLD_LIBRARY_PATH + +/* include rules to build shared libraries */ +#include + +/* + * Darwin specific Imake Config files + */ +#ifndef LocalConfigFiles +#define LocalConfigFiles \ + darwinLib.rules \ + darwinLib.tmpl +#endif + +/* include all the XFree86 rules */ #include + Index: xc/config/cf/darwinLib.rules diff -u /dev/null xc/config/cf/darwinLib.rules:1.1 --- /dev/null Mon Jun 4 09:29:12 2001 +++ xc/config/cf/darwinLib.rules Mon Mar 12 21:36:12 2001 @@ -0,0 +1,156 @@ +XCOMM $XFree86: xc/config/cf/darwinLib.rules,v 1.1 2001/03/13 02:36:12 torrey Exp $ +/* + * Darwin/Mac OS X shared library rules + */ + +#ifndef UseElfFormat +#define UseElfFormat NO +#endif +#ifndef HasSharedLibraries +#define HasSharedLibraries YES +#endif +#ifndef ForceNormalLib +#define ForceNormalLib YES +#endif + +#ifndef SharedDataSeparation +#define SharedDataSeparation NO +#endif +#ifndef SharedCodeDef +#define SharedCodeDef /**/ +#endif +#ifndef SharedLibraryDef +#define SharedLibraryDef /**/ +#endif +#ifndef ShLibIncludeFile +#define ShLibIncludeFile +#endif +#ifndef SharedLibraryLoadFlags +#define SharedLibraryLoadFlags -dynamiclib -undefined suppress +#endif +#ifndef PositionIndependentCFlags +#define PositionIndependentCFlags -dynamic +#endif +#ifndef ExtraLoadFlags +#define ExtraLoadFlags /**/ +#endif + +/* + * InstallSharedLibrary - generate rules to install the shared library. + */ +#ifndef InstallSharedLibrary +#define InstallSharedLibrary(libname,rev,dest) @@\ +install:: Concat(lib,libname.rev.dylib) @@\ + MakeDir($(DESTDIR)dest) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.rev.dylib) $(DESTDIR)dest @@\ + @MAJREV=`expr rev : '\(.*\)\.'`; \ @@\ + set -x; $(RM) Concat($(DESTDIR)dest/lib,libname.$$MAJREV.dylib) && \ @@\ + $(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.$$MAJREV.dylib) @@\ + @if $(SOSYMLINK); then (set -x; \ @@\ + $(RM) Concat($(DESTDIR)dest/lib,libname.dylib); \ @@\ + $(LN) Concat(lib,libname.rev.dylib) Concat($(DESTDIR)dest/lib,libname.dylib)); fi +#endif /* InstallSharedLibrary */ + +/* + * SharedLibraryTarget - generate rules to create a shared library; + * build it into a different name so that we do not hose people by having + * the library gone for long periods. + */ +#ifndef SharedLibraryTarget +#ifdef UseInstalled +#define LinkBuildSonameLibrary(lib) true +#else +#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \ + cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .) +#endif + +#define SharedLibraryTarget(libname,rev,solist,down,up) @@\ +AllTarget(Concat(lib,libname.rev.dylib)) @@\ + @@\ +Concat(lib,libname.rev.dylib): solist $(EXTRALIBRARYDEPS) @@\ + $(RM) $@~ @@\ + @MAJREV=`expr rev : '\(.*\)\.'`; \ @@\ + INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\ + set -x; (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev solist $(REQUIREDLIBS)); \ @@\ + $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\ + LinkBuildSonameLibrary($$INSTALLNAME) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + @if $(SOSYMLINK); then (set -x; \ @@\ + $(RM) Concat(lib,libname.dylib); \ @@\ + $(LN) $@ Concat(lib,libname.dylib)); fi @@\ + LinkBuildLibrary($@) @@\ + LinkBuildLibraryMaybe(Concat(lib,libname.dylib),$(SOSYMLINK)) @@\ + @@\ +clean:: @@\ + @MAJREV=`expr rev : '\(.*\)\.'`; \ @@\ + set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\ + $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib) + +#endif /* SharedLibraryTarget */ + +/* + * SharedDepLibraryTarget - generate rules to create a shared library. + */ +#ifndef SharedDepLibraryTarget +#ifdef UseInstalled +#ifndef LinkBuildSonameLibrary +#define LinkBuildSonameLibrary(lib) true +#endif +#else +#ifndef LinkBuildSonameLibrary +#define LinkBuildSonameLibrary(lib) (RemoveFile($(BUILDLIBDIR)/lib); \ + cd $(BUILDLIBDIR); $(LN) $(BUILDINCTOP)/$(CURRENT_DIR)/lib .) +#endif +#endif + +#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up) @@\ +AllTarget(Concat(lib,libname.rev.dylib)) @@\ + @@\ +Concat(lib,libname.rev.dylib): deplist $(EXTRALIBRARYDEPS) @@\ + $(RM) $@~ @@\ + @MAJREV=`expr rev : '\(.*\)\.'`; \ @@\ + INSTALLNAME=Concat(lib,libname.$$MAJREV.dylib); \ @@\ + set -x; (cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -install_name $(USRLIBDIR)/$$INSTALLNAME -current_version rev -compatibility_version rev solist $(REQUIREDLIBS)); \ @@\ + $(RM) $$INSTALLNAME; $(LN) $@ $$INSTALLNAME; \ @@\ + LinkBuildSonameLibrary($$INSTALLNAME) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + @if $(SOSYMLINK); then (set -x; \ @@\ + $(RM) Concat(lib,libname.dylib); \ @@\ + $(LN) $@ Concat(lib,libname.dylib)); fi @@\ + LinkBuildLibrary($@) @@\ + LinkBuildLibraryMaybe(Concat(lib,libname.dylib),$(SOSYMLINK)) @@\ + @@\ +clean:: @@\ + @MAJREV=`expr rev : '\(.*\)\.'`; \ @@\ + set -x; $(RM) Concat(lib,libname.$$MAJREV.dylib) @@\ + $(RM) Concat(lib,libname.rev.dylib) Concat(lib,libname.dylib) + +#endif /* SharedDepLibraryTarget */ + +#ifndef SharedDepModuleTarget +#define SharedDepModuleTarget(name,deps,solist) @@\ +AllTarget(name) @@\ + @@\ +name: deps @@\ + $(RM) $@~ @@\ + $(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + @@\ +clean:: @@\ + $(RM) name + +#endif /* SharedDepModuleTarget */ + +/* + * SharedLibraryDataTarget - generate rules to create shlib data file; + */ +#ifndef SharedLibraryDataTarget +#define SharedLibraryDataTarget(libname,rev,salist) +#endif /* SharedLibraryDataTarget */ + +#ifndef InstallSharedLibraryData +#define InstallSharedLibraryData(libname,rev,dest) +#endif /* InstallSharedLibraryData */ Index: xc/config/cf/darwinLib.tmpl diff -u /dev/null xc/config/cf/darwinLib.tmpl:1.1 --- /dev/null Mon Jun 4 09:29:12 2001 +++ xc/config/cf/darwinLib.tmpl Mon Mar 12 21:36:12 2001 @@ -0,0 +1,35 @@ +XCOMM $XFree86: xc/config/cf/darwinLib.tmpl,v 1.1 2001/03/13 02:36:12 torrey Exp $ +/* + * Darwin/Mac OS X shared library template + */ + +#ifndef FixupLibReferences +#define FixupLibReferences() @@\ +XMULIBONLY = -lXmu @@\ +XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) +#endif + +#ifndef XawClientLibs +#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#endif + +#define CplusplusLibC +#define FrescoSysLibs CplusplusLibC MathLibrary + +/* Allow for libpthread, as overridden by OS definitions */ +#if !defined(SharedX11Reqs) +#define SharedX11Reqs +#endif +#define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) +#define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) +#define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) +#define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) +#define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) +#define SharedXextReqs $(LDPRELIB) $(XLIBONLY) +#define SharedXiReqs $(LDPRELIB) $(XLIB) +#define SharedPexReqs $(LDPRELIB) $(XLIBONLY) MathLibrary +#define SharedXtstReqs $(LDPRELIB) $(XLIB) +#define SharedXieReqs $(LDPRELIB) $(XLIBONLY) +#define SharedSMReqs $(LDPRELIB) $(ICELIB) +#define SharedFrescoReqs $(LDPRELIB) $(XLIBONLY) FrescoSysLibs +#define SharedXtfReqs $(LDPRELIB) $(FRESCOLIB) $(XTOOLLIB) $(XLIB) FrescoSysLibs Index: xc/config/cf/fujitsu.cf diff -u xc/config/cf/fujitsu.cf:3.3 xc/config/cf/fujitsu.cf:3.4 --- xc/config/cf/fujitsu.cf:3.3 Sat May 3 05:14:34 1997 +++ xc/config/cf/fujitsu.cf Wed Jan 17 11:22:31 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: fujitsu.cf /main/9 1997/04/17 14:11:44 barstow $ +XCOMM platform: $Xorg: fujitsu.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName # define OSName DefaultOSName Index: xc/config/cf/generic.cf diff -u xc/config/cf/generic.cf:1.1.1.3 xc/config/cf/generic.cf:1.1.1.4 --- xc/config/cf/generic.cf:1.1.1.3 Sat Dec 21 22:14:50 1996 +++ xc/config/cf/generic.cf Tue Jan 16 16:53:32 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: generic.cf /main/8 1996/09/28 16:10:06 rws $ +XCOMM platform: $Xorg: generic.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName #define OSName Unknown Operating System Index: xc/config/cf/gnu.cf diff -u xc/config/cf/gnu.cf:1.10 xc/config/cf/gnu.cf:1.11 --- xc/config/cf/gnu.cf:1.10 Thu Nov 30 18:29:55 2000 +++ xc/config/cf/gnu.cf Wed Feb 28 13:58:49 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.10 2000/11/30 23:29:55 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/gnu.cf,v 1.11 2001/02/28 18:58:49 dawes Exp $ #ifndef OSName #define OSName DefaultOSName @@ -37,12 +37,11 @@ #define HasLibCrypt YES #endif -#define BuildLibPathVar LD_LIBRARY_PATH -#define HasGcc YES -#define HasGcc2 YES -#ifndef HasGcc2ForCplusplus -# define HasGcc2ForCplusplus YES +#ifndef BuildXF86RushExt +# define BuildXF86RushExt YES #endif + +#define BuildLibPathVar LD_LIBRARY_PATH #define GccUsesGas YES #define UseGas YES #define GnuCpp YES @@ -124,7 +123,7 @@ #define StandardCppDefines StandardDefines #define HasVarRun YES -#define VarDbDirectory $(VARDIR)/state +#define VarDbDirectory $(VARDIR)/lib XCOMM i386Architecture #define OptimizedCDebugFlags DefaultGcc2i386Opt Index: xc/config/cf/hp.cf diff -u xc/config/cf/hp.cf:3.6 xc/config/cf/hp.cf:3.7 --- xc/config/cf/hp.cf:3.6 Sat Nov 22 01:50:04 1997 +++ xc/config/cf/hp.cf Wed Jan 17 11:22:31 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: hp.cf /main/88 1997/11/12 07:16:22 kaleb $ +XCOMM platform: $Xorg: hp.cf,v 1.5 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName # define OSName DefaultOSName @@ -173,7 +173,9 @@ # if ThreadedX # define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXUSE_NETDB_R_API # endif -# define CppCmd /opt/langtools/lbin/cpp +# ifndef CppCmd +# define CppCmd /usr/ccs/lbin/cpp +# endif #endif /* CC does not recognize -Ae, and has a different meaning for +e. */ Index: xc/config/cf/hpLib.rules diff -u xc/config/cf/hpLib.rules:3.3 xc/config/cf/hpLib.rules:3.4 --- xc/config/cf/hpLib.rules:3.3 Mon Jan 11 00:13:06 1999 +++ xc/config/cf/hpLib.rules Wed Jan 17 11:22:31 2001 @@ -1,10 +1,10 @@ -XCOMM $XConsortium: hpLib.rules /main/16 1996/12/04 11:44:35 swick $ +XCOMM $Xorg: hpLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* * HP shared library rules */ -XCOMM $XFree86: xc/config/cf/hpLib.rules,v 3.3 1999/01/11 05:13:06 dawes Exp $ +XCOMM $XFree86: xc/config/cf/hpLib.rules,v 3.4 2001/01/17 16:22:31 dawes Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES Index: xc/config/cf/hpLib.tmpl diff -u xc/config/cf/hpLib.tmpl:1.1.1.2 xc/config/cf/hpLib.tmpl:1.1.1.3 --- xc/config/cf/hpLib.tmpl:1.1.1.2 Sat Dec 21 22:14:53 1996 +++ xc/config/cf/hpLib.tmpl Tue Jan 16 16:53:37 2001 @@ -1,4 +1,4 @@ -XCOMM $XConsortium: hpLib.tmpl /main/10 1996/12/04 11:57:22 swick $ +XCOMM $Xorg: hpLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* * HP shared library template Index: xc/config/cf/ibm.cf diff -u xc/config/cf/ibm.cf:3.7 xc/config/cf/ibm.cf:3.8 --- xc/config/cf/ibm.cf:3.7 Fri Oct 2 02:15:03 1998 +++ xc/config/cf/ibm.cf Wed Jan 17 11:22:31 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $TOG: ibm.cf /main/82 1998/02/26 17:03:51 kaleb $ +XCOMM platform: $Xorg: ibm.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName # define OSName DefaultOSName Index: xc/config/cf/ibmLib.rules diff -u xc/config/cf/ibmLib.rules:3.5 xc/config/cf/ibmLib.rules:3.6 --- xc/config/cf/ibmLib.rules:3.5 Sun Feb 13 01:15:18 2000 +++ xc/config/cf/ibmLib.rules Wed Jan 17 11:22:31 2001 @@ -1,10 +1,10 @@ -XCOMM $XConsortium: ibmLib.rules /main/15 1996/12/30 16:06:05 kaleb $ +XCOMM $Xorg: ibmLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* * AIX shared library rules */ -XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.5 2000/02/13 06:15:18 dawes Exp $ +XCOMM $XFree86: xc/config/cf/ibmLib.rules,v 3.6 2001/01/17 16:22:31 dawes Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES Index: xc/config/cf/ibmLib.tmpl diff -u xc/config/cf/ibmLib.tmpl:1.2 xc/config/cf/ibmLib.tmpl:1.3 --- xc/config/cf/ibmLib.tmpl:1.2 Mon Jan 11 09:40:00 1999 +++ xc/config/cf/ibmLib.tmpl Wed Jan 17 11:22:32 2001 @@ -1,10 +1,10 @@ -XCOMM $XConsortium: ibmLib.tmpl /main/21 1996/12/04 12:21:49 swick $ +XCOMM $Xorg: ibmLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* * AIX shared library template */ -XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.2 1999/01/11 14:40:00 dawes Exp $ +XCOMM $XFree86: xc/config/cf/ibmLib.tmpl,v 1.3 2001/01/17 16:22:32 dawes Exp $ /* * IBM used an unusual shared object file name in some librares. Index: xc/config/cf/isc.cf diff -u xc/config/cf/isc.cf:3.15 xc/config/cf/isc.cf:3.16 --- xc/config/cf/isc.cf:3.15 Sat Jul 10 08:17:09 1999 +++ xc/config/cf/isc.cf Wed Jan 17 11:22:32 2001 @@ -1,8 +1,8 @@ -XCOMM $XConsortium: isc.cf /main/1 1996/10/31 14:45:18 kaleb $ +XCOMM $Xorg: isc.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.15 1999/07/10 12:17:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/isc.cf,v 3.16 2001/01/17 16:22:32 dawes Exp $ #ifndef HasGcc2 #define HasGcc2 YES Index: xc/config/cf/kdrive.cf diff -u xc/config/cf/kdrive.cf:1.8 xc/config/cf/kdrive.cf:1.9 --- xc/config/cf/kdrive.cf:1.8 Fri Dec 8 17:09:39 2000 +++ xc/config/cf/kdrive.cf Tue Apr 10 12:07:47 2001 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.8 2000/12/08 22:09:39 keithp Exp $ +XCOMM $XFree86: xc/config/cf/kdrive.cf,v 1.9 2001/04/10 16:07:47 dawes Exp $ /* * This configuration file contains all of the configuration * information for the XFree86 based X Servers. @@ -208,6 +208,12 @@ #if defined(HasGcc2) && defined(AlphaArchitecture) #ifndef DefaultGcc2AxpOpt #define DefaultGcc2AxpOpt -O2 +#endif +#endif + +#if defined(HasGcc2) && defined(PpcArchitecture) +#ifndef DefaultGcc2PpcOpt +#define DefaultGcc2PpcOpt -O2 #endif #endif Index: xc/config/cf/linux.cf diff -u xc/config/cf/linux.cf:3.157 xc/config/cf/linux.cf:3.165.2.1 --- xc/config/cf/linux.cf:3.157 Thu Dec 14 12:00:46 2000 +++ xc/config/cf/linux.cf Thu May 31 22:24:14 2001 @@ -1,10 +1,10 @@ -XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess +XCOMM platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.157 2000/12/14 17:00:46 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/linux.cf,v 3.165.2.1 2001/06/01 02:24:14 dawes Exp $ #ifndef LinuxElfDefault # define LinuxElfDefault YES @@ -87,74 +87,80 @@ XCOMM binutils: (LinuxBinUtilsMajorVersion) #if LinuxDistribution == LinuxDebian -#ifdef DebianMaintainer -#define XFree86Devel YES -#endif -#define HasTk YES -#define TkLibDir /usr/lib -#define TkIncDir /usr/include -#define TkLibName tk8.3 -#define XF86SetupUsesStaticTk NO -#define HasTcl YES -#define TclLibDir /usr/lib -#define TclIncDir /usr/include -#define TclLibName tcl8.3 -#define XF86SetupUsesStaticTcl NO +# define SystemManDirectory /usr/share/man +# define HasPam YES +# define HasTk YES +# define TkLibDir /usr/lib +# define TkIncDir /usr/include +# define TkLibName tk8.3 +# define XF86SetupUsesStaticTk NO +# define HasTcl YES +# define TclLibDir /usr/lib +# define TclIncDir /usr/include +# define TclLibName tcl8.3 +# define XF86SetupUsesStaticTcl NO /* un-comment this when it is un-broken */ -/* #define JoystickSupport YES */ -#define InstallXinitConfig YES -#define InstallXdmConfig YES -#define InstallFSConfig YES -#ifdef DebianMaintainer -#define HasXdmAuth YES -#endif -#define DebuggableLibraries YES -#define ForceNormalLib YES -#define BuildSpecsDocs YES -#define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm -/* right now glide only works on i386 */ -#ifdef i386Architecture -#ifdef DebianMaintainer -#define HasGlide2 YES -#endif -#define Glide2IncDir /usr/include/glide -#ifdef DebianMaintainer -#define HasGlide3 YES -#endif -#define Glide3IncDir /usr/include/glide3 -#endif -#define XAppLoadDir EtcX11Directory/app-defaults -#define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S) -#ifdef DebianMaintainer +/* # define JoystickSupport YES */ +# define InstallXinitConfig YES +# define InstallXdmConfig YES +# define InstallFSConfig YES +# define DebuggableLibraries YES +# define ForceNormalLib YES +# define BuildSpecsDocs YES +# define SpecsDocDirs CTEXT GL ICCCM X11 Xext Xv i18n xterm +# define XAppLoadDir EtcX11Directory/app-defaults +# define XFileSearchPathDefault Concat4(EtcX11Directory/%L/%T/%N%C,%S:EtcX11Directory/%l/%T/%N%C,%S:EtcX11Directory/%T/%N%C,%S:EtcX11Directory/%L/%T/%N%S:EtcX11Directory/%l/%T/%N%S:EtcX11Directory/%T/%N%S):Concat4($(LIBDIR)/%L/%T/%N%C,%S:$(LIBDIR)/%l/%T/%N%C,%S:$(LIBDIR)/%T/%N%C,%S:$(LIBDIR)/%L/%T/%N%S:$(LIBDIR)/%l/%T/%N%S:$(LIBDIR)/%T/%N%S) /* the relative symlink created by this rule causes problems for us */ -#if InstallAppDefFiles -#define InstallAppDefaultsLong(file,class) @@\ +# if InstallAppDefFiles +# define InstallAppDefaultsLong(file,class) @@\ InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) -#else -#define InstallAppDefaultsLong(file,class) @@\ +# else +# define InstallAppDefaultsLong(file,class) @@\ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) -#endif /* InstallAppDefFiles */ -#endif -#ifdef DebianMaintainer -#define BuilderEMailAddr "submit@bugs.debian.org" -#endif -#define SharedLibXdmGreet YES -#define LinkGLToUsrInclude NO -#define LinkGLToUsrLib NO -#define SharedLibFont NO -#define SharedLibXft NO -#define SharedLibXrender NO -#define HasZlib YES -#define SharedLibGlu YES -#define NormalLibGlu YES -#define BuildRman NO -#define BuildHtmlManPages NO -#define FSUseSyslog YES -#ifndef HasKatmaiSupport -#define HasKatmaiSupport NO -#endif -#endif +# endif /* InstallAppDefFiles */ +# define SharedLibXdmGreet NO +# define LinkGLToUsrInclude NO +# define LinkGLToUsrLib NO +# define SharedLibFont NO +# define HasZlib YES +# define SharedLibGlu YES +# define NormalLibGlu YES +# define BuildRman NO +# define BuildHtmlManPages NO +# define FSUseSyslog YES + +/* + * + * +# define DebianMaintainer "xfree86@packages.debian.org" + * + * + */ +# ifdef DebianMaintainer +# define BuilderEMailAddr "submit@bugs.debian.org" +# define XFree86Devel YES +# define BuildAllSpecsDocs YES +/* we build-depend on libfreetype6-dev (FreeType 2.x) */ +# define BuildFreetype2Library NO +# define HasXdmAuth YES +/* modern LaTeX chokes on ancient sync.tex document */ +/* # define HasLatex YES */ +# define BuilderEMailAddr "submit@bugs.debian.org" +/* right now glide only works on i386 */ +# ifdef i386Architecture +# define HasMMXSupport YES +# define Has3DNowSupport YES +/* 2.4 is not yet the official (or predominant) kernel in unstable */ +# define HasKatmaiSupport NO +# define HasGlide2 YES +# define Glide2IncDir /usr/include/glide +# define HasGlide3 YES +# define Glide3IncDir /usr/include/glide3 +# endif /* i386Architecture */ +# endif /* DebianMaintiner */ +#endif /* LinuxDebian */ + #if LinuxDistribution == LinuxRedHat #define FSUseSyslog YES #endif @@ -217,6 +223,10 @@ # endif #endif +#ifndef InstallXloadSetGID +#define InstallXloadSetGID NO +#endif + /* support mainly for USB support */ #ifndef HasLinuxInput # if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion >= 4) @@ -261,19 +271,31 @@ # elif defined(AlphaArchitecture) # define BuildXF86DRI YES # elif defined(PpcArchitecture) +# define BuildXF86DRI YES +# elif defined(Mc68020Architecture) # define BuildXF86DRI NO +# elif defined(Arm32Architecture) +# define BuildXF86DRI NO # else # define BuildXF86DRI NO # endif #endif +/* + * Build shared libGL and the DRI modules without -fPIC. This improves + * performance. + */ +#if BuildXF86DRI +# define BuildLibGlxWithoutPIC YES +#endif + /* The DRM module requires kernel services that appeared in late 2.1.x kernels and are known to be present in 2.2.x kernels. Unfortunately, the kernel API is a moving target and the module may break with new kernel revisions. So, we'll only build the module for kernels that are known to be supported by the module. */ #ifndef BuildXF86DRM -# if defined(i386Architecture) || defined(ia64Architecture) +# if defined(i386Architecture) || defined(ia64Architecture) || defined(SparcArchitecture) || defined(AlphaArchitecture) # if OSMajorVersion == 2 /* Only tested for Linux 2.2.0 through 2.2.12 */ # if OSMinorVersion == 2 && OSTeenyVersion <= 12 @@ -356,6 +378,13 @@ #endif /* + * libGLU doesn't build correctly on a libc5 system. + */ +#if !defined(BuildGLULibrary) && (LinuxCLibMajorVersion < 6) +# define BuildGLULibrary NO +#endif + +/* * The Rush extension support. */ #ifndef BuildXF86RushExt @@ -397,6 +426,10 @@ #define HasNCurses YES #endif +#ifndef HasGroff +#define HasGroff YES +#endif + #define AvoidNullMakeCommand YES #ifndef DebuggableLibraries #define DebuggableLibraries NO @@ -577,24 +610,30 @@ #endif #ifdef i386Architecture -# define OptimizedCDebugFlags DefaultGcc2i386Opt +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags DefaultGcc2i386Opt +# endif # define LinuxMachineDefines -D__i386__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* i386Architecture */ #ifdef s390Architecture -#define OptimizedCDebugFlags -O2 -#define LinuxMachineDefines -D__s390__ -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -#define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags -O2 +# endif +# define LinuxMachineDefines -D__s390__ +# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* s390Architecture */ #ifdef AlphaArchitecture -# define OptimizedCDebugFlags DefaultGcc2AxpOpt +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags DefaultGcc2AxpOpt +# endif # define LinuxMachineDefines -D__alpha__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 -DJENSEN_SUPPORT # ifdef UseCompaqMathLibrary # define MathLibrary -lcpml -lm # endif @@ -602,21 +641,27 @@ #ifdef Arm32Architecture # define DefaultCCOptions -fsigned-char -# define OptimizedCDebugFlags -O3 -# define LinuxMachineDefines -D__arm__ -U__arm -Uarm +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags -O3 +# endif +# define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET -# define ServerExtraDefines -DGCCUSEGAS XFree86ServerDefines +# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* Arm32Achitecture */ #ifdef ia64Architecture -# define OptimizedCDebugFlags -O2 +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags -O2 +# endif # define LinuxMachineDefines -D__ia64__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 #endif /* ia64Architecture */ #ifdef Mc68020Architecture -# define OptimizedCDebugFlags -O2 +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags -O2 +# endif # define LinuxMachineDefines -D__mc68000__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines @@ -626,14 +671,18 @@ #ifdef PpcArchitecture # define DefaultCCOptions -fsigned-char -# define OptimizedCDebugFlags -O2 +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags DefaultGcc2PpcOpt +# endif # define LinuxMachineDefines -D__powerpc__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines #endif /* PpcArchitecture */ #ifdef SparcArchitecture -# define OptimizedCDebugFlags -O2 +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags -O2 +# endif # define LinuxMachineDefines -D__sparc__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines @@ -646,7 +695,9 @@ #endif #ifdef MipsArchitecture -# define OptimizedCDebugFlags -O2 +# ifndef OptimizedCDebugFlags +# define OptimizedCDebugFlags -O2 +# endif # define LinuxMachineDefines -D__mips__ # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines @@ -721,7 +772,7 @@ #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) -#ifdef S390Architecture +#ifdef s390Architecture # define HasXServer NO #endif Index: xc/config/cf/lnxLib.rules diff -u xc/config/cf/lnxLib.rules:3.38 xc/config/cf/lnxLib.rules:3.40 --- xc/config/cf/lnxLib.rules:3.38 Thu Jun 15 16:49:56 2000 +++ xc/config/cf/lnxLib.rules Thu Feb 15 20:26:08 2001 @@ -1,5 +1,5 @@ -XCOMM $TOG: lnxLib.rules /main/14 1998/03/16 11:15:30 mgreess $ -XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.38 2000/06/15 20:49:56 dawes Exp $ +XCOMM $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/lnxLib.rules,v 3.40 2001/02/16 01:26:08 dawes Exp $ /* * Linux shared library rules (DLL & ELF versions) @@ -200,6 +200,23 @@ $(RM) name #endif /* SharedDepModuleTarget */ + +#ifndef SharedDriModuleTarget +#define SharedDriModuleTarget(name,deps,solist) @@\ +AllTarget(name) @@\ + @@\ +name: deps @@\ + $(RM) $@~ $@.map @@\ + @(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map) @@\ + $(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) BaseShLibReqs @@\ + $(RM) $@ $@.map @@\ + $(MV) $@~ $@ @@\ + @@\ +clean:: @@\ + $(RM) name @@\ + $(RM) name.map + +#endif /* SharedDriModuleTarget */ /* * SharedLibraryDataTarget - generate rules to create shlib data file; Index: xc/config/cf/lnxLib.tmpl diff -u xc/config/cf/lnxLib.tmpl:3.12 xc/config/cf/lnxLib.tmpl:3.13 --- xc/config/cf/lnxLib.tmpl:3.12 Sun Jun 27 10:07:17 1999 +++ xc/config/cf/lnxLib.tmpl Wed Jan 17 11:22:32 2001 @@ -1,5 +1,5 @@ -XCOMM $TOG: lnxLib.tmpl /main/7 1998/03/20 14:26:41 mgreess $ -XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.12 1999/06/27 14:07:17 dawes Exp $ +XCOMM $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/lnxLib.tmpl,v 3.13 2001/01/17 16:22:32 dawes Exp $ /* * Linux shared library template Index: xc/config/cf/luna.cf diff -u xc/config/cf/luna.cf:1.1.1.4 xc/config/cf/luna.cf:1.1.1.5 --- xc/config/cf/luna.cf:1.1.1.4 Sat Dec 21 22:15:00 1996 +++ xc/config/cf/luna.cf Tue Jan 16 16:53:51 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: luna.cf /main/35 1996/09/28 16:11:11 rws $ +XCOMM platform: $Xorg: luna.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ /* * Please set the values for OSMajorVerion and OSMinorVersion * before making makefiles. Index: xc/config/cf/lynx.cf diff -u xc/config/cf/lynx.cf:3.40 xc/config/cf/lynx.cf:3.43 --- xc/config/cf/lynx.cf:3.40 Thu Dec 14 12:13:05 2000 +++ xc/config/cf/lynx.cf Thu Apr 19 15:54:43 2001 @@ -1,6 +1,11 @@ -XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.40 2000/12/14 17:13:05 dawes Exp $ +XCOMM $Xorg: lynx.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + + +XCOMM platform: $XFree86: xc/config/cf/lynx.cf,v 3.43 2001/04/19 19:54:43 dawes Exp $ + + #ifndef OSName #define OSName DefaultOSName #endif @@ -276,6 +281,8 @@ # define FileManDir $(MANSOURCEPATH)5 #endif +#define HasGroff YES + /* groff 1.09 compiles right out of the box with LynxOS 2.3, * so if you want to have manual pages you should install groff 1.09 * before you run 'make install.man' @@ -283,17 +290,19 @@ #ifndef InstallManPageLong #define InstallManPageLong(file,destdir,dest) @@\ BuildInstallHtmlManPage(file,dest,$(MANSUFFIX)) @@\ + @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ @@\ -install.man:: file.man @@\ +install.man:: file.$(MANNEWSUFFIX) @@\ MakeDir($(DESTDIR)destdir) @@\ $(RM) $(DESTDIR)destdir/dest.$(MANSUFFIX)* @@\ - groff -e -t -man -Tascii file.man >/tmp/file.man @@\ + groff -e -t -man -Tascii file.$(MANNEWSUFFIX) >/tmp/file.man @@\ $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.$(MANSUFFIX) @@\ echo dest dest $(MANSUFFIX) >> $(DESTDIR)destdir/LIST$(MANSUFFIX) @@\ gawk ' \ @@\ /^\.SH[ ]*NAME/ { \ @@\ getline; sub("\\\\", "(" p ") "); print; exit \ @@\ - }' p=$(MANSUFFIX) file.man >> $(DESTDIR)destdir/../whatis @@\ + }' p=$(MANSUFFIX) file.$(MANNEWSUFFIX) >> $(DESTDIR)destdir/../whatis @@\ $(RM) /tmp/file.man #endif @@ -301,6 +310,8 @@ #define InstallManPageAliases(file,destdir,aliases) @@\ InstallHtmlManPageAliases(file,aliases,$(MANSUFFIX)) @@\ @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ install.man:: @@\ @(SUFFIX=`echo $(DESTDIR)destdir/file.* | cut -f2,3 -d.`; \ @@\ for i in aliases; do (set -x; \ @@\ @@ -314,17 +325,19 @@ #ifndef InstallGenManPageLong #define InstallGenManPageLong(file,destdir,dest,suffix) @@\ BuildInstallHtmlManPage(file,dest,suffix) @@\ + @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ @@\ -install.man:: file.man @@\ +install.man:: file.$(MANNEWSUFFIX) @@\ MakeDir($(DESTDIR)destdir) @@\ $(RM) $(DESTDIR)destdir/dest.suffix* @@\ - groff -e -t -man -Tascii file.man >/tmp/file.man @@\ + groff -e -t -man -Tascii file.$(MANNEWSUFFIX) >/tmp/file.man @@\ $(INSTALL) -c $(INSTMANFLAGS) /tmp/file.man $(DESTDIR)destdir/dest.suffix @@\ echo dest dest suffix >> $(DESTDIR)destdir/Concat(LIST,suffix) @@\ gawk ' \ @@\ /^\.SH[ ]*NAME/ { \ @@\ getline; sub("\\\\", "(" p ") "); print; exit \ @@\ - }' p=suffix file.man >> $(DESTDIR)destdir/../whatis @@\ + }' p=suffix file.$(MANNEWSUFFIX) >> $(DESTDIR)destdir/../whatis @@\ $(RM) /tmp/file.man #endif Index: xc/config/cf/macII.cf diff -u xc/config/cf/macII.cf:1.1.1.5 xc/config/cf/macII.cf:1.1.1.6 --- xc/config/cf/macII.cf:1.1.1.5 Sat Dec 21 22:15:01 1996 +++ xc/config/cf/macII.cf Tue Jan 16 16:53:58 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: macII.cf /main/50 1996/09/28 16:11:19 rws $ +XCOMM platform: $Xorg: macII.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifndef OSName #define OSName A/UX 3.0.1 Index: xc/config/cf/mach.cf diff -u xc/config/cf/mach.cf:3.11 xc/config/cf/mach.cf:3.13 --- xc/config/cf/mach.cf:3.11 Fri Jul 7 16:06:56 2000 +++ xc/config/cf/mach.cf Thu Apr 19 15:54:43 2001 @@ -1,8 +1,8 @@ -XCOMM $TOG: mach.cf /main/2 1997/06/08 20:08:20 kaleb $ +XCOMM $Xorg: mach.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.11 2000/07/07 20:06:56 tsi Exp $ +XCOMM platform: $XFree86: xc/config/cf/mach.cf,v 3.13 2001/04/19 19:54:43 dawes Exp $ #define OSName Mach 2.5/3.0 #define OSVendor /**/ @@ -61,7 +61,7 @@ # define PreIncDir /usr/include #endif -#define TroffCmd groff -Tps +#define HasGroff YES #ifndef ExtraFilesToClean # define ExtraFilesToClean *.core Index: xc/config/cf/minix.cf diff -u xc/config/cf/minix.cf:3.5 xc/config/cf/minix.cf:3.6 --- xc/config/cf/minix.cf:3.5 Sat Jul 10 03:24:33 1999 +++ xc/config/cf/minix.cf Wed Jan 17 11:22:32 2001 @@ -1,8 +1,8 @@ -XCOMM $XConsortium: minix.cf /main/1 1996/10/31 14:47:22 kaleb $ +XCOMM $Xorg: minix.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/minix.cf,v 3.5 1999/07/10 07:24:33 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/minix.cf,v 3.6 2001/01/17 16:22:32 dawes Exp $ /* Index: xc/config/cf/moto.cf diff -u xc/config/cf/moto.cf:1.1.1.3 xc/config/cf/moto.cf:1.1.1.4 --- xc/config/cf/moto.cf:1.1.1.3 Sat Dec 21 22:15:02 1996 +++ xc/config/cf/moto.cf Tue Jan 16 16:54:04 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: moto.cf /main/16 1996/09/28 16:11:24 rws $ +XCOMM platform: $Xorg: moto.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #if defined(MotoR3Architecture) Index: xc/config/cf/ncr.cf diff -u xc/config/cf/ncr.cf:3.18 xc/config/cf/ncr.cf:3.21 --- xc/config/cf/ncr.cf:3.18 Fri Dec 27 01:50:22 1996 +++ xc/config/cf/ncr.cf Tue Jan 23 18:31:49 2001 @@ -1,6 +1,10 @@ -XCOMM platform: $XConsortium: ncr.cf /main/28 1996/09/28 16:11:31 rws $ -XCOMM platform: $XFree86: xc/config/cf/ncr.cf,v 3.18 1996/12/27 06:50:22 dawes Exp $ +XCOMM platform: $Xorg: ncr.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ + + + +XCOMM platform: $XFree86: xc/config/cf/ncr.cf,v 3.21 2001/01/23 23:31:49 dawes Exp $ + #ifndef OSName #define OSName Unix System V Release 4/MP-RAS #endif @@ -20,7 +24,9 @@ XCOMM SVR4/MP-RAS 2.X, you must add -DWINTCP to StandardDefines XCOMM #define StandardDefines -DSVR4 -DNCR -Di386 +#ifndef DefaultCCOptions #define DefaultCCOptions -Xa -Hnocopyr -W0,-asm +#endif #define DefaultCDebugFlags -O3 #define AllocateLocalDefines -DINCLUDE_ALLOCA_H #define ServerExtraDefines -DNO_SECONDARY AllocateLocalDefines XFree86ServerDefines @@ -70,19 +76,19 @@ * imake rules. */ #define InstallManPageLong(file,destdir,dest) @@\ +CppManTarget(file, $(EXTRAMANDEFS)) @@\ + @@\ all:: file.z @@\ @@\ -file.z:: file.man @@\ - @if [ -f file.man ]; \ @@\ +file.z:: file.$(MANNEWSUFFIX) @@\ + @if [ -f file.$(MANNEWSUFFIX) ]; \ @@\ then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ + cat file.$(MANNEWSUFFIX) | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ $(RM) /tmp/$$$$.man.z; \ @@\ pack -f /tmp/$$$$.man; \ @@\ cp /tmp/$$$$.man.z file.z; \ @@\ $(RM) /tmp/$$$$.man.z; \ @@\ fi @@\ - @@\ -file.man:: @@\ @@\ install.man:: @@\ MakeDir($(DESTDIR)destdir) @@\ Index: xc/config/cf/nec.cf diff -u xc/config/cf/nec.cf:1.1.1.3 xc/config/cf/nec.cf:1.1.1.4 --- xc/config/cf/nec.cf:1.1.1.3 Sat Dec 21 22:15:04 1996 +++ xc/config/cf/nec.cf Tue Jan 16 16:54:06 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: nec.cf /main/4 1996/09/28 16:11:37 rws $ +XCOMM platform: $Xorg: nec.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ #ifdef nec_ews_svr2 # define NecCISCArchitecture Index: xc/config/cf/necLib.rules diff -u xc/config/cf/necLib.rules:1.2 xc/config/cf/necLib.rules:1.3 --- xc/config/cf/necLib.rules:1.2 Mon Jan 11 00:13:07 1999 +++ xc/config/cf/necLib.rules Wed Jan 17 11:22:32 2001 @@ -1,10 +1,10 @@ -XCOMM $XConsortium: necLib.rules /main/4 1996/09/28 16:11:42 rws $ +XCOMM $Xorg: necLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * NECOS shared library rules */ -XCOMM $XFree86: xc/config/cf/necLib.rules,v 1.2 1999/01/11 05:13:07 dawes Exp $ +XCOMM $XFree86: xc/config/cf/necLib.rules,v 1.3 2001/01/17 16:22:32 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES Index: xc/config/cf/necLib.tmpl diff -u xc/config/cf/necLib.tmpl:1.1.1.1 xc/config/cf/necLib.tmpl:1.1.1.2 --- xc/config/cf/necLib.tmpl:1.1.1.1 Wed Apr 27 03:07:28 1994 +++ xc/config/cf/necLib.tmpl Tue Jan 16 16:54:08 2001 @@ -1,4 +1,4 @@ -XCOMM $XConsortium: necLib.tmpl,v 1.1 94/03/26 18:15:22 rws Exp $ +XCOMM $Xorg: necLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * NEC shared library template Index: xc/config/cf/oldlib.rules diff -u xc/config/cf/oldlib.rules:1.1.1.1 xc/config/cf/oldlib.rules:1.1.1.2 --- xc/config/cf/oldlib.rules:1.1.1.1 Wed Apr 27 03:07:23 1994 +++ xc/config/cf/oldlib.rules Tue Jan 16 16:54:10 2001 @@ -1,6 +1,6 @@ /* You should not use these any more, use new Library.tmpl insead */ -XCOMM $XConsortium: oldlib.rules,v 1.2 91/04/09 19:15:13 rws Exp $ +XCOMM $Xorg: oldlib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * ProfiledLibraryObjectRule - generate make rules to build both profiled Index: xc/config/cf/os2.cf diff -u xc/config/cf/os2.cf:3.31 xc/config/cf/os2.cf:3.34 --- xc/config/cf/os2.cf:3.31 Thu Nov 30 18:29:57 2000 +++ xc/config/cf/os2.cf Thu Apr 19 15:54:43 2001 @@ -1,8 +1,8 @@ -XCOMM $TOG: os2.cf /main/2 1997/08/05 08:51:25 kaleb $ +XCOMM $Xorg: os2.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.31 2000/11/30 23:29:57 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.cf,v 3.34 2001/04/19 19:54:43 dawes Exp $ #define OSName OS/2 #define OSVendor IBM @@ -62,7 +62,7 @@ #define NeqnCmd eqn #define NroffCmd groff -Tascii #define EqnCmd eqn -Tascii -#define TroffCmd groff -Tps +#define HasGroff YES NEQN = NeqnCmd NROFF = NroffCmd @@ -234,11 +234,6 @@ #ifndef ExtraFilesToClean # define ExtraFilesToClean *.~* *.exe *.dll *.obj *.lib *.map -#endif - -#if CompressManPages -#define CompressManCmd gzip -n - COMPRESSMANCMD = CompressManCmd #endif #define ProgramTargetName(target)target.exe Index: xc/config/cf/os2.rules diff -u xc/config/cf/os2.rules:3.21 xc/config/cf/os2.rules:3.22 --- xc/config/cf/os2.rules:3.21 Wed Apr 5 14:13:09 2000 +++ xc/config/cf/os2.rules Wed Jan 17 11:22:32 2001 @@ -1,8 +1,8 @@ -XCOMM $XConsortium: os2.rules /main/1 1996/10/31 14:47:27 kaleb $ +XCOMM $Xorg: os2.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.21 2000/04/05 18:13:09 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/os2.rules,v 3.22 2001/01/17 16:22:32 dawes Exp $ .SUFFIXES: .Osuf .c .CCsuf Index: xc/config/cf/os2Lib.rules diff -u xc/config/cf/os2Lib.rules:3.11 xc/config/cf/os2Lib.rules:3.12 --- xc/config/cf/os2Lib.rules:3.11 Wed Apr 5 14:13:09 2000 +++ xc/config/cf/os2Lib.rules Wed Jan 17 11:22:32 2001 @@ -1,8 +1,8 @@ -XCOMM $XConsortium: os2Lib.rules /main/1 1996/10/31 14:47:29 kaleb $ +XCOMM $Xorg: os2Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.11 2000/04/05 18:13:09 dawes Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.rules,v 3.12 2001/01/17 16:22:32 dawes Exp $ /* * OS2/EMX shared library rules (DLL version) Index: xc/config/cf/os2Lib.tmpl diff -u xc/config/cf/os2Lib.tmpl:3.10 xc/config/cf/os2Lib.tmpl:3.11 --- xc/config/cf/os2Lib.tmpl:3.10 Tue Aug 8 22:57:20 2000 +++ xc/config/cf/os2Lib.tmpl Wed Jan 17 11:22:32 2001 @@ -1,8 +1,8 @@ -XCOMM $XConsortium: os2Lib.tmpl /main/1 1996/10/31 14:47:31 kaleb $ +XCOMM $Xorg: os2Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.10 2000/08/09 02:57:20 tsi Exp $ +XCOMM $XFree86: xc/config/cf/os2Lib.tmpl,v 3.11 2001/01/17 16:22:32 dawes Exp $ /* * OS2/EMX shared library template Index: xc/config/cf/osf1.cf diff -u xc/config/cf/osf1.cf:3.6 xc/config/cf/osf1.cf:3.9 --- xc/config/cf/osf1.cf:3.6 Wed Jun 11 08:24:18 1997 +++ xc/config/cf/osf1.cf Thu Mar 1 21:45:33 2001 @@ -1,6 +1,10 @@ -XCOMM platform: $TOG: osf1.cf /main/74 1997/05/27 15:51:24 kaleb $ +XCOMM platform: $Xorg: osf1.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* only tested with Digital OSF/1 */ + + +XCOMM platform: $XFree86: xc/config/cf/osf1.cf,v 3.9 2001/03/02 02:45:33 dawes Exp $ + #ifndef OSName # define OSName DefaultOSName #endif @@ -35,6 +39,9 @@ #define ShLibDir /usr/shlib #define SharedLibPex NO /* losing, no shared -lm */ #endif + +#define InstallXloadSetGID NO + #define ThreadedX ModernOSF1 #if ThreadedX Index: xc/config/cf/osfLib.rules diff -u xc/config/cf/osfLib.rules:1.2 xc/config/cf/osfLib.rules:1.3 --- xc/config/cf/osfLib.rules:1.2 Mon Jan 11 00:13:08 1999 +++ xc/config/cf/osfLib.rules Wed Jan 17 11:22:32 2001 @@ -1,10 +1,10 @@ -XCOMM $XConsortium: osfLib.rules /main/16 1996/09/28 16:11:55 rws $ +XCOMM $Xorg: osfLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * OSF/1 shared library rules */ -XCOMM $XFree86: xc/config/cf/osfLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $ +XCOMM $XFree86: xc/config/cf/osfLib.rules,v 1.3 2001/01/17 16:22:32 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES Index: xc/config/cf/osfLib.tmpl diff -u xc/config/cf/osfLib.tmpl:1.2 xc/config/cf/osfLib.tmpl:1.3 --- xc/config/cf/osfLib.tmpl:1.2 Mon Jan 11 09:40:01 1999 +++ xc/config/cf/osfLib.tmpl Wed Jan 17 11:22:33 2001 @@ -1,10 +1,10 @@ -XCOMM $XConsortium: osfLib.tmpl /main/22 1996/09/28 16:12:00 rws $ +XCOMM $Xorg: osfLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * OSF/1 shared library template */ -XCOMM $XFree86: xc/config/cf/osfLib.tmpl,v 1.2 1999/01/11 14:40:01 dawes Exp $ +XCOMM $XFree86: xc/config/cf/osfLib.tmpl,v 1.3 2001/01/17 16:22:33 dawes Exp $ #if ThreadedX && ModernOSF1 #if OSMajorVersion < 4 Index: xc/config/cf/pegasus.cf diff -u xc/config/cf/pegasus.cf:1.1.1.3 xc/config/cf/pegasus.cf:1.1.1.4 --- xc/config/cf/pegasus.cf:1.1.1.3 Sat Dec 21 22:15:10 1996 +++ xc/config/cf/pegasus.cf Tue Jan 16 16:54:19 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: pegasus.cf /main/38 1996/09/28 16:12:05 rws $ +XCOMM platform: $Xorg: pegasus.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ #ifndef OSName #define OSName UTek 4.0 Index: xc/config/cf/sco.cf diff -u xc/config/cf/sco.cf:3.13 xc/config/cf/sco.cf:3.14 --- xc/config/cf/sco.cf:3.13 Sat May 24 09:46:28 1997 +++ xc/config/cf/sco.cf Wed Jan 17 11:22:33 2001 @@ -1,5 +1,5 @@ -XCOMM platform: $XConsortium: sco.cf /main/5 1996/12/04 10:12:36 swick $ -XCOMM platform: $XFree86: xc/config/cf/sco.cf,v 3.13 1997/05/24 13:46:28 dawes Exp $ +XCOMM platform: $Xorg: sco.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM platform: $XFree86: xc/config/cf/sco.cf,v 3.14 2001/01/17 16:22:33 dawes Exp $ /* * This is sco.cf, for SCO Open Server 5.0.2 and SCO UNIX. Index: xc/config/cf/scoLib.rules diff -u xc/config/cf/scoLib.rules:1.5 xc/config/cf/scoLib.rules:1.6 --- xc/config/cf/scoLib.rules:1.5 Wed Oct 13 00:20:42 1999 +++ xc/config/cf/scoLib.rules Wed Jan 17 11:22:33 2001 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: scoLib.rules /main/2 1996/09/28 16:12:20 rws $ -XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.5 1999/10/13 04:20:42 dawes Exp $ +XCOMM $Xorg: scoLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/scoLib.rules,v 1.6 2001/01/17 16:22:33 dawes Exp $ /* * SharedLibraryTarget3 - generate rules to create a shared library; Index: xc/config/cf/sequent.cf diff -u xc/config/cf/sequent.cf:1.1.1.3 xc/config/cf/sequent.cf:1.1.1.4 --- xc/config/cf/sequent.cf:1.1.1.3 Sat Dec 21 22:15:11 1996 +++ xc/config/cf/sequent.cf Tue Jan 16 16:54:21 2001 @@ -1,84 +1,448 @@ -XCOMM platform: $XConsortium: sequent.cf /main/4 1996/12/04 10:10:49 swick $ +XCOMM platform: $XConsortium: sequent.cf$ + /* * SET VERSION NUMBERS BEFORE MAKING MAKEFILES; also, you'll need to install * util/scripts/bsdinstall.sh before doing a "make install" */ + +/* + * Version numbers are set one of two ways: + * + * If the target version is different than the machine you are building on, + * set the target versions using the environmental variable IMAKEINCLUDES. + * Example: IMAKEINCLUDES="-I. -DOSMajorVersion=4 -DOSMinorVersion=4" + * This is usually only done at Sequent when building a product using + * cross compiling tools and target headers and libraries. + * + * Otherwise, the imake will use uname(2) to calculate the default to be + * the same as the machine you are building on. The X11R6 imake will set + * DefaultOS*Version macros to be these default values. + * Those default values will be used in the assignments below. + * This is the recommended method to be used by customers. + */ + + /* defaults from imake via uname(2) */ +#ifndef OSName +#define OSName DefaultOSName +#endif +#ifndef OSMajorVersion +#define OSMajorVersion DefaultOSMajorVersion +#endif +#ifndef OSMinorVersion +#define OSMinorVersion DefaultOSMinorVersion +#endif +#ifndef OSTeenyVersion +#define OSTeenyVersion DefaultOSTeenyVersion +#endif +XCOMM operating system: OSName V/**/OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion + +/* + * Sequent Dynix/PTX 4.x.x (SVR4) and later operating systems. + * + * Sequent Dynix/PTX 4.2.3 and later operating systems are supported with + * the X11R6 sequent.cf and other X11R6 configuration files. + * Specifically 4.4.2 and later have been tested. + * + * Attempting to use these X11R6 configuration files and X11R6 source files + * with early versions of Dynix/PTX 4.x.x may work, however that will not be + * tested or supported at Sequent. + * Sequent Dynix/PTX 2.1.x has been retired so support for it and earlier + * releases has been removed. + */ + +#if OSMajorVersion >= 4 + +#define SystemV4 YES +#define SequentVersionDefines -DSVR4 +#define ExtraLibraries +#define ForceNormalLib YES +#define HasRequiredLibs YES +#define NeedBerklib NO /* gettimeofday in libc */ + +#define XmExtraLibraries /* for ABI-compliance do not use -lgen here */ +#define MotifDefines -DXM_STRINGS_1_2_2_STATE /* code review */ + +/* initial port does not use multiple socket libs, default libsocket.so.1.1 */ +#define HasMultipleSockets NO /* obsolete */ /* only libsocket.so.1.1 */ + +#endif /* OSMajorVersion >= 4 */ + +/* + * Below this line are generic defines that apply to all Sequent systems. + * However they are currently tested with only OSMajorVersion >= 4 + */ + +/* + * The following cpp macro defines are order independent, + * since the right-hand-side is constant. + * Therefore these are simply listed in alphabetical order. + * Macros defined later may use these definitions. + */ + +/* + * Threads.tmpl cpp macros. + * Sequent overrides the Threads.tmpl defaults with the values below. + * Sequent has native threads for ptx 4.5.0 and higher. + */ + +#if ( OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 5) ) + +#define HasPosixThreads YES +#define HasThreadSafeAPI YES +#define ThreadedX YES +#define ThreadsLibraries /**/ +#define ThreadsCplusplusLibraries /**/ +#define ThreadPreStdAPIDefines /**/ +#define ThreadsCompileFlags -Kthread +#define ThreadsCplusplusCompileFlags -Kthread +#define SharedThreadReqs /**/ + +/* + * THREADS macro and environment variable used with Sequent commands only. + * We use THREADS rather than the generic X11 THREADS_CFLAGS because we + * want to ensure that the macro is defined for all compiles and not just + * those Makefiles built from a Imakefile that includes Threads.tmpl. + * + * Sequent compiler option -Kthread will also define -D_SEQUENT_THREADS. + * Currently using -Kthread is the recommended interface to this define. + * Currently there are no extra includes files using -D_SEQUENT_THREADS. + * Currently no reason for makedepend or cpp to use -D_SEQUENT_THREADS. + * If needed in the future, we would add to ProjectThreadsDefines + * + * #define ProjectThreadsDefines -DXTHREADS -D_SEQUENT_THREADS + */ -#if defined(DynixPtxArchitecture) || defined(_SEQUENT_) + THREADS = -Kthread -# ifndef OSName -# define OSName Dynix/ptx -# endif -# ifndef OSMajorVersion -# define OSMajorVersion 2 -# endif -# ifndef OSMinorVersion -# define OSMinorVersion 0 -# endif - -# define SystemV YES -# define SymbolTableFlags -# define DefaultCCOptions SymbolTableFlags -# define SharedLibraryCCOptions DefaultCCOptions -# define StandardDefines -DSYSV -# define MotifDefines -DSTRINGS_ALIGNED -DNO_REGCOMP -# define ExtraLibraries $(XBSDLIB) -lsocket -linet -lnsl -lseq -# define XmExtraLibraries /* -lgen (not official i386 ABI?) */ - -# define NeedBerklib YES -# define HasShadowPasswd YES -# define InstallXdmConfig YES -# define HasSockets YES - -/* - * Plan to remove Prototypes defines and use -Xc with - * Dynix/ptx: - * OSMajorVersion=4 - * OSMinorVersion=0 - * Using -Xc with Version 4.0 will elliminate most warnings - */ -# define NeedFunctionPrototypes YES -# define NeedNestedPrototypes YES -# define NeedConstPrototypes YES -# define NeedVarargsPrototypes YES - - -/* - * unfortunately pbmplus uses this... - */ -RANLIB = : - -#endif /* defined(DynixPtxArchitecture) || defined(_SEQUENT_) */ - -#if defined(Dynix3Architecture) || defined(sequent) - -# ifndef OSName -# define OSName Dynix 3 -# endif -# ifndef OSMajorVersion -# define OSMajorVersion 3 -# endif -# ifndef OSMinorVersion -# define OSMinorVersion 2 -# endif - -# define SymbolTableFlags -W0,-Nn7500 -W0,-Nd10000 -# define DefaultCCOptions SymbolTableFlags -# define StandardDefines -DX_NOT_STDC_ENV -DX_NOT_POSIX -# define ExtraLibraries -lseq - -# define HasVoidSignalReturn NO -# define HasBsearch NO +#endif /* ptx 4.5.0 or greater has threads */ -# define SetTtyGroup YES +/* + * Imake.tmpl cpp macros. + * Sequent overrides the Imake.tmpl defaults with the values below. + */ -#endif /* defined(Dynix3Architecture) || defined(sequent) */ +#define BuildLibPathVar LD_LIBRARY_PATH +#define DefaultCCOptions -Xa +#define ExpandManNames YES +#define ExtraFilesToClean *.z +#define HasNdbm YES +#define HasShadowPasswd YES +#define HasSockets YES /* default */ +#define HasVarDirectory NO +#ifdef UseInstalled +#define InstallCmd $(BINDIR)/ptxinst -t "$(TOOLS)" +#else +#define InstallCmd $(SHELL) $(SCRIPTSRC)/ptxinst.sh +#endif /* UseInstalled */ +#define InstPgmFlags -s -m 0555 -o bin -g bin +#define InstBinFlags -s -m 0555 -o bin -g bin +#define InstLibFlags -m 0444 -o bin -g bin +#define InstShLibFlags -m 0555 -o bin -g bin +#define Malloc0ReturnsNull YES +#define ManSuffix 1 /* use just one tab or cpp will die */ +#define LibManSuffix 3x /* use just one tab or cpp will die */ +#define LibmanDir $(MANSOURCEPATH)3 +#define MiscManSuffix 5x /* use just one tab or cpp will die */ +#define MiscManDir $(MANSOURCEPATH)5 +#define MkdirHierCmd mkdir -p +#define NeedConstPrototypes YES +#define NeedFunctionPrototypes YES +#define NeedNestedPrototypes YES +#define NeedVarargsPrototypes YES +#define StripInstalledPrograms YES +#define SystemManDirectory /usr/catman +#define TermcapLibrary -lcurses /* code review for SVR4 ? */ +#define TerminfoDir /usr/lib/terminfo /* Sequent addition */ +#define ToolkitStringsABIOptions -intelabi + + +/* + * X11.tmpl cpp macros. + * Sequent overrides the X11.tmpl defaults with the values below. + */ -#define BuildServer NO -#define BuildXInputLib NO +#define BuildDps YES #define BuildPexClients NO +#define BuildPexExt YES /* needed for contrib xscope */ +#define BuildServer YES +#define BuildXF86DGA NO /* DGA has no meaning on Sequent HW */ +#define BuildXF86MiscExt NO /* turn off the server portion */ +#define BuildXF86VidModeExt NO /* turn off the server portion */ +#define BuildXInputExt YES +#define BuildXKBuilib YES /* override NO set in xfree86.cf */ +#define ConnectionFlags -DTCPCONN +#define DefaultSystemPath /bin:/etc:/usr/bin:$(BINDIR) +#define DefaultUserPath :/bin:/usr/bin:$(BINDIR) +#define HasPlugin YES +#define HasXServer NO +#define InstallFSConfig YES /* safe since we install to DESTDIR */ +#define InstallXdmConfig YES /* safe since we install to DESTDIR */ +#define MotifBC NO /* default, code review from X11R5 */ +#define XdmServersType fs /* One tab here. Needed if BuildServer YES */ +#define XtMalloc0ReturnsNullDefines Malloc0ReturnsNullDefines -DXTMALLOC_BC +#define XprtServer YES +#define XVirtualFramebufferServer YES +#define XF86SVGAServer NO /* Don't build the XFree86 servers */ +#define XF86S3Server NO +#define XF86S3VServer NO +#define XF86I8514Server NO +#define XF86Mach8Server NO +#define XF86Mach32Server NO +#define XF86Mach64Server NO +#define XF86P9000Server NO +#define XF86AGXServer NO +#define XF86I128Server NO +#define XF86GLINTServer NO +#define XF86REALimageServer NO + +/* + * Motif.tmpl cpp macros. + * Sequent overrides the Motif.tmpl default with the values below. + */ + +#define GencatCmd /usr/lbin/gencat + +/* Port Sequent macro DontBuildMotifConfig to Motif 2.1 */ +/* + * #ifndef MetroLink + * #define DontBuildMotifConfig + * #endif + */ + +/* + * Sequent added cpp macros. + * + * The following cpp macro defines have been introduced by Sequent. + * They will be referenced in Sequent patches sent to TOG. + * They may be moved above if accepted by TOG or X.org. + */ + +#define AdminBaseDir /usr/admin.ptx/etc/base.dir +#define MessageCatDir /usr/lib/message/C +#define NeedXinputAlias YES +#define UseHidesymsLists YES +#define XlbiffMailPath /usr/mail/%s /* used by contrib xlbiff */ + +/* + * Imake.tmpl, X11.tmpl, or other order dependent cpp defines. + * + * The following cpp macro defines are order dependent. + * They depend on previously defined cpp macros. + * Do not change the order. + */ +#define SharedLibraryCCOptions DefaultCCOptions +#define StandardDefines SequentVersionDefines -DOSMAJORVERSION=OSMajorVersion -DOSMINORVERSION=OSMinorVersion -DANSICPP -DDYNIX_C2 -DMetroLink +#define StandardCppDefines StandardDefines -D_SOCKET_VERSION=11 -DUnixCpp + +#ifdef ProjectRoot +#define ManDirectoryRoot ProjectRoot/**//catman +#else +#define ManDirectoryRoot SystemManDirectory +#endif +#define XmanSearchPath ManDirectoryRoot /* for X11R5 xman */ + +/* + * Sequent configuration environment specific to building X11 and Motif. + * This environment is only available when UseInstalled is not defined. + * Therefore this environment is not used by customers using xmkmf. + */ + +#ifndef UseInstalled + +/* Product builds using local X11 and Motif trees */ + +/* + * Provide libraries needed by nonX programs in the X11 build tree. + * These are not standard so the customer will be forced to add them to their + * Imakefile SYS_LIBRARIES if needed. An ABI program may not want or need them, + * so we do not include them in the ExtraLibraries provided to customers + * when UseInstalled is defined. We add them here as a convenience when + * building the entire X11 tree (at Sequent or the contractor). + */ +#undef ExtraLibraries +#define ExtraLibraries -lsocket -lnsl + +/* + * Sequent builds X11 and Motif in the same tree. + * The Motif project files include the X11 project files. + * + * Later we may use the Local project files similer the the lynx.cf + * + * #define LocalTmplFile + * #define LocalRulesFile + */ + +/* Try the Metro Link method. */ + +#ifndef MetroLink +#undef ProjectTmplFile +#define ProjectTmplFile +#undef ProjectRulesFile +#define ProjectRulesFile +#endif + +/* + * Later change to Metro Link directory layout, + * or allow $(TOP)/../motif21 + */ + +/* Try the Metro Link method. */ + +#ifndef MetroLink +#define MTop $(TOP)/motif21 +#endif + +/* + * Set the Program macros to be correct for the target machine. + * This will avoid using any crosstools as hardwired strings + * built into binaries that will run on the target machine. + * + * These macro names need to be ported from X11R5 to X11R6. + */ +#define ArProgramBase ar +#define CppProgram /lib/cpp +#define CcProgram cc +#define RanlibProgram ranlib + +/* + * Build all the X11 debug libaries *_d.a for use by Sequent Service + */ + +/* + * Set DebugLibDefault YES for Sequent to build all debug libs. + * If we move this to generic code to *.tmpl files, + * use the default code below that sets the default NO + */ + +#define DebugLibDefault NO + +#ifndef DebugLibDefault +#define DebugLibDefault NO +#endif + +#define DebugLibX11 DebugLibDefault /* debugged X library */ +#define DebugLibXext DebugLibDefault /* debugged Xext library */ +#define DebugLibXau DebugLibDefault /* debugged auth library */ +#define DebugLibXdmcp DebugLibDefault /* debugged XDMCP library */ +#define DebugLibXmu DebugLibDefault /* debugged Xmu library */ +#define DebugLibXp DebugLibDefault /* debugged Xp library */ +#define DebugLibXt DebugLibDefault /* debugged toolkit library */ +#define DebugLibXa DebugLibDefault /* debugged audio library */ +#define DebugLibXaw DebugLibDefault /* debugged widget library */ +#define DebugLibXi DebugLibDefault /* debugged Xi library */ +#define DebugLibXtst DebugLibDefault /* debugged Xtst library */ +#define DebugLibPex DebugLibDefault /* debugged PEX5 library */ +#define DebugLibXie DebugLibDefault /* debugged XIE library */ +#define DebugLibICE DebugLibDefault /* debugged ICE library */ +#define DebugLibSM DebugLibDefault /* debugged SM library */ +#define DebugLibXkey DebugLibDefault /* debugged Xkey library */ +#define DebugLibFS DebugLibDefault /* debugged FS library */ + +/* + * Build all the Motif debug libaries *_d.a for use by Service + */ +#define DebugLibXm DebugLibDefault +#define DebugLibMrm DebugLibDefault +#define DebugLibUil DebugLibDefault + +/* + * Build all the Adobe DPS debug libaries *_d.a for use by Service + */ +#define DebugLibDps DebugLibDefault + +#endif /* ! UseInstalled */ + +/* + * Sequent general make macros. + * X11R6.5 should migrate these to Imake.tmpl. + */ + +XCOMM Sequent general make macros. + +#ifndef PackCmd +#define PackCmd pack +#endif + PACK = PackCmd + +/* + * Sequent unique make macros. These will always be unique to Sequent. + * We introduce them here in sequent.cf since cpp macros are set in sequent.cf. + * We may later move them to sequentLib.tmpl. + */ + +XCOMM Sequent unique make macros. -#define LnCmd ln -s + ADMINBASEDIR = AdminBaseDir + MESSAGECATDIR = MessageCatDir -/* libgen is not part of the i386 ABI. (Are both architectures i386??) */ -#define UseLocalRegex YES +/* + * DPS default values (unique to sequent) + */ +#ifndef PswrapCmd +#define PswrapCmd pswrap +#endif + +#ifdef UseHidesymsLists + +#ifndef HidesymsCmd +#define HidesymsCmd /usr/lib/hidesyms/hidesyms +#endif +#ifndef HsAcppCmd +#define HsAcppCmd /lib/acpp +#endif +/* + * When building in the X11 tree. + * For shared libs, hidesyms executes in a subdir. + * For unshared libs, hidesyms executes in a subsubdir. + * Therefore we add both of these to the acpp path: + * ../../$(BUILDINCROOT)/lib/hidesyms:../$(BUILDINCROOT)/lib/hidesyms + */ +#ifndef HsAcppLocalPath +# define HsAcppLocalPath ../../$(BUILDINCROOT)/lib/hidesyms:../$(BUILDINCROOT)/lib/hidesyms +#endif +#ifndef HsAcppSystemPath +# define HsAcppSystemPath /usr/lib/hidesyms +#endif +#ifndef HsAcppPath +# ifdef UseInstalled +# define HsAcppPath HsAcppSystemPath +# else +# define HsAcppPath HsAcppLocalPath:HsAcppSystemPath +# endif /* UseInstalled */ +#endif +/* + * note: -DABI_SHARED_OBJECT requires a temporary fix added to + * Xt/Error.c to provide missing _abi_* routines not in libc.so.1. + * When the base adds those missing _abi_* to libc.so.1, + * then the code in Xt/Error.c can be removed and the corresponding + * symbols added to Xt/libXt.hs can be removed. + */ +#ifndef HsAcppDefines +#define HsAcppDefines -DABI_SHARED_OBJECT -D_SOCKET_VERSION=11 $(THREADS_DEFINES) +#endif + +/* + * For shared libs, hidesyms executes in a subdir, + * therefore we add a -L../$(BUILDLIBDIR) + */ +#ifndef LdPreLib +#ifndef UseInstalled +#define LdPreLib -L$(BUILDLIBDIR) -L../$(BUILDLIBDIR) +#endif +#endif + +XCOMM HIDESYMS is for filtering system library symbols. + + HIDESYMS = HidesymsCmd + HSACPPPATH = HsAcppPath + HSACPPCMD = HsAcppCmd + HSACPPDEFINES = HsAcppDefines + HSACPP = $(HSACPPCMD) -Y $(HSACPPPATH) $(HSACPPDEFINES) + HSCMD = $(HIDESYMS) -z -p "$(HSACPP)" + +#endif /* UseHidesymsLists */ + +#if OSMajorVersion >= 4 +#include +#include /* include after macros, before Motif.rules */ +#endif /* OSMajorVersion >= 4 */ Index: xc/config/cf/sequentLib.rules diff -u /dev/null xc/config/cf/sequentLib.rules:1.1.1.1 --- /dev/null Mon Jun 4 09:29:12 2001 +++ xc/config/cf/sequentLib.rules Tue Jan 16 16:54:21 2001 @@ -0,0 +1,323 @@ +XCOMM $Xorg: sequentLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + +/* + * SVR4 shared library rules + */ + +#ifndef HasSharedLibraries +# define HasSharedLibraries YES +#endif +#ifndef SharedDataSeparation +# define SharedDataSeparation NO +#endif +#ifndef SharedCodeDef +# define SharedCodeDef /**/ +#endif +#ifndef SharedLibraryDef +# define SharedLibraryDef /**/ +#endif +#ifndef ShLibIncludeFile +# define ShLibIncludeFile +#endif +#ifndef SharedLibraryLoadFlags +/* Sequent may need to implement the X11R5 HasMultipleSockets ? */ +# if HasMultipleSockets +# define SharedLibraryLoadFlags -G -z text $(DEFAULTSOCKETLDOPTIONS) +# define ExtraLoadOptions $(DEFAULTSOCKETLDOPTIONS) +# else +/* # define SharedLibraryLoadFlags -G -z text */ +# define SharedLibraryLoadFlags -G +# define ExtraLoadOptions +# endif +#endif +#ifndef PositionIndependentCFlags +# if HasGcc2 +# define PositionIndependentCFlags -fpic +# else +# define PositionIndependentCFlags -K PIC +# endif +#endif +#ifndef PositionIndependentCplusplusFlags +# if HasGcc2ForCplusplus +# define PositionIndependentCplusplusFlags -fpic +# else +# define PositionIndependentCplusplusFlags -K PIC +# endif +#endif +#ifndef UseExportLists +# define UseExportLists NO +#endif +#ifndef UseHidesymsLists +# define UseHidesymsLists NO +#endif + +#if UseHidesymsLists + +#ifndef BuildHidesyms +#define BuildHidesyms(libname) @@\ +includes:: @@\ + MakeDir($(BUILDLIBDIR)/hidesyms) @@\ + @( if [ -f Concat(lib,libname.hs) ]; \ @@\ + then \ @@\ + (set -x; cd $(BUILDLIBDIR)/hidesyms && \ @@\ + RemoveFile(Concat(lib,libname.hs)) && \ @@\ + $(LN) $(BUILDLIBTOP)/../$(CURRENT_DIR)/Concat(lib,libname.hs) .); \ @@\ + fi; ) +#endif /* BuildHidesyms */ + +/* + * InstallHidesyms - install library hidesyms directive file. (Sequent only) + * Logic cloned from InstallNonExecFile. + * We do not list the hidesyms directive file as a dependency since it + * may not exist. + */ +#ifndef InstallHidesyms +#define InstallHidesyms(libname) @@\ +install:: @@\ + MakeDir($(DESTDIR)/usr/lib/hidesyms) @@\ + @( if [ -f Concat(lib,libname.hs) ]; then \ @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) Concat(lib,libname.hs) $(DESTDIR)/usr/lib/hidesyms; fi; ) +#endif /* InstallHidesyms */ + +/* + * InstallLibrary - generate rules to install the indicated library. + * + * Sequent includes an extra "install::" target to install hidesyms files + * and an extra "includes::" target to export library hidesyms files. + * Therefore whenever InstallLibrary is expanded the hidesyms targets + * will also be expanded. This avoids changes to generic cf *.tmpl files. + */ +#ifndef InstallLibrary +#define InstallLibrary(libname,dest) @@\ +install:: LibraryTargetName(libname) @@\ + MakeDir($(DESTDIR)dest) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) LibraryTargetName(libname) $(DESTDIR)dest @@\ + RanLibrary($(RANLIBINSTFLAGS) $(DESTDIR)dest/LibraryTargetName(libname)) @@\ + @@\ +InstallHidesyms(libname) @@\ + @@\ +BuildHidesyms(libname) +#endif /* InstallLibrary */ + +/* + * Sequent additions to MakeLibrary for filtering objects + * with hidesyms before making a normal archive library. + */ + +#ifndef MakeLibrary +#define MakeLibrary(libname,objlist) ( $(RM) -r tmp_hs ; \ @@\ + LIBNAME_HS=`dirname libname`/`basename libname .a`.hs ; \ @@\ + (if [ -f $$LIBNAME_HS ]; \ @@\ + then \ @@\ + LIBNAME_AR=../libname; \ @@\ + $(MKDIRHIER) tmp_hs && \ @@\ + $(CP) *.o tmp_hs && \ @@\ + cd tmp_hs && \ @@\ + $(HSCMD) -i ../$$LIBNAME_HS *.o ; \ @@\ + else \ @@\ + LIBNAME_AR=libname; \ @@\ + fi; \ @@\ + $(AR) $$LIBNAME_AR objlist ) ;\ @@\ + $(RM) -r tmp_hs ) +#endif + +#endif /* UseHidesymsLists */ + +/* + * InstallSharedLibrary - generate rules to install the shared library. + */ +#ifndef InstallSharedLibrary +# define InstallSharedLibrary(libname,rev,dest) @@\ +install:: Concat(lib,libname.so.rev) @@\ + MakeDir($(DESTDIR)dest) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTSHLIBFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\ + $(RM) Concat($(DESTDIR)dest/lib,libname.so) @@\ + $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so) +#endif /* InstallSharedLibrary */ + +/* + * InstallSharedLibraryData - generate rules to install the shared library data + */ +#ifndef InstallSharedLibraryData +# define InstallSharedLibraryData(libname,rev,dest) +#endif /* InstallSharedLibraryData */ + +#ifndef LinkWithExports +# if UseHidesymsLists +# define LinkWithExports(libname,rev,solist,down,up) \ + $(RM) -r tmp_hs @@\ + ( if [ -f Concat(lib,libname.hs) ]; \ @@\ + then \ @@\ + LIBNAME_SO=../$@~; \ @@\ + mkdir tmp_hs; \ @@\ + cd down; \ @@\ + $(CP) *.o up/tmp_hs && \ @@\ + cd up/tmp_hs && \ @@\ + $(HSCMD) -i ../Concat(lib,libname.hs) *.o; \ @@\ + else \ @@\ + LIBNAME_SO=up/$@~; \ @@\ + cd down; \ @@\ + fi; \ @@\ + $(CCENVSETUP) $(LD) -o $$LIBNAME_SO $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS) ) @@\ + $(RM) -r tmp_hs +# else +# if UseExportLists +# define LinkWithExports(libname,rev,solist,down,up) \ + (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) @@\ + if [ -f Concat(lib,libname.elist) ]; then \ @@\ + $(RM) down/$@.exports $@.list; \ @@\ + $(CPP) $(ALLINCLUDES) $(EXTRA_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(DEFINES) Concat(lib,libname.elist) | CppSedMagic >$@.list; \ @@\ + $(EXPORTLISTGEN) $@~ $@.list > down/$@.exports; \ @@\ + (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ ShlibExportListOpt($@.exports) solist $(REQUIREDLIBS)); \ @@\ + $(RM) down/$@.exports $@.list; \ @@\ + fi; +# else +# define LinkWithExports(libname,rev,solist,down,up) \ + (cd down; $(CCENVSETUP) $(LD) -o up/$@~ $(SHLIBLDFLAGS) -h $@ solist $(REQUIREDLIBS)) +# endif /* UseExportLists */ +# endif /* UseHidesymsLists */ +#endif + +/* + * SharedLibraryTarget - generate rules to create a shared library; + * build it into a different name so that we do not hose people by having + * the library gone for long periods. + */ +#ifndef SharedLibraryTarget +# define SharedLibraryTarget(libname,rev,solist,down,up) @@\ +AllTarget(Concat(lib,libname.so.rev)) @@\ + @@\ +Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ + $(RM) $@~ @@\ + LinkWithExports(libname,rev,solist,down,up) @@\ + $(RM) $@ @@\ + $(MV) $@~ $@ @@\ + $(RM) Concat(lib,libname.so) @@\ + $(LN) $@ Concat(lib,libname.so) @@\ + LinkBuildLibrary($@) @@\ + LinkBuildLibrary(Concat(lib,libname.so)) @@\ + @@\ +clean:: @@\ + $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) + +#endif /* SharedLibraryTarget */ + +/* + * SharedLibraryDataTarget - generate rules to create shlib data file; + */ +#ifndef SharedLibraryDataTarget +# define SharedLibraryDataTarget(libname,rev,salist) +#endif /* SharedLibraryTarget */ + +/* + * Sequent does not use the InstallManPageAliases rule. + * Sequent customer installation procedure uses makealiases(1M) + * after the initial product manpages are installed in system directories. + */ +#define InstallManPageAliases(file,destdir,aliases) /* use makealiases(1M) */ + +/* + * Man pages need to be formatted when installed, so override the default + * imake rules. + */ +#if defined(UseInstalled) +MANCAT = cat +#else +MANCAT = sed -f $(CONFIGSRC)/util/installman.sed +#endif + +#define InstallManPageLong(file,destdir,dest) @@\ +all:: file.$(MANSUFFIX).z @@\ + @@\ +file.$(MANSUFFIX).z:: file.man @@\ + @if [ -f file.man ]; \ @@\ + then \ @@\ + $(MANCAT) file.man | $(NEQN) | \ @@\ + $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > file.$(MANSUFFIX); \ @@\ + $(RM) file.$(MANSUFFIX).z; \ @@\ + $(PACK) -f file.$(MANSUFFIX); \ @@\ + fi @@\ + @@\ +file.man:: @@\ + @@\ +install.man:: @@\ + MakeDir($(DESTDIR)destdir) @@\ + @if [ -f file.$(MANSUFFIX).z ]; \ @@\ + then \ @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANSUFFIX).z $(DESTDIR)destdir/dest.$(MANSUFFIX).z; \@@\ + fi + +#define InstallMultipleManSuffix(list,dest,suff) @@\ +install.man:: @@\ + MakeDir($(DESTDIR)dest) @@\ + MakeFlagsToShellFlags(i,set +e); \ @@\ + @for i in list; do \ @@\ + (set -x; \ @@\ + $(MANCAT) $$i.suff | $(NEQN) | \ @@\ + $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$i.suff; \ @@\ + $(PACK) -f /tmp/$$i.suff; \ @@\ + $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$i.suff.z $(DESTDIR)dest/$$i.$(MANSUFFIX).z; \ @@\ + $(RM) /tmp/$$i.suff.z); \ @@\ + done + +#define InstallMultipleMan(list,dest) @@\ + InstallMultipleManSuffix(list,dest,man) + +/* + * InstallMotifManPage relies on the fact that all the + * Imakefiles where it is used (or Makefile default value) + * will correctly define MANSUFFIX which may be + * either "section" or "section"x. + * Since we rely on MANSUFFIX being defined correctly in each Makefile + * we can also rely on MANDIR = $(MANSOURCEPATH)section + * + * CAUTION: + * The source file "file.section" may have the same name as + * the target file "file.$(MANSUFFIX)" so we must use temporary files + * so that we do not overwrite "file.section". + */ +#define InstallMotifManPage(file,section) @@\ +all:: file.$(MANSUFFIX).z @@\ + @@\ +file.$(MANSUFFIX).z: file.section @@\ + @$(MANCAT) file.section | $(NEQN) | \ @@\ + $(TBL) | $(NROFF) $(MANMACROS) | $(COL) > /tmp/file.man; \ @@\ + $(RM) /tmp/file.man.z; \ @@\ + $(PACK) -f /tmp/file.man; \ @@\ + $(CP) /tmp/file.man.z file.$(MANSUFFIX).z; \ @@\ + $(RM) /tmp/file.man.z @@\ + @@\ +install.man:: file.$(MANSUFFIX).z @@\ + MakeDir($(DESTDIR)$(MANDIR)) @@\ + $(INSTALL) -c $(INSTMANFLAGS) file.$(MANSUFFIX).z $(DESTDIR)$(MANDIR)/file.$(MANSUFFIX).z + +/* + * The Real_MessageCatalogRule defined in Motif.rules does not + * install the generated catalog file. This rule adds an install + * clause to do that. + */ +#define Real_MessageCatalogRule(prefix) @@\ +prefix.cat Concat(prefix,MsgCatI.h): @@\ + $(RM) Concat(prefix,MsgCatI.h) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\ + $(MKCATTOOL) Concat(prefix,MsgCatI.h) prefix.msg > $(MLOCSRC)/C/msg/prefix.msg @@\ + $(GENCAT) prefix.cat $(MLOCSRC)/C/msg/prefix.msg @@\ + @@\ +includes:: prefix.cat Concat(prefix,MsgCatI.h) @@\ + @@\ +depend:: prefix.cat Concat(prefix,MsgCatI.h) @@\ + @@\ +all:: prefix.cat @@\ + @@\ +install:: prefix.cat @@\ + MakeDir($(DESTDIR)$(MESSAGECATDIR)) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) prefix.cat $(DESTDIR)$(MESSAGECATDIR)/prefix.cat @@\ + $(RM) $(DESTDIR)$(MESSAGECATDIR)/prefix @@\ + $(LN) prefix.cat $(DESTDIR)$(MESSAGECATDIR)/prefix @@\ + MakeDir($(DESTDIR)$(NLSDIR)) @@\ + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) prefix.cat $(DESTDIR)$(NLSDIR)/prefix.cat @@\ + $(RM) $(DESTDIR)$(NLSDIR)/prefix @@\ + $(LN) prefix.cat $(DESTDIR)$(NLSDIR)/prefix @@\ + @@\ +clean:: @@\ + $(RM) prefix.cat Concat(prefix,MsgCatI.h) + Index: xc/config/cf/sgi.cf diff -u xc/config/cf/sgi.cf:1.8 xc/config/cf/sgi.cf:1.9 --- xc/config/cf/sgi.cf:1.8 Sun Jun 6 11:36:03 1999 +++ xc/config/cf/sgi.cf Wed Jan 17 11:22:33 2001 @@ -1,5 +1,5 @@ -XCOMM platform: $TOG: sgi.cf /main/49 1998/02/26 09:12:19 barstow $ -XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.8 1999/06/06 15:36:03 dawes Exp $ +XCOMM platform: $Xorg: sgi.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/sgi.cf,v 1.9 2001/01/17 16:22:33 dawes Exp $ #ifndef OSName # define OSName DefaultOSName @@ -161,7 +161,7 @@ #define ConstructMFLAGS NO /* build MFLAGS from MAKEFLAGS */ /* Used only for compressed fonts */ -#define UNCOMPRESSPATH /usr/bsd/uncompress +#define UNCOMPRESSPATH /usr/bsd/uncompress /* obsolete */ /* Normally used only to conditionally chose the default font path order */ #define PrimaryScreenResolution 96 Index: xc/config/cf/sgiLib.rules diff -u xc/config/cf/sgiLib.rules:1.3 xc/config/cf/sgiLib.rules:1.4 --- xc/config/cf/sgiLib.rules:1.3 Thu Jun 15 16:49:56 2000 +++ xc/config/cf/sgiLib.rules Wed Jan 17 11:22:33 2001 @@ -1,5 +1,5 @@ -XCOMM $XConsortium: sgiLib.rules /main/16 1996/09/28 18:11:04 rws $ -XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.3 2000/06/15 20:49:56 dawes Exp $ +XCOMM $Xorg: sgiLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ +XCOMM $XFree86: xc/config/cf/sgiLib.rules,v 1.4 2001/01/17 16:22:33 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES Index: xc/config/cf/sgiLib.tmpl diff -u xc/config/cf/sgiLib.tmpl:3.1 xc/config/cf/sgiLib.tmpl:3.2 --- xc/config/cf/sgiLib.tmpl:3.1 Mon Dec 23 00:50:31 1996 +++ xc/config/cf/sgiLib.tmpl Wed Jan 17 11:22:33 2001 @@ -1,4 +1,4 @@ -XCOMM $XConsortium: sgiLib.tmpl /main/2 1996/09/28 16:12:44 rws $ +XCOMM $Xorg: sgiLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * SGI shared library template Index: xc/config/cf/site.sample diff -u /dev/null xc/config/cf/site.sample:1.3 --- /dev/null Mon Jun 4 09:29:12 2001 +++ xc/config/cf/site.sample Wed Jan 17 11:35:04 2001 @@ -0,0 +1,125 @@ +XCOMM site: $Xorg: site.sample,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + +/*************************************************************************** + * * + * SITE-SPECIFIC DEFINITIONS * + * * + * This file contains two halves, one included before the vendor-specific * + * configuration file (.cf file), and one included after the .cf file. * + * The before-half should be protected by #ifdef BeforeVendorCF, and the * + * after-half should be protected by #ifdef AfterVendorCF. * + * * + * The before-half should only set things that the .cf file depends on. * + * For the .cf files shipped in this release, the main variables in this * + * category are HasGcc, HasGcc2, HasCplusplus, OSMajorVersion, * + * OSMinorVersion, and OSTeenyVersion. * + * * + * The after-half should contain all other definitions. For example, * + * place your ProjectRoot definition here. * + * * + * OS Major and Minor version numbers should be changed directly in the * + * .cf file, not overridden in site.def. * + * * + ***************************************************************************/ + +/* if you want host-specific customization, this is one way to do it */ +/* +#ifndef SiteIConfigFiles +#define SiteIConfigFiles $(IRULESRC)/host.def +#define LocalConfigFiles host.def +#endif +*/ + + +#ifdef BeforeVendorCF + +/* #include */ + +/* On systems where cpp doesn't expand correctly macros in include directives + * the two following macros need to be defined directly (where "X11" is + * really whatever the TopLevelProject macro is defined to be). + */ +# if defined(AIXArchitecture) || defined(SVR4Architecture) || \ + defined(SCOArchitecture) || defined(Win32Architecture) || \ + defined(UXPArchitecture) || defined(SunArchitecture) +# ifndef ProjectRulesFile +# define ProjectRulesFile +# endif +# ifndef ProjectTmplFile +# define ProjectTmplFile +# endif +# endif + +/* +#ifndef HasGcc2 +#define HasGcc2 YES +#endif +*/ + +#endif /* BeforeVendorCF */ + +#ifdef AfterVendorCF + +#define ProjectRoot /usr/X11R6.4 + +/* Only set HasXdmAuth to YES if you have a Wraphelp.c file. */ +/* #define HasXdmAuth YES */ + +/* +#if defined(SunArchitecture) && defined(SparcArchitecture) +#define HasCodeCenter YES +#ifndef SVR4Architecture +#define HasTestCenter YES +#endif +#endif +*/ + +/* +#ifdef __hp9000s800 +#define HasCodeCenter YES +#endif +*/ + +/* +#if defined(SunArchitecture) && defined(SparcArchitecture) && !defined(SVR4Architecture) +#define HasPurify YES +#endif +*/ + +/* +#define HasSentinel YES +*/ + +/* +#undef DefaultUserPath +#define DefaultUserPath /bin:/usr/bin:$(BINDIR):/usr/ucb:/usr/local/bin +*/ + + +/* You do NOT need SetUID if you only run the server under xdm */ +/* You MAY need SetUID if users run the server by hand or under xinit */ +/* Consult your system administrator before making the X server setuid */ +/* +#if defined(SunArchitecture) && OSMajorVersion > 4 +#define InstallXserverSetUID YES +#endif +*/ + +/* You do NOT need SetUID if you only run the server under xdm */ +/* You MAY need SetUID if users run the server by hand or under xinit */ +/* Consult your system administrator before making the X server setuid */ +/* +#ifdef XFree86Version +#define InstallXserverSetUID YES +#endif +*/ + +#ifndef XnestServer +#undef BuildServer +#define BuildServer YES +#define XnestServer YES +#endif + +/* #include */ + +#endif /* AfterVendorCF */ Index: xc/config/cf/sony.cf diff -u xc/config/cf/sony.cf:1.1.1.5 xc/config/cf/sony.cf:1.1.1.6 --- xc/config/cf/sony.cf:1.1.1.5 Sat Dec 21 22:15:13 1996 +++ xc/config/cf/sony.cf Tue Jan 16 16:54:26 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: sony.cf /main/69 1996/09/29 18:19:36 kaleb $ +XCOMM platform: $Xorg: sony.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ #ifdef SonyBsdArchitecture Index: xc/config/cf/sun.cf diff -u xc/config/cf/sun.cf:3.54 xc/config/cf/sun.cf:3.56 --- xc/config/cf/sun.cf:3.54 Mon Dec 11 17:34:21 2000 +++ xc/config/cf/sun.cf Fri May 11 05:03:05 2001 @@ -1,9 +1,9 @@ -XCOMM platform: $TOG: sun.cf /main/176 1997/12/09 17:27:51 kaleb $ +XCOMM platform: $Xorg: sun.cf,v 1.4 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.54 2000/12/11 22:34:21 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/sun.cf,v 3.56 2001/05/11 09:03:05 alanh Exp $ #ifndef OSName # define OSName DefaultOSName @@ -155,6 +155,15 @@ # endif #endif +/* The Xsun server was not building for SunOS 5.7 due to + includes of . +*/ +#if OSMajorVersion < 5 +# define IncludeCG2HeaderDefine -DINCLUDE_CG2_HEADER +#else +# define IncludeCG2HeaderDefine /**/ +#endif + #ifdef i386Architecture # if OSMajorVersion > 4 # if OSMinorVersion >= 8 @@ -164,14 +173,14 @@ # define ServerExtraDefines AllocateLocalDefines XFree86ServerDefines \ -D__EXTENSIONS__ # endif -# define ServerOSDefines XFree86ServerOSDefines +# define ServerOSDefines XFree86ServerOSDefines IncludeCG2HeaderDefine # else # define ServerExtraDefines AllocateLocalDefines -# define ServerOSDefines -DDDXOSINIT +# define ServerOSDefines -DDDXOSINIT IncludeCG2HeaderDefine # endif #else # define ServerExtraDefines AllocateLocalDefines -# define ServerOSDefines -DDDXOSINIT +# define ServerOSDefines -DDDXOSINIT IncludeCG2HeaderDefine # define HasPlugin YES #endif @@ -426,6 +435,17 @@ # if (OSMajorVersion > 5) || ((OSMajorVersion == 5) && (OSMinorVersion >= 4)) # define UsePamLibrary YES # endif +#endif + +/* PAM appeared in SunOS 5.6 */ +#if !defined(HasPam) +# if (OSMajorVersion > 5) || (OSMajorVersion == 5 && OSMinorVersion >= 6) +# define HasPam YES +# endif +#endif + +#ifndef PamLibraries +#define PamLibraries -lpam #endif #define MotifDefines \ Index: xc/config/cf/sunLib.rules diff -u xc/config/cf/sunLib.rules:1.2 xc/config/cf/sunLib.rules:1.3 --- xc/config/cf/sunLib.rules:1.2 Mon Jan 11 00:13:08 1999 +++ xc/config/cf/sunLib.rules Wed Jan 17 11:38:49 2001 @@ -1,10 +1,10 @@ -XCOMM $XConsortium: sunLib.rules /main/15 1996/09/28 16:13:16 rws $ +XCOMM $Xorg: sunLib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * SunOS shared library rules */ -XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.2 1999/01/11 05:13:08 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.3 2001/01/17 16:38:49 dawes Exp $ #ifndef HasSharedLibraries #define HasSharedLibraries YES Index: xc/config/cf/sunLib.tmpl diff -u xc/config/cf/sunLib.tmpl:3.11 xc/config/cf/sunLib.tmpl:3.12 --- xc/config/cf/sunLib.tmpl:3.11 Sat Jan 24 22:59:57 1998 +++ xc/config/cf/sunLib.tmpl Wed Jan 17 11:38:49 2001 @@ -1,10 +1,10 @@ -XCOMM $TOG: sunLib.tmpl /main/47 1997/12/12 14:53:33 kaleb $ +XCOMM $Xorg: sunLib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.11 1998/01/25 03:59:57 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12 2001/01/17 16:38:49 dawes Exp $ /* * SunOS shared library template Index: xc/config/cf/sv3Lib.rules diff -u xc/config/cf/sv3Lib.rules:3.3 xc/config/cf/sv3Lib.rules:3.4 --- xc/config/cf/sv3Lib.rules:3.3 Wed Oct 13 00:20:43 1999 +++ xc/config/cf/sv3Lib.rules Wed Jan 17 11:38:49 2001 @@ -1,8 +1,8 @@ -XCOMM $XConsortium: sv3Lib.rules /main/1 1996/10/31 14:47:33 kaleb $ +XCOMM $Xorg: sv3Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.3 1999/10/13 04:20:43 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv3Lib.rules,v 3.4 2001/01/17 16:38:49 dawes Exp $ /* * SVR3 shared library rules * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany Index: xc/config/cf/sv3Lib.tmpl diff -u xc/config/cf/sv3Lib.tmpl:3.1 xc/config/cf/sv3Lib.tmpl:3.2 --- xc/config/cf/sv3Lib.tmpl:3.1 Fri Dec 27 01:50:28 1996 +++ xc/config/cf/sv3Lib.tmpl Wed Jan 17 11:38:49 2001 @@ -1,8 +1,8 @@ -XCOMM $XConsortium: sv3Lib.tmpl /main/1 1996/10/31 14:47:35 kaleb $ +XCOMM $Xorg: sv3Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.1 1996/12/27 06:50:28 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv3Lib.tmpl,v 3.2 2001/01/17 16:38:49 dawes Exp $ /* * SVR3 shared library template * Copyright (c) 1992, 1993 by Thomas Wolfram, Berlin, Germany Index: xc/config/cf/sv4Lib.rules diff -u xc/config/cf/sv4Lib.rules:3.6 xc/config/cf/sv4Lib.rules:3.7 --- xc/config/cf/sv4Lib.rules:3.6 Sun Jun 6 04:47:45 1999 +++ xc/config/cf/sv4Lib.rules Wed Jan 17 11:38:49 2001 @@ -1,10 +1,10 @@ -XCOMM $XConsortium: sv4Lib.rules /main/18 1996/09/28 16:13:29 rws $ +XCOMM $Xorg: sv4Lib.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * SVR4 shared library rules */ -XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.6 1999/06/06 08:47:45 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv4Lib.rules,v 3.7 2001/01/17 16:38:49 dawes Exp $ #ifndef HasSharedLibraries # define HasSharedLibraries YES Index: xc/config/cf/sv4Lib.tmpl diff -u xc/config/cf/sv4Lib.tmpl:3.4 xc/config/cf/sv4Lib.tmpl:3.5 --- xc/config/cf/sv4Lib.tmpl:3.4 Sun Jun 6 08:13:23 1999 +++ xc/config/cf/sv4Lib.tmpl Wed Jan 17 11:38:50 2001 @@ -1,10 +1,10 @@ -XCOMM $XConsortium: sv4Lib.tmpl /main/23 1996/12/04 10:11:01 swick $ +XCOMM $Xorg: sv4Lib.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /* * SVR4 shared library template */ -XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.4 1999/06/06 12:13:23 dawes Exp $ +XCOMM $XFree86: xc/config/cf/sv4Lib.tmpl,v 3.5 2001/01/17 16:38:50 dawes Exp $ /* SVR4 shared libraries are deficient in link semantics */ XMULIBONLY = -lXmu Index: xc/config/cf/svr3.cf diff -u xc/config/cf/svr3.cf:3.13 xc/config/cf/svr3.cf:3.14 --- xc/config/cf/svr3.cf:3.13 Tue Mar 21 14:56:59 2000 +++ xc/config/cf/svr3.cf Wed Jan 17 11:38:50 2001 @@ -1,8 +1,8 @@ -XCOMM $XConsortium: svr3.cf /main/1 1996/10/31 14:47:37 kaleb $ +XCOMM $Xorg: svr3.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.13 2000/03/21 19:56:59 dawes Exp $ +XCOMM $XFree86: xc/config/cf/svr3.cf,v 3.14 2001/01/17 16:38:50 dawes Exp $ #ifndef HasGcc #define HasGcc YES Index: xc/config/cf/svr4.cf diff -u xc/config/cf/svr4.cf:3.42 xc/config/cf/svr4.cf:3.43 --- xc/config/cf/svr4.cf:3.42 Mon Dec 11 17:34:22 2000 +++ xc/config/cf/svr4.cf Wed Jan 17 11:38:50 2001 @@ -1,5 +1,8 @@ -XCOMM $TOG: svr4.cf /main/17 1997/06/08 20:08:31 kaleb $ -XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.42 2000/12/11 22:34:22 dawes Exp $ +XCOMM $Xorg: svr4.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + + + +XCOMM $XFree86: xc/config/cf/svr4.cf,v 3.43 2001/01/17 16:38:50 dawes Exp $ /* * A default OS name */ Index: xc/config/cf/ultrix.cf diff -u xc/config/cf/ultrix.cf:1.1.1.3 xc/config/cf/ultrix.cf:1.1.1.4 --- xc/config/cf/ultrix.cf:1.1.1.3 Sat Dec 21 22:15:23 1996 +++ xc/config/cf/ultrix.cf Tue Jan 16 16:54:33 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: ultrix.cf /main/68 1996/09/28 16:13:46 rws $ +XCOMM platform: $Xorg: ultrix.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ #ifndef OSName # define OSName DefaultOSName Index: xc/config/cf/usl.cf diff -u xc/config/cf/usl.cf:3.21 xc/config/cf/usl.cf:3.23 --- xc/config/cf/usl.cf:3.21 Mon Dec 11 17:34:24 2000 +++ xc/config/cf/usl.cf Wed Jan 17 11:38:50 2001 @@ -1,9 +1,9 @@ -XCOMM platform: $TOG: usl.cf /main/50 1997/04/17 14:11:39 barstow $ +XCOMM platform: $Xorg: usl.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.21 2000/12/11 22:34:24 dawes Exp $ +XCOMM platform: $XFree86: xc/config/cf/usl.cf,v 3.23 2001/01/17 16:38:50 dawes Exp $ #ifndef OSName # define OSName DefaultOSName @@ -57,7 +57,9 @@ # define SystemMTDefines -D_REENTRANT # define ThreadsLibraries -lthread # define ThreadsCplusplusLibraries -lthread -# define DefaultCCOptions -W0,-2A -Xa -Dasm=__asm +# ifndef DefaultCCOptions +# define DefaultCCOptions -W0,-2A -Xa -Dasm=__asm +# endif #endif #define BuildLibPathVar LD_LIBRARY_PATH Index: xc/config/cf/x386.cf diff -u xc/config/cf/x386.cf:3.3 xc/config/cf/x386.cf:3.5 --- xc/config/cf/x386.cf:3.3 Mon Dec 23 00:50:38 1996 +++ xc/config/cf/x386.cf Tue Jan 23 18:31:50 2001 @@ -1,4 +1,4 @@ -XCOMM platform: $XConsortium: x386.cf /main/15 1996/09/28 16:14:00 rws $ +XCOMM platform: $Xorg: x386.cf,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ /***************************************************************************** * Site-specfic parameters * @@ -19,7 +19,7 @@ * Do not change anything below * *****************************************************************************/ -/* You must manually compute BootstrapCFlags for initial build */ +/* You mus manually compute BootstrapCFlags for initial build */ #define BootstrapCFlags OSDefines OSRelease #define StandardDefines OSDefines OSRelease Index: xc/config/cf/xf86.rules diff -u xc/config/cf/xf86.rules:3.32 xc/config/cf/xf86.rules:3.33 --- xc/config/cf/xf86.rules:3.32 Mon Oct 30 18:02:06 2000 +++ xc/config/cf/xf86.rules Wed Jan 17 11:38:51 2001 @@ -1,5 +1,9 @@ -XCOMM $XConsortium: xf86.rules /main/9 1996/10/31 14:54:26 kaleb $ -XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.32 2000/10/30 23:02:06 tsi Exp $ +XCOMM $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ + + + + +XCOMM $XFree86: xc/config/cf/xf86.rules,v 3.33 2001/01/17 16:38:51 dawes Exp $ /* * These rules are needed to build the XFree86 X Servers Index: xc/config/cf/xf86.tmpl diff -u xc/config/cf/xf86.tmpl:3.27 xc/config/cf/xf86.tmpl:3.28 --- xc/config/cf/xf86.tmpl:3.27 Fri Aug 4 12:13:15 2000 +++ xc/config/cf/xf86.tmpl Wed Jan 17 11:38:51 2001 @@ -1,8 +1,8 @@ -XCOMM $XConsortium: xf86.tmpl /main/2 1996/10/31 15:01:41 kaleb $ +XCOMM $Xorg: xf86.tmpl,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.27 2000/08/04 16:13:15 eich Exp $ +XCOMM $XFree86: xc/config/cf/xf86.tmpl,v 3.28 2001/01/17 16:38:51 dawes Exp $ #ifdef BuilderEMailAddr BUILDERADDR = BuilderEMailAddr Index: xc/config/cf/xf86site.def diff -u xc/config/cf/xf86site.def:3.170 xc/config/cf/xf86site.def:3.173 --- xc/config/cf/xf86site.def:3.170 Thu Dec 14 11:38:45 2000 +++ xc/config/cf/xf86site.def Thu Apr 5 15:29:36 2001 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.170 2000/12/14 16:38:45 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xf86site.def,v 3.173 2001/04/05 19:29:36 dawes Exp $ /******************************************************************************/ /* * This file is to provide a quick method for most people to change the @@ -253,7 +253,7 @@ * #define XF86CardDrivers mga glint nv tga s3virge sis rendition \ neomagic i740 tdfx savage \ - cirrus tseng trident chips apm \ + cirrus vmware tseng trident chips apm \ GlideDriver fbdev i128 \ ati AgpGartDrivers DevelDrivers ark cyrix \ siliconmotion \ Index: xc/config/cf/xfree86.cf diff -u xc/config/cf/xfree86.cf:3.338 xc/config/cf/xfree86.cf:3.360.2.1 --- xc/config/cf/xfree86.cf:3.338 Thu Dec 14 11:59:06 2000 +++ xc/config/cf/xfree86.cf Tue May 22 17:25:40 2001 @@ -1,4 +1,4 @@ -XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.338 2000/12/14 16:59:06 dawes Exp $ +XCOMM $XFree86: xc/config/cf/xfree86.cf,v 3.360.2.1 2001/05/22 21:25:40 dawes Exp $ /* * This configuration file contains all of the configuration * information for the XFree86 based X Servers. @@ -6,14 +6,84 @@ * Most of these settings can be overridden in a vendor.cf or the * BeforeVendor part of the site.def file. */ -XCOMM $TOG: xfree86.cf /main/38 1997/10/22 13:01:59 kaleb $ +XCOMM $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ + +/* Get and set version information. */ + +#include "version.def" +/* + * As of the development trunk after 4.0.2, XFree86 versions are + * M.m.P.s, and XFree86Version is: + * + * M * 10000000 + m * 100000 + P * 1000 + s + * + * See xc/programs/Xserver/hw/xfree86/doc/Versions for further details. + * + * From 3.9.15 to 4.0.x, XFree86 release versions are X.Y.Z, and + * XFree86Version is: + * + * X * 1000 + Y * 100 + Z + * + * For the 3.3.x branch, the versions are X.Y.Z.W, with XFree86Version + * calculated as: + * + * X * 1000 + Y * 100 + Z * 10 + W + * + */ +#ifndef XFree86Version +#ifdef XF86_VERSION_CURRENT +# define XFree86Version XF86_VERSION_CURRENT +#endif +#endif + +#ifndef XFree86VersionString +#ifdef XF86_VERSION_MAJOR +#if XF86_VERSION_SNAP == 0 +#define XFree86VersionString XF86_VERSION_MAJOR.XF86_VERSION_MINOR.XF86_VERSION_PATCH +#else +#define XFree86VersionString XF86_VERSION_MAJOR.XF86_VERSION_MINOR.XF86_VERSION_PATCH.XF86_VERSION_SNAP +#endif +#endif +#endif + +#ifndef XFree86DateString +#ifdef XF86_DATE +#define XFree86DateString XF86_DATE +#endif +#endif + +/* This must be defined here for boostrapping purposes */ +#ifndef XFree86Version +# define XFree86Version 0 +#endif + +#ifndef XVendorString +# define XVendorString "The XFree86 Project, Inc" +#endif + +#ifndef XVendorRelease +# define XVendorRelease XFree86Version +#endif + +#ifndef XVendorManVersionString +#define XVendorManVersionString Version XFree86VersionString +#endif + +#ifndef XVendorManNameString +#define XVendorManNameString XFree86 +#endif + /* * This enables some settings for developers. */ #ifndef XFree86Devel -# define XFree86Devel NO +# if (XFree86Version % 1000) +# define XFree86Devel YES +# else +# define XFree86Devel NO +# endif #endif #ifndef BuildDebug @@ -35,6 +105,30 @@ #endif /* + * BuildXFree86ConfigTools: + * + * Turning this on allows the XFree86 config tools to build when + * BuildServersOnly is YES. This requires more than the servonly CVS + * module. This cannot be used to disable building the config tools with + * a full build. + */ +#ifndef BuildXFree86ConfigTools +#ifdef BuildServersOnly +#define BuildXFree86ConfigTools !BuildServersOnly +#else +#define BuildXFree86ConfigTools YES +#endif +#endif + +#if BuildXFree86ConfigTools +#define BuildLibraries YES +#define BuildXF86MiscLibrary YES +#define BuildXF86VidModeLibrary YES +#define BuildXKBlib YES +#define BuildXKBuilib YES +#endif + +/* * Default settings for which X Servers to build. */ @@ -210,17 +304,29 @@ # ifndef XF86CardDrivers # define XF86CardDrivers mga glint nv tga s3virge sis rendition \ neomagic i740 tdfx savage \ - cirrus tseng trident chips apm \ + cirrus vmware tseng trident chips apm \ GlideDriver fbdev i128 \ ati AgpGartDrivers DevelDrivers ark cyrix \ siliconmotion \ vesa vga XF86OSCardDrivers XF86ExtraCardDrivers # endif +# if HasGlide3 +# define TdfxDriDriver tdfx +# else +# define TdfxDriDriver /**/ +# endif +# ifndef DriDrivers +# define DriDrivers gamma TdfxDriDriver mga i810 r128 radeon sis +# endif #endif /* Sparc drivers */ -#if defined(SparcArchitecture) && !defined(LynxOSArchitecture) && !defined(NetBSDArchitecture) && !defined(OpenBSDArchitecture) && !defined(SunArchitecture) +#if defined(SparcArchitecture) && \ + !defined(LynxOSArchitecture) && \ + !defined(NetBSDArchitecture) && \ + !defined(OpenBSDArchitecture) && \ + !defined(SunArchitecture) # ifndef XF86Server # define XF86Server YES # endif @@ -287,6 +393,9 @@ sunbw2 ati glint fbdev \ XF86OSCardDrivers XF86ExtraCardDrivers # endif +# ifndef DriDrivers +# define DriDrivers ffb +# endif #endif @@ -354,8 +463,19 @@ # define XF86Int10 YES # endif +# ifndef DevelDrivers +# if XFree86Devel +# define DevelDrivers /* */ +# else +# define DevelDrivers /* */ +# endif +# endif + # ifndef XF86CardDrivers -# define XF86CardDrivers newport XF86OSCardDrivers XF86ExtraCardDrivers +# define XF86CardDrivers mga glint nv s3virge sis savage \ + trident chips tdfx fbdev ati \ + DevelDrivers newport \ + XF86OSCardDrivers XF86ExtraCardDrivers # endif #endif @@ -439,6 +559,14 @@ savage nv DevelDrivers siliconmotion vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif +# if HasGlide3 +# define TdfxDriDriver tdfx +# else +# define TdfxDriDriver /**/ +# endif +# ifndef DriDrivers +# define DriDrivers gamma TdfxDriDriver mga r128 radeon sis +# endif #endif /* @@ -512,7 +640,7 @@ # ifndef DevelDrivers # if XFree86Devel -# define DevelDrivers ati +# define DevelDrivers ati imstt # else # define DevelDrivers /* */ # endif @@ -521,10 +649,18 @@ /* Pure PCI drivers should go first */ # ifndef XF86CardDrivers # define XF86CardDrivers mga glint s3virge sis savage\ - trident chips fbdev \ + trident chips tdfx fbdev \ DevelDrivers vga \ XF86OSCardDrivers XF86ExtraCardDrivers # endif +# if HasGlide3 +# define TdfxDriDriver tdfx +# else +# define TdfxDriDriver /**/ +# endif +# ifndef DriDrivers +# define DriDrivers gamma TdfxDriDriver mga r128 radeon +# endif #endif @@ -619,6 +755,10 @@ #if BuildXF86DRI +#ifndef BuildGLXLibrary +#define BuildGLXLibrary YES +#endif + /* * One and ONLY one of the GlxBuiltIn* drivers can be defined to be YES. * If more than one are defined, the compilation will fail with multiply @@ -642,6 +782,9 @@ # ifndef GlxBuiltInR128 # define GlxBuiltInR128 NO # endif +# ifndef GlxBuiltInRadeon +# define GlxBuiltInRadeon NO +# endif # ifndef GlxBuiltInFfb # define GlxBuiltInFfb NO # endif @@ -649,11 +792,25 @@ # define GlxBuiltInSIS NO # endif -# if GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuildInFfb || GlxBuiltInSIS +# if GlxBuiltInTdfx || \ + GlxBuiltInMga || \ + GlxBuiltInI810 || \ + GlxBuiltInR128 || \ + GlxBuiltInRadeon || \ + GlxBuildInFfb || \ + GlxBuiltInSIS # define GlxDriverUsesMesa YES # endif -# if GlxBuiltInGamma || GlxBuiltInTdfx || GlxBuiltInMga || GlxBuiltInI810 || GlxBuiltInR128 || GlxBuiltInFfb || GlxBuiltInSIS || GlxBuiltInMesa +# if GlxBuiltInGamma || \ + GlxBuiltInTdfx || \ + GlxBuiltInMga || \ + GlxBuiltInI810 || \ + GlxBuiltInR128 || \ + GlxBuiltInRadeon || \ + GlxBuiltInFfb || \ + GlxBuiltInSIS || \ + GlxBuiltInMesa # define GlxUseBuiltInDRIDriver YES # define DRIDynLoadDefines /**/ # else @@ -661,6 +818,34 @@ # define DRIDynLoadDefines -DGLX_USE_DLOPEN # endif +# if GlxUseBuiltInDRIDriver +# undef DriDrivers +# if GlxBuiltInGamma +# define DriDrivers gamma +# endif +# if GlxBuiltInTdfx +# define DriDrivers tdfx +# endif +# if GlxBuiltInMga +# define DriDrivers mga +# endif +# if GlxBuiltInI810 +# define DriDrivers i810 +# endif +# if GlxBuiltInR128 +# define DriDrivers r128 +# endif +# if GlxBuiltInRadeon +# define DriDrivers radeon +# endif +# if GlxBuiltInSIS +# define DriDrivers sis +# endif +# if GlxBuiltInFfb +# define DriDrivers ffb +# endif +# endif + #endif /* @@ -796,6 +981,7 @@ #endif #endif +#if 0 /* * Build the extra extension libs even when not including the extra extensions * in the servers @@ -818,6 +1004,7 @@ #ifndef BuildGLXLibrary # define BuildGLXLibrary YES #endif +#endif /* * Build the XFree86-VidMode extension @@ -842,6 +1029,13 @@ #endif /* + * Build SuperProbe + */ +#ifndef BuildSuperProbe +# define BuildSuperProbe NO +#endif + +/* * Build XF86Setup -- needs Tk and Tcl */ /* There are problems building XF86Setup, so turn it off for now */ @@ -850,7 +1044,8 @@ #endif #ifndef BuildXF86Setup -# if HasTk && HasTcl && BuildXF86VidModeLibrary && BuildXF86MiscLibrary && BuildXKBlib +# if HasTk && HasTcl && \ + BuildXF86VidModeLibrary && BuildXF86MiscLibrary && BuildXKBlib # define BuildXF86Setup YES # else # define BuildXF86Setup NO @@ -988,7 +1183,7 @@ (defined(LinuxArchitecture) && !defined(Mc68020Architecture) && \ !defined(PpcArchitecture)) || \ defined(i386BsdArchitecture) || defined(LynxOSArchitecture) || \ - defined(OS2Architecture) + defined(OS2Architecture) || defined(GNUMachArchitecture) # define BuildScanpci YES # else # define BuildScanpci NO @@ -1166,29 +1361,6 @@ # define OtherIConfigFiles $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules #endif -/* - * As of 3.9.15, XFree86 release versions are X.Y.Z, and XFree86Version is: - * - * X * 1000 + Y * 100 + Z - * - * For the 3.3.x branch, the versions are X.Y.Z.W, with XFree86Version - * calculated as: - * - * X * 1000 + Y * 100 + Z * 10 + W - * - */ -#ifndef XFree86Version -# define XFree86Version 4002 -#endif - -#ifndef XVendorString -# define XVendorString "The XFree86 Project, Inc" -#endif - -#ifndef XVendorRelease -# define XVendorRelease XFree86Version -#endif - #ifndef UseRgbTxt # define UseRgbTxt YES #endif @@ -1243,6 +1415,12 @@ #if HasGcc2 && defined(AlphaArchitecture) # ifndef DefaultGcc2AxpOpt # define DefaultGcc2AxpOpt -O2 +# endif +#endif + +#if HasGcc2 && defined(PpcArchitecture) +# ifndef DefaultGcc2PpcOpt +# define DefaultGcc2PpcOpt -O2 # endif #endif Index: xc/config/cf/xttMod.tmpl diff -u xc/config/cf/xttMod.tmpl:1.5 xc/config/cf/xttMod.tmpl:1.6 --- xc/config/cf/xttMod.tmpl:1.5 Thu Aug 24 18:20:06 2000 +++ xc/config/cf/xttMod.tmpl Mon Apr 23 17:41:43 2001 @@ -1,6 +1,6 @@ /* -*- Makefile -*- */ XCOMM Code converter template of X-TT -XCOMM $XFree86: xc/config/cf/xttMod.tmpl,v 1.5 2000/08/24 22:20:06 tsi Exp $ */ +XCOMM $XFree86: xc/config/cf/xttMod.tmpl,v 1.6 2001/04/23 21:41:43 dawes Exp $ */ #ifdef IHaveModules /* New designed XFree86 module */ @@ -33,7 +33,7 @@ # else /* dlopen based code converter */ -#if DoLoadableServer +#if DoLoadableServer && BuildServer #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" SUBDIRS = module @@ -75,7 +75,7 @@ #endif /* 0 */ -#if DoLoadableServer +#if DoLoadableServer && BuildServer MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif Index: xc/config/imake/Imakefile diff -u xc/config/imake/Imakefile:3.9 xc/config/imake/Imakefile:3.11 --- xc/config/imake/Imakefile:3.9 Sat Aug 14 06:49:01 1999 +++ xc/config/imake/Imakefile Wed Jan 24 12:28:55 2001 @@ -1,9 +1,9 @@ -XCOMM $TOG: Imakefile /main/10 1997/04/30 15:39:17 kaleb $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/imake/Imakefile,v 3.9 1999/08/14 10:49:01 dawes Exp $ +XCOMM $XFree86: xc/config/imake/Imakefile,v 3.11 2001/01/24 17:28:55 tsi Exp $ XCOMM Some compilers generate fatal errors if an -L directory does XCOMM not exist. Since BUILDLIBDIR may not exist yet suppress its use. @@ -51,4 +51,5 @@ clean:: RemoveFile(ProgramTargetName(ccimake)) + RemoveFile(Makefile.proto) $(RM) -r bootstrap Index: xc/config/imake/Makefile.ini diff -u xc/config/imake/Makefile.ini:3.9 xc/config/imake/Makefile.ini:3.10 --- xc/config/imake/Makefile.ini:3.9 Thu Oct 26 13:57:45 2000 +++ xc/config/imake/Makefile.ini Wed Jan 17 11:38:55 2001 @@ -1,4 +1,4 @@ -# $TOG: Makefile.ini /main/25 1997/02/19 18:00:59 mgreess $ +# $Xorg: Makefile.ini,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ # # WARNING WARNING WARNING WARNING WARNING WARNING WARNING # @@ -7,7 +7,7 @@ # may be given at the top of the build tree for systems that do not define # any machine-specific preprocessor symbols. # -# $XFree86: xc/config/imake/Makefile.ini,v 3.9 2000/10/26 17:57:45 dawes Exp $ +# $XFree86: xc/config/imake/Makefile.ini,v 3.10 2001/01/17 16:38:55 dawes Exp $ BOOTSTRAPCFLAGS = CC = cc Index: xc/config/imake/ccimake.c diff -u xc/config/imake/ccimake.c:1.1.1.3 xc/config/imake/ccimake.c:1.2 --- xc/config/imake/ccimake.c:1.1.1.3 Sun Sep 27 03:48:58 1998 +++ xc/config/imake/ccimake.c Sun Apr 1 09:59:56 2001 @@ -1,4 +1,4 @@ -/* $TOG: ccimake.c /main/16 1998/02/06 11:02:20 kaleb $ */ +/* $Xorg: ccimake.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,6 +20,7 @@ in this Software without prior written authorization from The Open Group . */ +/* $XFree86: xc/config/imake/ccimake.c,v 1.2 2001/04/01 13:59:56 tsi Exp $ */ /* * Warning: This file must be kept as simple as posible so that it can @@ -34,9 +35,10 @@ #define imake_ccflags "-O" #endif +int main() { write(1, imake_ccflags, sizeof(imake_ccflags) - 1); - exit(0); + return 0; } Index: xc/config/imake/imake.c diff -u xc/config/imake/imake.c:3.40 xc/config/imake/imake.c:3.41 --- xc/config/imake/imake.c:3.40 Mon Nov 27 00:06:43 2000 +++ xc/config/imake/imake.c Wed Jan 17 11:38:55 2001 @@ -1,4 +1,4 @@ -/* $TOG: imake.c /main/104 1998/03/24 12:45:15 kaleb $ */ +/* $Id */ /*************************************************************************** * * @@ -8,7 +8,7 @@ * be passed to the template file. * * * ***************************************************************************/ -/* $XFree86: xc/config/imake/imake.c,v 3.40 2000/11/27 05:06:43 dawes Exp $ */ +/* $XFree86: xc/config/imake/imake.c,v 3.41 2001/01/17 16:38:55 dawes Exp $ */ /* * @@ -1573,7 +1573,7 @@ initialized = TRUE; fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); fprintf (tmpfd, "# %s\n", - "$TOG: imake.c /main/104 1998/03/24 12:45:15 kaleb $"); + "$Xorg: imake.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $"); } for (p1 = pline; p1 < end; p1++) { Index: xc/config/imake/imake.man diff -u xc/config/imake/imake.man:1.3 xc/config/imake/imake.man:1.7 --- xc/config/imake/imake.man:1.3 Fri Oct 2 02:15:17 1998 +++ xc/config/imake/imake.man Wed Feb 7 17:51:55 2001 @@ -1,4 +1,4 @@ -.\" $TOG: imake.man /main/30 1998/02/06 11:02:42 kaleb $ +.\" $Xorg: imake.man,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" All Rights Reserved. @@ -18,7 +18,10 @@ .\" not be used in advertising or otherwise to promote the sale, use or .\" other dealings in this Software without prior written authorization .\" from The Open Group. -.TH IMAKE 1 "Release 6.1" "X Version 11" +.\" +.\" $XFree86: xc/config/imake/imake.man,v 1.7 2001/02/07 22:51:55 tsi Exp $ +.\" +.TH IMAKE 1 __xorgversion__ .SH NAME imake \- C preprocessor interface to the make utility .SH SYNOPSIS @@ -88,9 +91,9 @@ following 3 lines: .sp .nf - #define IMAKE_TEMPLATE "Imake.tmpl" - #define INCLUDE_IMAKEFILE - #include IMAKE_TEMPLATE +\& #define IMAKE_TEMPLATE "Imake.tmpl" +\& #define INCLUDE_IMAKEFILE +\& #include IMAKE_TEMPLATE .fi .sp where \fIImake.tmpl\fP and \fIImakefile\fP may be overridden by the @@ -127,8 +130,8 @@ .ta 1i 1.6i 5i .nf -#define program_target(program, objlist) @@\e -program: objlist @@\e +\& #define program_target(program, objlist) @@\e + program: objlist @@\e $(CC) \-o $@ objlist $(LDFLAGS) .fi @@ -137,7 +140,7 @@ will expand to .nf -foo: foo1.o foo2.o + foo: foo1.o foo2.o $(CC) \-o $@ foo1.o foo2.o $(LDFLAGS) .fi Index: xc/config/imake/imakemdep.h diff -u xc/config/imake/imakemdep.h:3.45 xc/config/imake/imakemdep.h:3.50 --- xc/config/imake/imakemdep.h:3.45 Tue Nov 14 13:20:32 2000 +++ xc/config/imake/imakemdep.h Wed Apr 25 12:44:54 2001 @@ -1,4 +1,4 @@ -/* $TOG: imakemdep.h /main/102 1998/02/06 11:02:26 kaleb $ */ +/* $Xorg: imakemdep.h,v 1.5 2000/08/17 19:41:50 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,7 +20,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/imake/imakemdep.h,v 3.45 2000/11/14 18:20:32 dawes Exp $ */ +/* $XFree86: xc/config/imake/imakemdep.h,v 3.50 2001/04/25 16:44:54 tsi Exp $ */ /* @@ -151,12 +151,8 @@ #define imake_ccflags "-DSYSV -DUSG -DNOSTDHDRS" #endif -#ifdef sequent -#define imake_ccflags "-DX_NOT_STDC_ENV -DX_NOT_POSIX" -#endif - #ifdef _SEQUENT_ -#define imake_ccflags "-DSYSV -DUSG" +#define imake_ccflags "-Xa -DSVR4" #endif #if defined(SX) || defined(PC_UX) @@ -223,11 +219,6 @@ #define FIXUP_CPP_WHITESPACE #endif -#if defined(__APPLE__) -#define DEFAULT_CPP "/usr/bin/cpp" -#endif - - #if defined(Lynx) /* On LynxOS 2.4.0 imake gets built with the old "legacy" * /bin/cc which has a rather pedantic builtin preprocessor. @@ -243,6 +234,9 @@ * If use cc -E but want a different compiler, define DEFAULT_CC. * If the cpp you need is not in /lib/cpp, define DEFAULT_CPP. */ +#if defined(__APPLE__) +#define DEFAULT_CPP "/usr/bin/cpp" +#endif #if defined(Lynx) || defined(__Lynx__) #define DEFAULT_CC "gcc" #define USE_CC_E @@ -654,11 +648,17 @@ #if defined(MIPS) "-DMIPS", #endif +#endif #if defined(__APPLE__) + "-D__APPLE__", "-D__DARWIN__", -#endif - +# ifdef __ppc__ + "-D__ppc__", +# endif +# ifdef __i386__ + "-D__i386__", +# endif #endif }; @@ -805,14 +805,18 @@ if ((__sp = strchr((buf), ' ')) != NULL) \ *__sp = '/'; \ } while (0) -#else -# if defined(__Lynx__) || defined(Lynx) +#elif defined(__Lynx__) || defined(Lynx) /* Lynx 2.4.0 /bin/cc doesn't like #elif */ -# define DEFAULT_OS_MAJOR_REV "r %[0-9]" -# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" -# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" -# define DEFAULT_OS_NAME "srm %[^\n]" -# endif +# define DEFAULT_OS_MAJOR_REV "r %[0-9]" +# define DEFAULT_OS_MINOR_REV "r %*d.%[0-9]" +# define DEFAULT_OS_TEENY_REV "r %*d.%*d.%[0-9]" +# define DEFAULT_OS_NAME "srm %[^\n]" +#elif defined(_SEQUENT_) +/* uname -v returns 'Vx.y.z', e.g. 'V4.4.2' */ +# define DEFAULT_OS_MAJOR_REV "v V%[0-9]" +# define DEFAULT_OS_MINOR_REV "v V%*d.%[0-9]" +# define DEFAULT_OS_TEENY_REV "v V%*d.%*d.%[0-9]" +# define DEFAULT_OS_NAME "s %[^\n]" #endif #else /* else MAKEDEPEND */ @@ -908,7 +912,14 @@ {"mc68020", "1"}, #endif #ifdef __GNUC__ +# if __GNUC__ == 1 {"__GNUC__", "1"}, +# else + {"__GNUC__", "2"}, +# endif +#endif +#ifdef __STRICT_ANSI__ + {"__STRICT_ANSI__", "1"}, #endif #if __STDC__ {"__STDC__", "1"}, Index: xc/config/makedepend/Imakefile diff -u xc/config/makedepend/Imakefile:3.7 xc/config/makedepend/Imakefile:3.8 --- xc/config/makedepend/Imakefile:3.7 Sat Aug 14 06:49:02 1999 +++ xc/config/makedepend/Imakefile Wed Jan 17 11:38:57 2001 @@ -1,9 +1,9 @@ -XCOMM $TOG: Imakefile /main/27 1997/04/30 15:38:09 kaleb $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ XCOMM XCOMM XCOMM XCOMM -XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.7 1999/08/14 10:49:02 dawes Exp $ +XCOMM $XFree86: xc/config/makedepend/Imakefile,v 3.8 2001/01/17 16:38:57 dawes Exp $ SRCS = include.c main.c parse.c pr.c cppsetup.c ifparser.c OBJS = include.o main.o parse.o pr.o cppsetup.o ifparser.o Index: xc/config/makedepend/cpp.ed diff -u xc/config/makedepend/cpp.ed:1.1.1.1 xc/config/makedepend/cpp.ed:1.1.1.2 --- xc/config/makedepend/cpp.ed:1.1.1.1 Wed Apr 27 03:07:34 1994 +++ xc/config/makedepend/cpp.ed Tue Jan 16 16:54:56 2001 @@ -1,5 +1,5 @@ # -# $XConsortium: cpp.ed,v 1.3 89/12/12 12:44:18 jim Exp $ +# $Xorg: cpp.ed,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ # # $Locker $ # Index: xc/config/makedepend/cppsetup.c diff -u xc/config/makedepend/cppsetup.c:3.5 xc/config/makedepend/cppsetup.c:3.9 --- xc/config/makedepend/cppsetup.c:3.5 Tue Apr 4 15:24:45 2000 +++ xc/config/makedepend/cppsetup.c Sun Apr 29 19:25:02 2001 @@ -1,4 +1,4 @@ -/* $TOG: cppsetup.c /main/18 1998/02/06 11:09:35 kaleb $ */ +/* $Xorg: cppsetup.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,7 +20,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.5 2000/04/04 19:24:45 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/cppsetup.c,v 3.9 2001/04/29 23:25:02 tsi Exp $ */ #include "def.h" @@ -181,6 +181,7 @@ static long my_eval_variable (IfParser *ip, const char *var, int len) { + long val; struct symtab **s; s = lookup_variable (ip, var, len); @@ -193,7 +194,9 @@ s = lookup_variable (ip, var, strlen(var)); } while (s); - return strtol(var, NULL, 0); + var = ParseIfExpression(ip, var, &val); + if (var && *var) debug(4, ("extraneous: '%s'\n", var)); + return val; } int Index: xc/config/makedepend/def.h diff -u xc/config/makedepend/def.h:3.7 xc/config/makedepend/def.h:3.9 --- xc/config/makedepend/def.h:3.7 Tue Oct 24 14:07:35 2000 +++ xc/config/makedepend/def.h Sun Apr 29 19:25:02 2001 @@ -1,4 +1,4 @@ -/* $TOG: def.h /main/32 1998/03/25 08:17:45 kaleb $ */ +/* $Xorg: def.h,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group. @@ -20,7 +20,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/def.h,v 3.7 2000/10/24 18:07:35 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/def.h,v 3.9 2001/04/29 23:25:02 tsi Exp $ */ #include "Xos.h" #include "Xfuncproto.h" @@ -65,11 +65,13 @@ #define ELIF 13 #define EJECT 14 #define WARNING 15 -#define IFFALSE 16 /* pseudo value --- never matched */ -#define ELIFFALSE 17 /* pseudo value --- never matched */ -#define INCLUDEDOT 18 /* pseudo value --- never matched */ -#define IFGUESSFALSE 19 /* pseudo value --- never matched */ -#define ELIFGUESSFALSE 20 /* pseudo value --- never matched */ +#define INCLUDENEXT 16 +#define IFFALSE 17 /* pseudo value --- never matched */ +#define ELIFFALSE 18 /* pseudo value --- never matched */ +#define INCLUDEDOT 19 /* pseudo value --- never matched */ +#define IFGUESSFALSE 20 /* pseudo value --- never matched */ +#define ELIFGUESSFALSE 21 /* pseudo value --- never matched */ +#define INCLUDENEXTDOT 22 /* pseudo value --- never matched */ #ifdef DEBUG extern int _debugmask; @@ -147,7 +149,7 @@ struct inclist *newfile); struct inclist *newinclude(char *newfile, char *incstring); void inc_clean (void); -struct inclist *inc_path(char *file, char *include, boolean dot); +struct inclist *inc_path(char *file, char *include, int type); void freefile(struct filepointer *fp); @@ -164,7 +166,7 @@ void add_include(struct filepointer *filep, struct inclist *file, struct inclist *file_red, - char *include, boolean dot, + char *include, int type, boolean failOK); int cppsetup(char *line, struct filepointer *filep, Index: xc/config/makedepend/ifparser.c diff -u xc/config/makedepend/ifparser.c:3.7 xc/config/makedepend/ifparser.c:3.9 --- xc/config/makedepend/ifparser.c:3.7 Mon Oct 5 09:21:48 1998 +++ xc/config/makedepend/ifparser.c Sun Apr 29 19:25:02 2001 @@ -1,5 +1,5 @@ /* - * $XConsortium: ifparser.c /main/10 1996/09/28 16:15:18 rws $ + * $Xorg: ifparser.c,v 1.3 2000/08/17 19:41:50 cpqbld Exp $ * * Copyright 1992 Network Computing Devices, Inc. * @@ -58,7 +58,7 @@ * * ParseIfExpression parse a string for #if */ -/* $XFree86: xc/config/makedepend/ifparser.c,v 3.7 1998/10/05 13:21:48 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/ifparser.c,v 3.9 2001/04/29 23:25:02 tsi Exp $ */ #include "ifparser.h" #include @@ -93,19 +93,48 @@ static const char * parse_number (IfParser *g, const char *cp, long *valp) { + long base = 10; SKIPSPACE (cp); if (!isdigit(*cp)) return CALLFUNC(g, handle_error) (g, cp, "number"); - *valp = strtol(cp, (char **)&cp, 0); - /* skip trailing qualifiers */ + *valp = 0; + + if (*cp == '0') { + cp++; + if ((*cp == 'x') || (*cp == 'X')) { + base = 16; + cp++; + } else { + base = 8; + } + } + + /* Ignore overflows and assume ASCII, what source is usually written in */ + while (1) { + int increment = -1; + if (base == 8) { + if ((*cp >= '0') && (*cp <= '7')) + increment = *cp++ - '0'; + } else if (base == 16) { + if ((*cp >= '0') && (*cp <= '9')) + increment = *cp++ - '0'; + else if ((*cp >= 'A') && (*cp <= 'F')) + increment = *cp++ - ('A' - 10); + else if ((*cp >= 'a') && (*cp <= 'f')) + increment = *cp++ - ('a' - 10); + } else { /* Decimal */ + if ((*cp >= '0') && (*cp <= '9')) + increment = *cp++ - '0'; + } + if (increment < 0) + break; + *valp = (*valp * base) + increment; + } + + /* Skip trailing qualifiers */ while (*cp == 'U' || *cp == 'u' || *cp == 'L' || *cp == 'l') cp++; -#if 0 - *valp = atoi (cp); - /* EMPTY */ - for (cp++; isdigit(*cp); cp++) ; -#endif return cp; } Index: xc/config/makedepend/ifparser.h diff -u xc/config/makedepend/ifparser.h:3.3 xc/config/makedepend/ifparser.h:3.4 --- xc/config/makedepend/ifparser.h:3.3 Mon Oct 5 09:21:48 1998 +++ xc/config/makedepend/ifparser.h Wed Jan 17 11:38:58 2001 @@ -1,5 +1,5 @@ /* - * $XConsortium: ifparser.h /main/4 1996/09/28 16:15:24 rws $ + * $Xorg: ifparser.h,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ * * Copyright 1992 Network Computing Devices, Inc. * @@ -57,7 +57,7 @@ * ParseIfExpression parse a string for #if */ -/* $XFree86: xc/config/makedepend/ifparser.h,v 3.3 1998/10/05 13:21:48 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/ifparser.h,v 3.4 2001/01/17 16:38:58 dawes Exp $ */ #include Index: xc/config/makedepend/include.c diff -u xc/config/makedepend/include.c:3.4 xc/config/makedepend/include.c:3.6 --- xc/config/makedepend/include.c:3.4 Mon Oct 5 09:21:49 1998 +++ xc/config/makedepend/include.c Sun Apr 29 19:25:02 2001 @@ -1,4 +1,4 @@ -/* $TOG: include.c /main/21 1998/02/06 11:10:06 kaleb $ */ +/* $Xorg: include.c,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,14 +20,15 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/include.c,v 3.4 1998/10/05 13:21:49 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/include.c,v 3.6 2001/04/29 23:25:02 tsi Exp $ */ #include "def.h" extern struct inclist inclist[ MAXFILES ], - *inclistp; -extern char *includedirs[ ]; + *inclistp, *inclistnext; +extern char *includedirs[ ], + **includedirsnext; extern char *notdotdot[ ]; extern boolean show_where_not; extern boolean warn_multiple; @@ -165,6 +166,7 @@ else ip->i_incstring = copy(incstring); + inclistnext = inclistp; return(ip); } @@ -229,81 +231,84 @@ } struct inclist * -inc_path(char *file, char *include, boolean dot) +inc_path(char *file, char *include, int type) { - static char path[ BUFSIZ ]; + static char path[ BUFSIZ ]; register char **pp, *p; register struct inclist *ip; - struct stat st; - boolean found = FALSE; + struct stat st; /* * Check all previously found include files for a path that * has already been expanded. */ - for (ip = inclist; ip->i_file; ip++) - if ((strcmp(ip->i_incstring, include) == 0) && - !(ip->i_flags & INCLUDED_SYM)) - { - found = TRUE; - break; - } + if ((type == INCLUDE) || (type == INCLUDEDOT)) + inclistnext = inclist; + ip = inclistnext; + + for (; ip->i_file; ip++) { + if ((strcmp(ip->i_incstring, include) == 0) && + !(ip->i_flags & INCLUDED_SYM)) { + inclistnext = ip + 1; + return ip; + } + } - /* - * If the path was surrounded by "" or is an absolute path, - * then check the exact path provided. - */ - if (!found && (dot || *include == '/')) { - if (stat(include, &st) == 0) { - ip = newinclude(include, include); - found = TRUE; + if (inclistnext == inclist) { + /* + * If the path was surrounded by "" or is an absolute path, + * then check the exact path provided. + */ + if ((type == INCLUDEDOT) || + (type == INCLUDENEXTDOT) || + (*include == '/')) { + if (stat(include, &st) == 0) + return newinclude(include, include); + if (show_where_not) + warning1("\tnot in %s\n", include); + } + + /* + * If the path was surrounded by "" see if this include file is + * in the directory of the file being parsed. + */ + if ((type == INCLUDEDOT) || (type == INCLUDENEXTDOT)) { + for (p=file+strlen(file); p>file; p--) + if (*p == '/') + break; + if (p == file) { + strcpy(path, include); + } else { + strncpy(path, file, (p-file) + 1); + path[ (p-file) + 1 ] = '\0'; + strcpy(path + (p-file) + 1, include); + } + remove_dotdot(path); + if (stat(path, &st) == 0) + return newinclude(path, include); + if (show_where_not) + warning1("\tnot in %s\n", path); } - else if (show_where_not) - warning1("\tnot in %s\n", include); } /* - * If the path was surrounded by "" see if this include file is in the - * directory of the file being parsed. + * Check the include directories specified. Standard include dirs + * should be at the end. */ - if (!found && dot) { - for (p=file+strlen(file); p>file; p--) - if (*p == '/') - break; - if (p == file) - strcpy(path, include); - else { - strncpy(path, file, (p-file) + 1); - path[ (p-file) + 1 ] = '\0'; - strcpy(path + (p-file) + 1, include); - } + if ((type == INCLUDE) || (type == INCLUDEDOT)) + includedirsnext = includedirs; + pp = includedirsnext; + + for (; *pp; pp++) { + sprintf(path, "%s/%s", *pp, include); remove_dotdot(path); if (stat(path, &st) == 0) { - ip = newinclude(path, include); - found = TRUE; + includedirsnext = pp + 1; + return newinclude(path, include); } - else if (show_where_not) + if (show_where_not) warning1("\tnot in %s\n", path); } - - /* - * Check the include directories specified. (standard include dir - * should be at the end.) - */ - if (!found) - for (pp = includedirs; *pp; pp++) { - sprintf(path, "%s/%s", *pp, include); - remove_dotdot(path); - if (stat(path, &st) == 0) { - ip = newinclude(path, include); - found = TRUE; - break; - } - else if (show_where_not) - warning1("\tnot in %s\n", path); - } - if (!found) - ip = NULL; - return(ip); + return NULL; } Index: xc/config/makedepend/main.c diff -u xc/config/makedepend/main.c:3.17 xc/config/makedepend/main.c:3.20 --- xc/config/makedepend/main.c:3.17 Tue Nov 14 16:59:20 2000 +++ xc/config/makedepend/main.c Sun Apr 29 19:25:02 2001 @@ -1,4 +1,4 @@ -/* $TOG: main.c /main/86 1998/03/25 08:17:50 kaleb $ */ +/* $Xorg: main.c,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,7 +20,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/main.c,v 3.17 2000/11/14 21:59:20 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/main.c,v 3.20 2001/04/29 23:25:02 tsi Exp $ */ #include "def.h" #ifdef hpux @@ -72,6 +72,7 @@ "elif", "eject", "warning", + "include_next", NULL }; @@ -81,10 +82,12 @@ struct inclist inclist[ MAXFILES ], *inclistp = inclist, + *inclistnext = inclist, maininclist; char *filelist[ MAXFILES ]; -char *includedirs[ MAXDIRS + 1 ]; +char *includedirs[ MAXDIRS + 1 ], + **includedirsnext = includedirs; char *notdotdot[ MAXDIRS ]; char *objprefix = ""; char *objsuffix = OBJSUFFIX; @@ -570,10 +573,7 @@ *p++ = ' ', *p++ = ' '; while (*p && *p != '\n') *p++ = ' '; - if (*p == '\n') { - lineno++; - *p++ = ' '; - } + if (*p == '\n') --p; continue; } else if (*p == '\\') { @@ -593,6 +593,7 @@ for (cp = bol+1; *cp && (*cp == ' ' || *cp == '\t'); cp++); if (*cp) goto done; + --p; } bol = p+1; } Index: xc/config/makedepend/mkdepend.man diff -u xc/config/makedepend/mkdepend.man:1.1.1.4 xc/config/makedepend/mkdepend.man:1.4 --- xc/config/makedepend/mkdepend.man:1.1.1.4 Sun Sep 27 03:49:06 1998 +++ xc/config/makedepend/mkdepend.man Wed Feb 7 17:51:55 2001 @@ -1,4 +1,4 @@ -.\" $TOG: mkdepend.man /main/20 1998/02/06 11:10:18 kaleb $ +.\" $Xorg: mkdepend.man,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" All Rights Reserved. @@ -18,7 +18,10 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from The .\" Open Group. -.TH MAKEDEPEND 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/makedepend/mkdepend.man,v 1.4 2001/02/07 22:51:55 tsi Exp $ +.\" +.TH MAKEDEPEND 1 __xorgversion__ .UC 4 .SH NAME makedepend \- create dependencies in makefiles @@ -107,7 +110,7 @@ It first searches the makefile for the line .sp - # DO NOT DELETE THIS LINE \-\^\- make depend depends on it. +\& # DO NOT DELETE THIS LINE \-\^\- make depend depends on it. .sp or one provided with the .B \-s @@ -338,9 +341,8 @@ cc(1), make(1) .SH BUGS .B makedepend -parses, but does not currently evaluate, the SVR4 -#predicate(token-list) preprocessor expression; -such expressions are simply assumed to be true. +parses, but does not currently evaluate, the SVR4 #predicate(token-list) +preprocessor expression; such expressions are simply assumed to be true. This may cause the wrong .I #include directives to be evaluated. Index: xc/config/makedepend/parse.c diff -u xc/config/makedepend/parse.c:1.6 xc/config/makedepend/parse.c:1.9 --- xc/config/makedepend/parse.c:1.6 Sun Mar 21 02:34:26 1999 +++ xc/config/makedepend/parse.c Fri May 18 12:03:05 2001 @@ -1,4 +1,4 @@ -/* $TOG: parse.c /main/35 1998/03/25 08:17:55 kaleb $ */ +/* $Xorg: parse.c,v 1.4 2000/08/17 19:41:51 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,12 +20,16 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/parse.c,v 1.6 1999/03/21 07:34:26 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/parse.c,v 1.9 2001/05/18 16:03:05 tsi Exp $ */ #include "def.h" extern char *directives[]; -extern struct inclist maininclist; +extern struct inclist inclist[ MAXFILES ], + *inclistnext, + maininclist; +extern char *includedirs[ ], + **includedirsnext; static int deftype (char *line, struct filepointer *filep, struct inclist *file_red, struct inclist *file, @@ -71,6 +75,8 @@ case SCCS: case EJECT: case WARNING: + case INCLUDENEXT: + case INCLUDENEXTDOT: break; case ELIF: case ELIFFALSE: @@ -93,7 +99,7 @@ struct inclist *file_red, struct inclist *file, int parse_it) { register char *p; - char *directive, savechar; + char *directive, savechar, *q; register int ret; /* @@ -104,7 +110,7 @@ directive++; p = directive; - while (*p >= 'a' && *p <= 'z') + while ((*p == '_') || (*p >= 'a' && *p <= 'z')) p++; savechar = *p; *p = '\0'; @@ -150,6 +156,11 @@ */ while (*p == ' ' || *p == '\t') p++; + q = p + strlen(p); + do { + q--; + } while (*q == ' ' || *q == '\t'); + q[1] = '\0'; switch (ret) { case IF: /* @@ -172,8 +183,10 @@ *line = '\0'; break; case INCLUDE: - debug(2,("%s, line %d: #include %s\n", - file->i_file, filep->f_line, p)); + case INCLUDENEXT: + debug(2,("%s, line %d: #include%s %s\n", + file->i_file, filep->f_line, + (ret == INCLUDE) ? "" : "_next", p)); /* Support ANSI macro substitution */ { @@ -198,7 +211,10 @@ if (! *p) return(-2); if (*p++ == '"') { - ret = INCLUDEDOT; + if (ret == INCLUDE) + ret = INCLUDEDOT; + else + ret = INCLUDENEXTDOT; while (*p && *p != '"') *line++ = *p++; } else @@ -506,6 +522,8 @@ find_includes(struct filepointer *filep, struct inclist *file, struct inclist *file_red, int recursion, boolean failOK) { + struct inclist *inclistp; + char **includedirsp; register char *line; register int type; boolean recfailOK; @@ -591,10 +609,14 @@ undefine(line, file_red); break; case INCLUDE: - add_include(filep, file, file_red, line, FALSE, failOK); - break; case INCLUDEDOT: - add_include(filep, file, file_red, line, TRUE, failOK); + case INCLUDENEXT: + case INCLUDENEXTDOT: + inclistp = inclistnext; + includedirsp = includedirsnext; + add_include(filep, file, file_red, line, type, failOK); + inclistnext = inclistp; + includedirsnext = includedirsp; break; case ERROR: case WARNING: Index: xc/config/makedepend/pr.c diff -u xc/config/makedepend/pr.c:1.2 xc/config/makedepend/pr.c:1.4 --- xc/config/makedepend/pr.c:1.2 Mon Oct 5 09:21:50 1998 +++ xc/config/makedepend/pr.c Sun Apr 29 19:25:02 2001 @@ -1,4 +1,4 @@ -/* $TOG: pr.c /main/21 1998/02/06 11:10:30 kaleb $ */ +/* $Xorg: pr.c,v 1.3 2000/08/17 19:41:51 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group @@ -20,7 +20,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/makedepend/pr.c,v 1.2 1998/10/05 13:21:50 dawes Exp $ */ +/* $XFree86: xc/config/makedepend/pr.c,v 1.4 2001/04/29 23:25:02 tsi Exp $ */ #include "def.h" @@ -35,7 +35,7 @@ void add_include(struct filepointer *filep, struct inclist *file, - struct inclist *file_red, char *include, boolean dot, + struct inclist *file_red, char *include, int type, boolean failOK) { register struct inclist *newfile; @@ -44,7 +44,7 @@ /* * First decide what the pathname of this include file really is. */ - newfile = inc_path(file->i_file, include, dot); + newfile = inc_path(file->i_file, include, type); if (newfile == NULL) { if (failOK) return; @@ -55,7 +55,7 @@ warning("%s, line %d: ", file->i_file, filep->f_line); warning1("cannot find include file \"%s\"\n", include); show_where_not = TRUE; - newfile = inc_path(file->i_file, include, dot); + newfile = inc_path(file->i_file, include, type); show_where_not = FALSE; } Index: xc/config/pswrap/Imakefile diff -u xc/config/pswrap/Imakefile:1.6 xc/config/pswrap/Imakefile:1.7 --- xc/config/pswrap/Imakefile:1.6 Wed Jun 7 17:58:25 2000 +++ xc/config/pswrap/Imakefile Wed Feb 28 20:23:55 2001 @@ -1,6 +1,6 @@ -XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.6 2000/06/07 21:58:25 tsi Exp $ +XCOMM $XFree86: xc/config/pswrap/Imakefile,v 1.7 2001/03/01 01:23:55 dawes Exp $ - FRIENDSDEF = -DFRIENDSFILE='""' + FRIENDSDEF = -DFRIENDSFILE='""' DEFINES = -DXENVIRONMENT DEPLIBS = YFLAGS = -d Index: xc/config/pswrap/pswfile.c diff -u xc/config/pswrap/pswfile.c:1.4 xc/config/pswrap/pswfile.c:1.5 --- xc/config/pswrap/pswfile.c:1.4 Wed Jun 7 17:58:25 2000 +++ xc/config/pswrap/pswfile.c Wed Feb 28 20:23:55 2001 @@ -35,7 +35,7 @@ * * Author: Adobe Systems Incorporated */ -/* $XFree86: xc/config/pswrap/pswfile.c,v 1.4 2000/06/07 21:58:25 tsi Exp $ */ +/* $XFree86: xc/config/pswrap/pswfile.c,v 1.5 2001/03/01 01:23:55 dawes Exp $ */ #include #include "pswversion.h" @@ -81,12 +81,11 @@ #endif /* __MACH__ */ printf("#include %s\n", FRIENDSFILE); printf("#include \n"); - if (special_h == 0) { - printf("#include \"%spsops.h\"\n\n", dpsops ? "d" : ""); - } else { + outlineno += 3; /* UPDATE this if you add more prolog */ + if (special_h) { printf("#include \"%s\"\n\n", special_h); + outlineno ++; } - outlineno += 4; /* UPDATE this if you add more prolog */ printf("#line 1 \"%s\"\n",ifile); outlineno++; } Index: xc/config/pswrap/pswversion.h diff -u xc/config/pswrap/pswversion.h:1.1 xc/config/pswrap/pswversion.h:1.3 --- xc/config/pswrap/pswversion.h:1.1 Sat Feb 12 19:12:35 2000 +++ xc/config/pswrap/pswversion.h Thu Mar 1 21:45:34 2001 @@ -35,7 +35,8 @@ * * Author: Adobe Systems Incorporated */ +/* $XFree86: xc/config/pswrap/pswversion.h,v 1.3 2001/03/02 02:45:34 dawes Exp $ */ -#define PSW_VERSION "V1.009 Wed Apr 19 17:50:24 PDT 1989" +#define PSW_VERSION "V1.009 XFree86" #define PSW_OS "unix" Index: xc/config/util/Imakefile diff -u xc/config/util/Imakefile:3.29 xc/config/util/Imakefile:3.36 --- xc/config/util/Imakefile:3.29 Wed Dec 6 10:35:01 2000 +++ xc/config/util/Imakefile Thu Apr 26 17:09:39 2001 @@ -1,8 +1,11 @@ -XCOMM $XConsortium: Imakefile /main/16 1996/11/13 14:43:28 lehors $ -XCOMM $XFree86: xc/config/util/Imakefile,v 3.29 2000/12/06 15:35:01 eich Exp $ +XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ + + +XCOMM $XFree86: xc/config/util/Imakefile,v 3.36 2001/04/26 21:09:39 dawes Exp $ + #if UseCCMakeDepend -MDEP_PROG = makedepend +CCMDEP_PROG = ccmakedep #endif #ifdef ExportListGenSource @@ -26,7 +29,7 @@ QNXCopyInstaller($(PROJECTROOT)/bin/install.qnx,./install.sh) #endif -PROGRAMS = xmkmf $(MDEP_PROG) $(GCCMDEP_PROG) mergelib $(LNDIR_PROG) \ +PROGRAMS = xmkmf $(CCMDEP_PROG) $(GCCMDEP_PROG) mergelib $(LNDIR_PROG) \ $(RMAN_PROG) ProgramTargetName(revpath) \ ProgramTargetName(makestrs) $(EXPORTLISTGEN) $(CMKDIRHIER) DEPLIBS = @@ -64,7 +67,7 @@ #endif CppScriptTarget(xmkmf,xmkmf.cpp,-DCONFIGDIRSPEC='"'"-I$(CONFIGDIR)"'"',$(ICONFIGFILES)) -CppScriptTarget(makedepend,mdepend.cpp,-DPREPROC='"'"$(PREPROCESSCMD_MKDEPEND)"'"',$(ICONFIGFILES)) +CppScriptTarget(ccmakedep,mdepend.cpp,-DPREPROC='"'"$(PREPROCESSCMD_MKDEPEND)"'"',$(ICONFIGFILES)) CppScriptTarget(mergelib,mergelib.cpp,"-DARCMD=$(AR)" "-DRANLIB=$(RANLIB)",$(ICONFIGFILES)) #ifndef OS2Architecture CppScriptTarget(gccmakedep,gccmdep.cpp,-DCCCMD='"'"$(GCCCMD)"'"' -DRMCMD='"'"$(RM)"'"' -DLNCMD='"'"$(LN)"'"' -DMVCMD='"'"$(MV)"'"',$(ICONFIGFILES)) @@ -127,13 +130,16 @@ InstallNamedProg(mergelib,mergelib,$(BINDIR)) InstallNamedProg(makeg.sh,makeg,$(BINDIR)) InstallManPage(makeg,$(MANDIR)) +InstallNamedProg(cleanlinks.sh,cleanlinks,$(BINDIR)) +#if HasPerl +InstallNamedProg(mkhtmlindex.pl,mkhtmlindex,$(BINDIR)) +#else InstallNamedProg(mkhtmlindex.sh,mkhtmlindex,$(BINDIR)) #endif -InstallManPage(mkdirhier,$(MANDIR)) -#if UseCCMakeDepend -InstallNamedProg(makedepend,makedepend,$(BINDIR)) -InstallDriverSDKNamedProg(makedepend,makedepend,$(DRIVERSDKDIR)/config/util) #endif +InstallManPage(mkdirhier,$(MANDIR)) +InstallNamedProg(ccmakedep,ccmakedep,$(BINDIR)) +InstallDriverSDKNamedProg(ccmakedep,ccmakedep,$(DRIVERSDKDIR)/config/util) #if SystemV || SystemV4 InstallNamedProg(bsdinst.sh,bsdinst,$(BINDIR)) InstallDriverSDKNamedProg(bsdinst.sh,bsdinst.sh,$(DRIVERSDKDIR)/config/util) Index: xc/config/util/Makefile.ini diff -u xc/config/util/Makefile.ini:1.1.1.1 xc/config/util/Makefile.ini:1.1.1.2 --- xc/config/util/Makefile.ini:1.1.1.1 Wed Apr 27 03:07:39 1994 +++ xc/config/util/Makefile.ini Tue Jan 16 16:54:38 2001 @@ -1,4 +1,4 @@ -# $XConsortium: Makefile.ini,v 1.2 94/04/17 14:55:28 gildea Exp $ +# $Xorg: Makefile.ini,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ # # A way to get lndir built the first time, before you have imake up # and running. You may well have to specify OSFLAGS=-D to Index: xc/config/util/aminstall.sh diff -u xc/config/util/aminstall.sh:1.1.1.1 xc/config/util/aminstall.sh:1.1.1.2 --- xc/config/util/aminstall.sh:1.1.1.1 Wed Apr 27 03:07:39 1994 +++ xc/config/util/aminstall.sh Tue Jan 16 16:54:38 2001 @@ -1,5 +1,5 @@ #!/bin/sh -# $XConsortium: aminstall.sh,v 1.1 94/03/29 15:54:08 gildea Exp $ +# $Xorg: aminstall.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ # aminstall - transfer cross-compiled files to system running Amoeba. # Usage: aminstall binary-directory [-s stksz] unix-source amoeba-dest Index: xc/config/util/bsdinst.sh diff -u xc/config/util/bsdinst.sh:3.3 xc/config/util/bsdinst.sh:3.4 --- xc/config/util/bsdinst.sh:3.3 Mon Dec 23 00:56:13 1996 +++ xc/config/util/bsdinst.sh Wed Jan 17 11:39:01 2001 @@ -1,10 +1,10 @@ #!/bin/sh -# $XFree86: xc/config/util/bsdinst.sh,v 3.3 1996/12/23 05:56:13 dawes Exp $ +# $XFree86: xc/config/util/bsdinst.sh,v 3.4 2001/01/17 16:39:01 dawes Exp $ # # This accepts bsd-style install arguments and makes the appropriate calls # to the System V install. -# $XConsortium: bsdinst.sh /main/8 1996/09/28 16:16:11 rws $ +# $Xorg: bsdinst.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ flags="" dst="" Index: xc/config/util/checktree.c diff -u xc/config/util/checktree.c:1.1.1.2 xc/config/util/checktree.c:1.1.1.3 --- xc/config/util/checktree.c:1.1.1.2 Sun Sep 27 03:49:11 1998 +++ xc/config/util/checktree.c Tue Jan 16 16:54:39 2001 @@ -1,4 +1,4 @@ -/* $TOG: checktree.c /main/8 1998/02/06 11:23:04 kaleb $ */ +/* $Xorg: checktree.c,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ */ /* Index: xc/config/util/chownxterm.c diff -u xc/config/util/chownxterm.c:1.1.1.2 xc/config/util/chownxterm.c:1.1.1.3 --- xc/config/util/chownxterm.c:1.1.1.2 Sun Sep 27 03:49:12 1998 +++ xc/config/util/chownxterm.c Tue Jan 16 16:54:40 2001 @@ -1,4 +1,4 @@ -/* $TOG: chownxterm.c /main/4 1998/02/06 11:23:10 kaleb $ */ +/* $Xorg: chownxterm.c,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group Index: xc/config/util/cleanlinks.sh diff -u /dev/null xc/config/util/cleanlinks.sh:1.1 --- /dev/null Mon Jun 4 09:29:12 2001 +++ xc/config/util/cleanlinks.sh Wed Mar 21 15:25:00 2001 @@ -0,0 +1,26 @@ +#!/bin/sh +# +# Copyright © 2000 by The XFree86 Project, Inc +# +# Remove dangling symlinks and empty directories from a shadow link tree +# (created with lndir). +# +# Author: David Dawes +# +# $XFree86: xc/config/util/cleanlinks.sh,v 1.1 2001/03/21 20:25:00 dawes Exp $ + +find . -type l -print | +( + read i + while [ X"$i" != X ]; do + if [ ! -f "$i" ]; then + echo $i is a dangling symlink, removing + rm -f "$i" + fi + read i + done +) + +echo Removing empty directories ... +find . -type d -depth -print | xargs rmdir > /dev/null 2>&1 +exit 0 Index: xc/config/util/elistgen.hp diff -u xc/config/util/elistgen.hp:1.1.1.1 xc/config/util/elistgen.hp:1.1.1.2 --- xc/config/util/elistgen.hp:1.1.1.1 Sat Dec 21 22:16:15 1996 +++ xc/config/util/elistgen.hp Tue Jan 16 16:54:41 2001 @@ -1,5 +1,5 @@ XCOMM!/bin/sh -XCOMM $XConsortium: elistgen.hp /main/2 1996/12/04 10:13:14 swick $ +XCOMM $Xorg: elistgen.hp,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM ######################################################################### XCOMM Construct shared-library export lists for HP-UX based on standardized Index: xc/config/util/elistgen.ibm diff -u xc/config/util/elistgen.ibm:1.1.1.1 xc/config/util/elistgen.ibm:1.1.1.2 --- xc/config/util/elistgen.ibm:1.1.1.1 Sat Dec 21 22:16:15 1996 +++ xc/config/util/elistgen.ibm Tue Jan 16 16:54:41 2001 @@ -1,5 +1,5 @@ XCOMM!/bin/sh -XCOMM $XConsortium: elistgen.ibm /main/2 1996/12/04 10:13:18 swick $ +XCOMM $Xorg: elistgen.ibm,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM ######################################################################### XCOMM Construct shared-library export lists for IBM-AIX based on standardized Index: xc/config/util/elistgen.sun diff -u xc/config/util/elistgen.sun:1.6 xc/config/util/elistgen.sun:1.7 --- xc/config/util/elistgen.sun:1.6 Wed Feb 9 12:10:25 2000 +++ xc/config/util/elistgen.sun Wed Jan 17 11:39:01 2001 @@ -1,5 +1,5 @@ XCOMM!/bin/sh -f -XCOMM $TOG: elistgen.sun /main/7 1997/10/24 15:16:44 bill $ +XCOMM $Xorg: elistgen.sun,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM ######################################################################## XCOMM Construct shared-library scoping mapfile for Solaris based on standardized @@ -15,7 +15,7 @@ XCOMM XCOMM ######################################################################## XCOMM -XCOMM $XFree86: xc/config/util/elistgen.sun,v 1.6 2000/02/09 17:10:25 dawes Exp $ +XCOMM $XFree86: xc/config/util/elistgen.sun,v 1.7 2001/01/17 16:39:01 dawes Exp $ XCOMM Utility programs FILTER=CXXFILT # C++ symbol demangler Index: xc/config/util/elistgen.usl diff -u xc/config/util/elistgen.usl:1.1.1.1 xc/config/util/elistgen.usl:1.1.1.2 --- xc/config/util/elistgen.usl:1.1.1.1 Sat Dec 21 22:16:15 1996 +++ xc/config/util/elistgen.usl Tue Jan 16 16:54:42 2001 @@ -1,5 +1,5 @@ XCOMM!/bin/sh -XCOMM $XConsortium: elistgen.usl /main/2 1996/12/04 10:13:26 swick $ +XCOMM $Xorg: elistgen.usl,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM ######################################################################### XCOMM Construct shared-library export lists for Novell based on standardized Index: xc/config/util/gccmdep.cpp diff -u xc/config/util/gccmdep.cpp:3.5 xc/config/util/gccmdep.cpp:3.8.2.1 --- xc/config/util/gccmdep.cpp:3.5 Tue Nov 14 16:59:21 2000 +++ xc/config/util/gccmdep.cpp Tue May 22 17:25:40 2001 @@ -3,7 +3,7 @@ XCOMM XCOMM makedepend which uses 'gcc -M' XCOMM -XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.5 2000/11/14 21:59:21 dawes Exp $ +XCOMM $XFree86: xc/config/util/gccmdep.cpp,v 3.8.2.1 2001/05/22 21:25:40 dawes Exp $ XCOMM XCOMM Based on mdepend.cpp and code supplied by Hongjiu Lu XCOMM @@ -23,17 +23,16 @@ magic_string='# DO NOT DELETE' append=n args= -asmfiles= while [ $# != 0 ]; do if [ "$endmarker"x != x -a "$endmarker" = "$1" ]; then endmarker= else case "$1" in - -D*|-I*) + -D*|-I*|-U*) args="$args '$1'" ;; - -g|-O*) + -g*|-O*) ;; *) if [ "$endmarker"x = x ]; then @@ -48,12 +47,17 @@ magic_string="$2" shift ;; - -f-) - makefile="-" - ;; - -f) - makefile="$2" - shift + -f*) + if [ "$1" = "-f-" ]; then + makefile="-" + elif [ "$1" = "-f" ]; then + makefile="$2" + shift + else + echo "$1" | sed 's/^\-f//' >${TMP}arg + makefile="`cat ${TMP}arg`" + rm -f ${TMP}arg + fi ;; --*) endmarker=`echo $1 | sed 's/^\-\-//'` @@ -105,20 +109,7 @@ fi fi -XCOMM need to link .s files to .S -for i in $files; do - case $i in - *.s) - dir=`dirname $i` - base=`basename $i .s` - (cd $dir; $RM ${base}.S; $LN ${base}.s ${base}.S) - asmfiles="$asmfiles ${base}.S" - ;; - esac -done - -CMD="$CC -M $args `echo $files | sed -e 's,\.s$,\.S,g' -e 's,\.s ,\.S ,g'` | \ - sed -e 's,\.S$,\.s,g' -e 's,\.S ,\.s ,g'" +CMD="$CC -M $args $files" if [ X"$makefile" != X- ]; then CMD="$CMD >> $TMP" fi @@ -129,8 +120,5 @@ $MV $TMP $makefile fi -if [ x"$asmfiles" != x ]; then - $RM $asmfiles -fi $RM ${TMP}* exit 0 Index: xc/config/util/install.sh diff -u xc/config/util/install.sh:1.1.1.1 xc/config/util/install.sh:1.1.1.2 --- xc/config/util/install.sh:1.1.1.1 Wed Apr 27 03:07:38 1994 +++ xc/config/util/install.sh Tue Jan 16 16:54:42 2001 @@ -3,7 +3,7 @@ # # install - install a program, script, or datafile # -# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $ +# $Xorg: install.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ # # This script is compatible with the BSD install script, but was written # from scratch. Index: xc/config/util/lndir.c diff -u xc/config/util/lndir.c:3.10 xc/config/util/lndir.c:3.13 --- xc/config/util/lndir.c:3.10 Mon Apr 17 12:29:45 2000 +++ xc/config/util/lndir.c Sun Apr 1 09:59:57 2001 @@ -1,4 +1,4 @@ -/* $TOG: lndir.c /main/17 1998/02/06 11:23:50 kaleb $ */ +/* $Xorg: lndir.c,v 1.4 2000/08/17 19:41:52 cpqbld Exp $ */ /* Create shadow link tree (after X11R4 script of the same name) Mark Reinhold (mbr@lcs.mit.edu)/3 January 1990 */ @@ -22,7 +22,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/util/lndir.c,v 3.10 2000/04/17 16:29:45 eich Exp $ */ +/* $XFree86: xc/config/util/lndir.c,v 3.13 2001/04/01 13:59:57 tsi Exp $ */ /* From the original /bin/sh script: @@ -42,6 +42,7 @@ #include #include #include +#include #include #if !defined(MINIX) && !defined(Lynx) #include @@ -205,6 +206,12 @@ while ((dp = readdir (df))) { if (dp->d_name[strlen(dp->d_name) - 1] == '~') continue; +#ifdef __DARWIN__ + /* Ignore these Mac OS X Finder data files */ + if (!strcmp(dp->d_name, ".DS_Store") || + !strcmp(dp->d_name, "._.DS_Store")) + continue; +#endif strcpy (p, dp->d_name); if (n_dirs > 0) { Index: xc/config/util/lndir.man diff -u xc/config/util/lndir.man:1.1.1.4 xc/config/util/lndir.man:1.2 --- xc/config/util/lndir.man:1.1.1.4 Sun Sep 27 03:49:18 1998 +++ xc/config/util/lndir.man Sat Jan 27 13:19:55 2001 @@ -1,4 +1,4 @@ -.\" $TOG: lndir.man /main/11 1998/02/06 11:23:56 kaleb $ +.\" $Xorg: lndir.man,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ .\" .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" @@ -20,7 +20,10 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH LNDIR 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/util/lndir.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.\" +.TH LNDIR 1 __xorgversion__ .SH NAME lndir \- create a shadow directory of symbolic links to another directory tree .SH SYNOPSIS Index: xc/config/util/makeg.man diff -u xc/config/util/makeg.man:1.1.1.2 xc/config/util/makeg.man:1.2 --- xc/config/util/makeg.man:1.1.1.2 Sun Sep 27 03:49:25 1998 +++ xc/config/util/makeg.man Sat Jan 27 13:19:55 2001 @@ -1,4 +1,4 @@ -.\" $TOG: makeg.man /main/2 1998/02/06 11:24:05 kaleb $ +.\" $Xorg: makeg.man,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ .\" Copyright (c) 1996, 1998 The Open Group .\" .\" All Rights Reserved. @@ -19,7 +19,10 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.TH MAKEG 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/util/makeg.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.\" +.TH MAKEG 1 __xorgversion__ .SH NAME makeg \- make a debuggable executable .SH SYNOPSIS Index: xc/config/util/makeg.sh diff -u xc/config/util/makeg.sh:1.1.1.2 xc/config/util/makeg.sh:1.1.1.3 --- xc/config/util/makeg.sh:1.1.1.2 Sat Dec 21 22:16:13 1996 +++ xc/config/util/makeg.sh Tue Jan 16 16:54:44 2001 @@ -1,6 +1,6 @@ #! /bin/sh # makeg - run "make" with options necessary to make a debuggable executable -# $XConsortium: makeg.sh /main/4 1996/06/13 11:45:08 ray $ +# $Xorg: makeg.sh,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ # set GDB=1 in your environment if using gdb on Solaris 2. Index: xc/config/util/makestrs.c diff -u xc/config/util/makestrs.c:3.4 xc/config/util/makestrs.c:3.5 --- xc/config/util/makestrs.c:3.4 Mon Oct 5 09:21:51 1998 +++ xc/config/util/makestrs.c Wed Jan 17 11:39:01 2001 @@ -1,4 +1,4 @@ -/* $TOG: makestrs.c /main/11 1998/02/06 11:24:15 kaleb $ */ +/* $Id */ /* @@ -21,7 +21,7 @@ in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/config/util/makestrs.c,v 3.4 1998/10/05 13:21:51 dawes Exp $ */ +/* $XFree86: xc/config/util/makestrs.c,v 3.5 2001/01/17 16:39:01 dawes Exp $ */ /* Constructs string definitions */ @@ -233,7 +233,7 @@ (void) fprintf (f, "%s\n%s\n/* %s ABI version -- Do not edit */\n", - "/* $TOG: makestrs.c /main/11 1998/02/06 11:24:15 kaleb $ */", + "/* $Xorg: makestrs.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $ */", "/* This file is automatically generated. */", abistring[abi]); @@ -404,7 +404,7 @@ (void) printf ("%s\n%s\n/* %s ABI version -- Do not edit */\n", - "/* $TOG: makestrs.c /main/11 1998/02/06 11:24:15 kaleb $ */", + "/* $Xorg: makestrs.c,v 1.5 2000/08/18 04:03:59 coskrey Exp $ */", "/* This file is automatically generated. */", abistring[abi]); Index: xc/config/util/makestrs.man diff -u xc/config/util/makestrs.man:3.3 xc/config/util/makestrs.man:3.7 --- xc/config/util/makestrs.man:3.3 Fri Oct 2 02:15:27 1998 +++ xc/config/util/makestrs.man Wed Feb 7 18:25:54 2001 @@ -1,4 +1,4 @@ -.\" $TOG: makestrs.man /main/4 1998/02/06 11:24:22 kaleb $ +.\" $Xorg: makestrs.man,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" All Rights Reserved. @@ -18,7 +18,10 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from The .\" Open Group. -.TH MAKESTRS 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/util/makestrs.man,v 3.7 2001/02/07 23:25:54 dawes Exp $ +.\" +.TH MAKESTRS 1 __xorgversion__ .SH NAME makestrs \- makes string table C source and header(s) .SH SYNOPSIS @@ -79,26 +82,26 @@ .SH SYNTAX The syntax for string-list file is (items in square brackets are optional): .RS 4 -#prefix +\&#prefix .RE .RS 4 -#feature +\&#feature .RE .RS 4 -#externref +\&#externref .RE .RS 4 -#externdef [] +\&#externdef [] .RE .RS 4 [#ctempl ] .RE .LP .RS 4 -#file +\&#file .RE .RS 4 -#table +\&#table .RE .RS 4 [#htempl] @@ -125,19 +128,19 @@ .RE .RS 4 -... + ... .RE .RS 4 -#table +\&#table .RE .RS 4 -...] + ...] .RE .RS 4 [#file .RE .RS 4 -...] + ...] .RE .LP In words you may have one or more #file directives. Each #file may have Index: xc/config/util/mdepend.cpp diff -u xc/config/util/mdepend.cpp:3.3 xc/config/util/mdepend.cpp:3.9 --- xc/config/util/mdepend.cpp:3.3 Mon Aug 7 23:16:26 2000 +++ xc/config/util/mdepend.cpp Thu Apr 26 16:55:10 2001 @@ -1,6 +1,6 @@ XCOMM!/bin/sh XCOMM -XCOMM $TOG: mdepend.cpp /main/13 1997/06/20 21:12:18 kaleb $ +XCOMM $Xorg: mdepend.cpp,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM Do the equivalent of the 'makedepend' program, but do it right. XCOMM @@ -22,7 +22,7 @@ XCOMM USG users will probably have to change "silent" to "-s" instead of XCOMM "-" (at least, that is what the documentation implies). XCOMM -XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.3 2000/08/08 03:16:26 dawes Exp $ +XCOMM $XFree86: xc/config/util/mdepend.cpp,v 3.9 2001/04/26 20:55:10 dawes Exp $ XCOMM CC=PREPROC @@ -66,7 +66,7 @@ endmarker="" else case "$1" in - -D*|-I*) + -D*|-I*|-U*) echo $n " '$1'$c" >> $ARGS ;; @@ -87,9 +87,13 @@ -f*) if [ "$1" = "-f-" ]; then makefile="-" - else + elif [ "$1" = "-f" ]; then makefile="$2" shift + else + echo "$1" | sed 's/^\-f//' >${TMP}arg + makefile="`cat ${TMP}arg`" + rm -f ${TMP}arg fi ;; -o) Index: xc/config/util/mergelib.cpp diff -u xc/config/util/mergelib.cpp:1.1.1.2 xc/config/util/mergelib.cpp:1.1.1.3 --- xc/config/util/mergelib.cpp:1.1.1.2 Sun Sep 27 03:49:21 1998 +++ xc/config/util/mergelib.cpp Tue Jan 16 16:54:47 2001 @@ -1,6 +1,6 @@ XCOMM!/bin/sh XCOMM -XCOMM $TOG: mergelib.cpp /main/5 1998/02/06 11:24:31 kaleb $ +XCOMM $Xorg: mergelib.cpp,v 1.3 2000/08/17 19:41:52 cpqbld Exp $ XCOMM XCOMM Copyright (c) 1989, 1998 The Open Group XCOMM Index: xc/config/util/mkdirhier.c diff -u xc/config/util/mkdirhier.c:1.3 xc/config/util/mkdirhier.c:1.4 --- xc/config/util/mkdirhier.c:1.3 Fri Oct 2 02:15:28 1998 +++ xc/config/util/mkdirhier.c Wed Jan 17 11:39:02 2001 @@ -1,4 +1,4 @@ -/* $TOG: mkdirhier.c /main/3 1998/02/06 11:24:37 kaleb $ */ +/* $Xorg: mkdirhier.c,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ */ /* Copyright (C) 1996, 1998 The Open Group Index: xc/config/util/mkdirhier.man diff -u xc/config/util/mkdirhier.man:1.1.1.4 xc/config/util/mkdirhier.man:1.2 --- xc/config/util/mkdirhier.man:1.1.1.4 Sun Sep 27 03:49:22 1998 +++ xc/config/util/mkdirhier.man Sat Jan 27 13:19:55 2001 @@ -1,4 +1,4 @@ -.\" $TOG: mkdirhier.man /main/10 1998/02/06 11:24:42 kaleb $ +.\" $Xorg: mkdirhier.man,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ .\" Copyright (c) 1993, 1994, 1998 The Open Group .\" .\" All Rights Reserved. @@ -18,7 +18,10 @@ .\" be used in advertising or otherwise to promote the sale, use or other .\" dealing in this Software without prior written authorization from The .\" Open Group. -.TH MKDIRHIER 1 "Release 6.4" "X Version 11" +.\" +.\" $XFree86: xc/config/util/mkdirhier.man,v 1.2 2001/01/27 18:19:55 dawes Exp $ +.\" +.TH MKDIRHIER 1 __xorgversion__ .SH NAME mkdirhier \- makes a directory hierarchy .SH SYNOPSIS Index: xc/config/util/mkdirhier.sh diff -u xc/config/util/mkdirhier.sh:1.1.1.1 xc/config/util/mkdirhier.sh:1.1.1.2 --- xc/config/util/mkdirhier.sh:1.1.1.1 Wed Apr 27 03:07:39 1994 +++ xc/config/util/mkdirhier.sh Tue Jan 16 16:54:48 2001 @@ -1,5 +1,5 @@ #!/bin/sh -# $XConsortium: mkdirhier.sh,v 1.7 94/03/24 15:46:34 gildea Exp $ +# $Xorg: mkdirhier.sh,v 1.3 2000/08/17 19:41:53 cpqbld Exp $ # Courtesy of Paul Eggert newline=' Index: xc/config/util/mkhtmlindex.pl diff -u /dev/null xc/config/util/mkhtmlindex.pl:1.3 --- /dev/null Mon Jun 4 09:29:13 2001 +++ xc/config/util/mkhtmlindex.pl Sun Mar 18 09:49:01 2001 @@ -0,0 +1,103 @@ +#!/usr/bin/perl +# +# $XFree86: xc/config/util/mkhtmlindex.pl,v 1.3 2001/03/18 14:49:01 dawes Exp $ +# +# Copyright © 2000,2001 by VA Linux Systems, Inc. +# +# Generate index files for HTML man pages. +# +# Author: David Dawes +# + +# +# Best viewed with tabs set to 4 +# + +if ($#ARGV ne 0) { + print STDERR "Usage: mkhtmlindex.pl htmlmandir\n"; + exit 1; +} + +$dir = $ARGV[0]; + +if (! -d $dir) { + print STDERR "$dir is not a directory\n"; + exit 1; +} + +@vollist = ("1", "2", "3", "4", "5", "6", "7", "8", "9", "o", "l", "n", "p"); + +$indexprefix = "manindex"; + +foreach $vol (@vollist) { + $empty = "yes"; + $indexname="$dir/$indexprefix$vol.html"; + + # print "Processing volume $vol\n"; + + open(mindex, ">$indexname") || die "Can't create $indexname"; + opendir(dir, "$dir") || die "Can't open $dir"; + + print mindex < + + + +XFree86[tm] Manual pages: Section $vol + + + +

XFree86[tm] Manual pages: Section $vol

+

+