Commit Graph

177 Commits

Author SHA1 Message Date
Alan Coopersmith ccf6636d2c Kill xf86getpagesize even harder (dummylib & ioport) 2008-01-02 19:28:33 -08:00
Adam Jackson 1faba797cb Death to libcwrapper.
This has been deprecated since 1.1.  Since we're breaking ABI again anyway,
remove it entirely.
2007-12-03 14:12:58 -05:00
Alan Coopersmith a55ec1a9f4 Restore checks for __i386 where needed for Sun compilers on Solaris 2007-11-20 18:31:07 -08:00
Adam Jackson d15339a92c Bug #9725: Don't look in root's $HOME for config files, that's just confusing. 2007-11-17 22:12:10 -05:00
Daniel Stone dda10c9066 Remove all traces of external RGB database (and Speedo)
Remove all references to an external RGB database (which hasn't been enabled
for a very long time).  Also get rid of some references to Speedo fonts.
2007-11-05 16:28:35 +00:00
Ben Byer 3d4eb17b38 mass change from #ifdef i386 to #ifdef __i386__ to conform to ANSI 2007-10-14 18:07:03 -07:00
Alan Coopersmith c7ead3a68e xorgcfg needs $(DIX_CFLAGS) for pixman-1 include path 2007-09-27 16:47:32 -07:00
Ian Romanick 8b6b40b727 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/generic.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/loader/xf86sym.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/Pci.h
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/int10/linux.c
2007-08-23 18:19:17 -07:00
Roland "Test-tools" Bär f6aa2200f2 Probable off by one buffer overflow in .../xorgconfig/xorgconfig.c
X.Org Bug #11858 <http://bugs.freedesktop.org/show_bug.cgi?id=11858>
Patch #11005 <http://bugs.freedesktop.org/attachment.cgi?id=11005>
2007-08-06 12:37:52 -07:00
Brice Goglin eba2be448b Minor fixes in cvt and gtf manpages
Reported by "A. Costa" <agcosta@gis.net> in
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=432065
2007-07-25 20:53:45 +02:00
Adam Jackson 4d76075dbb Death to RCS tags. 2007-06-29 14:06:52 -04:00
Adam Jackson f7f3fe7fe7 Remove the remnants of OS/2 support.
This has never worked in any modular server release, and as far as I know
was never tested in 6.7 through 6.9.
2007-06-28 18:59:05 -04:00
Ian Romanick ab7a6d860d Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
2007-06-18 16:51:13 -07:00
Magnus Vigerlöf 4771fa8747 XFree86: Fix memory leak in option parsing
Fix option parsing functions and callers thereof to not leak memory.
2007-04-10 23:58:20 +03:00
Ian Romanick e1f73d2208 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86Configure.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/lnx_pci.c
	hw/xfree86/scanpci/Makefile.am
	hw/xfree86/utils/pcitweak/Makefile.am
	hw/xfree86/utils/scanpci/Makefile.am
2006-12-08 17:24:15 -08:00
Alan Coopersmith f9f7d7f3be Check for __sparc as well as __sparc__ for compatibility with Sun cc
(gcc defines __sparc__, Sun cc defines __sparc)
2006-12-04 13:36:30 -08:00
Aaron Plattner ee9bdd3f4a Add DIX_CFLAGS to util builds.
Fixes a build breakage when $(top_srcdir) != $(top_builddir) because
-I$(top_srcdir)/include is missing for the cvt, ioport, pcitweak, and scanpci
builds.

Signed-off-by: Adam Jackson <ajax@nwnk.net>
2006-11-29 12:02:38 -08:00
Jeremy C. Reed a724b7f130 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-11-13 20:32:26 -06:00
Jeremy C. Reed 6facd958c2 On DragonFLy, default to /dev/sysmouse (just like on FreeBSD).
TODO: use autoconf to handle this so the code is not platform
based but feature based.
2006-11-13 20:23:06 -06:00
Ian Romanick 8b90913566 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/scanpci/extrapci.ids
	hw/xfree86/scanpci/pci.ids
	hw/xfree86/scanpci/pciid2c.pl
	hw/xfree86/scanpci/xf86PciStdIds.h
2006-10-24 08:57:59 -07:00
Daniel Stone c5b5b046e8 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-10-23 02:58:30 +03:00
Carl Switzky edd5f17454 Add ast driver/device info to Xorg server & config utilities 2006-10-19 17:30:54 -07:00
Alan Coopersmith 5563861ab7 Make sure xorgcfg files are included even when dist made with --disable-xorgcfg 2006-10-20 00:42:07 +03:00
Alan Coopersmith b9108a13fc Make sure xorgcfg files are included even when dist made with --disable-xorgcfg 2006-10-13 19:05:28 -07:00
Daniel Stone 59dcc62906 xfree86: remove Xqueue support completely 2006-08-12 20:39:08 +03:00
Tiago Vignatti ab3ebfefdb xorgcfg: fix compilation error
Add missing parentheses to IS_KBDDRIV macros.
2006-08-08 12:00:34 +03:00
Ian Romanick 69533fc04f Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86AutoConfig.c
2006-07-31 09:26:04 -07:00
Daniel Stone 87fe85f38b Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-30 10:51:34 +03:00
Luc Verhaegen 79016d4036 Bug #5386 (partial): Move CVT mode generator from cvt(1) to server core, and
export it from the X server to modules.
2006-07-28 16:02:02 -04:00
Ian Romanick 380b51d605 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86Init.c
	hw/xfree86/int10/pci.c
	hw/xfree86/scanpci/xf86PciData.h
	hw/xfree86/scanpci/xf86PciStdIds.h
	hw/xfree86/scanpci/xf86PciStr.h
	hw/xfree86/scanpci/xf86ScanPci.h
	hw/xfree86/utils/pcitweak/pcitweak.c
	hw/xfree86/utils/scanpci/scanpci.c

Re-removed most of the conflicting files.
2006-07-25 11:30:04 -07:00
Ian Romanick 7dff8d98a9 Remove source files that have been dead since day-1 of this branch. 2006-07-24 11:56:37 -07:00
Daniel Stone 7465010d59 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-21 19:05:41 -04:00
Ian Romanick 07ad92d2c4 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
2006-07-21 15:25:35 -07:00
Adam Jackson 0aaac95b0d Remove RCS tags. Fix Xprint makefile braindamage. 2006-07-21 17:56:00 -04:00
Kristian Høgsberg 3eeb62e8f5 bug #890: completely remove deprecated keyboard driver
Remove all remnants of the old built-in keyboard driver.
2006-07-21 16:33:28 -04:00
Daniel Stone 84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
2006-07-18 18:17:38 -04:00
Ian Romanick 75398cff82 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	hw/xfree86/loader/Makefile.am
	hw/xfree86/loader/xf86sym.c
2006-06-20 15:49:47 -07:00
Eric Anholt 21ef7e17ef Add some missing .gitignore stuff for Mesa symlinks and other generated files. 2006-06-18 19:47:51 -07:00
Ian Romanick 46f55f5dea Initial batch of changes for PCI rework. All future changes will be
tracked individually.
2006-06-07 14:09:02 -07:00
Jeremy C. Reed 6930794423 NetBSD also has curses.h instead of ncurses.h. (TODO: Maybe instead of
checking for SCO, UnixWare, Sun SVR4 and NetBSD, the curses.h versus
    ncurses.h should be tested in configure.)
2006-05-24 22:58:03 +00:00
Adam Jackson fc91ca069d Redact a few mentions of speedo font support. 2006-05-03 17:50:10 +00:00
Donnie Berkholz 782d61a031 Update all prefixes in config tools, so they mostly work again. Also, make
RgbPath commented out when using xorgconfig. Start using
    /dev/input/mice as the default mouse location on Linux.
2006-04-18 17:28:44 +00:00
Luc Verhaegen 6d29f65931 CVT means Coordinated Video Timing instead of Common. 2006-04-14 23:01:35 +00:00
Daniel Stone 843146cfba Coverity #1216: Fix double-close of file on error. 2006-04-07 15:53:21 +00:00
Adam Jackson a68c11bb1d Mark everything in xf86sym.c as _X_EXPORT. 2006-03-25 19:52:05 +00:00
Alan Coopersmith b1b731c286 Fix buffer size checks to prevent 2-byte buffer overflows. (Coverity #480,
#481, #482, #483)
2006-03-11 02:43:51 +00:00
Alan Coopersmith f2ecbb3018 Pass sizeof the correct buffer to XmuSnprintf. (Coverity #489) 2006-03-11 01:58:32 +00:00
Matthieu Herrb d921173833 define SYS_LIBS to hold system dependant libraries that may needed. and add
it to libraries list where needed. Update ChangeLog for previous
    changes too
2006-03-05 16:35:08 +00:00
Eric Anholt c3d1403672 Remove libcwrapper usage from xorg server modules. The libcwrapper is only
of (marginal) use in the drivers, and that usage remains.
2006-02-10 22:00:30 +00:00
Luc Verhaegen 437b385ce4 Bring the cvt utility up to date with bug #5386 changes. Fix 2 issues with
the generator routine: the allocated modeline wasn't nulled and
    mode->name's \0 wasn't copied over. PrintModeLine was rewritten and
    HDisplay gets rounded up to character width instead of refused.
2006-01-31 13:55:01 +00:00
Eric Anholt 7aa0ea23bc Add an empty all-local target for FreeBSD make's sake, which doesn't deal
with .PHONY.
2005-12-30 04:11:42 +00:00
Luc Verhaegen 3664c3ebf3 Bug #5153: standalone CVT modeline generator.
- add hw/xfree86/utils/cvt/, cvt.c, cvt.man.pre and Makefile.am.
- Adjust configure.ac and hw/xfree86/utils/Makefile.am for cvt.
- Add MonPtr->reducedblanking and Option "ReducedBlanking" to the Monitor
    section.
- Check for reduced blanking in xf86CheckModeForMonitor and disallow modes
    with less than 25% blanking otherwise.
- Fix some warnings in hw/xfree86/common/xf86Config.c.
2005-12-28 15:22:21 +00:00
Kevin E Martin 008c2dd5e4 Add configure options to allow hard-coded paths to be changed. 2005-12-08 17:55:19 +00:00
Kevin E Martin 39189c2b86 Allow hard-coded paths to be configurable. 2005-12-08 17:54:40 +00:00
Kevin E Martin 20c0ebe7b3 Change to use the app-defaults default dir configured in libXt. 2005-12-07 16:18:02 +00:00
Kevin E Martin 4a39354e14 Change *man_SOURCES ==> *man_PRE to fix autotools warnings. 2005-12-06 22:48:51 +00:00
Kevin E Martin 7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Kevin E Martin da5d66f2ff Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
2005-11-29 16:39:33 +00:00
Alan Coopersmith 51a721a6db Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
2005-11-28 22:05:09 +00:00
Kevin E Martin 381931b15b Add configure option to install libxf86config.a (disabled by default). 2005-11-23 07:14:46 +00:00
Eric Anholt 594ca0966e Bug #5118: Use "rm -f" instead of "$(RM)", which isn't always defined. 2005-11-22 02:11:00 +00:00
Kevin E Martin 63aa96c08a Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
    with separate build roots.
2005-11-19 07:15:50 +00:00
Alan Coopersmith 267cbffa41 Bug #5019 <https://bugs.freedesktop.org/show_bug.cgi?id=5019> xserver
installs manpages into 'man1' instead of 'man1x'
2005-11-13 20:53:24 +00:00
Kean Johnson 5390c7ab05 See ChangeLog entry 2005-11-07 for details. 2005-11-08 06:33:30 +00:00
Kevin E Martin 90cf8e339b Fix vendor string and release version reported by the servers. Enable
security, lbx and xevie extensions to give us parity with monolithic
    tree.
2005-11-03 17:08:06 +00:00
Kevin E Martin 462a2407d5 Add xorg-server.m4 for driver dependency checking.
Update pkgcheck depedencies to work with separate build roots.
2005-11-01 15:01:51 +00:00
Alan Coopersmith 79e6ac79f9 Don't use $< in explicit rules since neither BSD nor Solaris make allow
that.
2005-10-18 07:18:21 +00:00
Alan Coopersmith d6a40bcd4a Change default install dir for app-default files from
$(sysconfdir)/X11/app-defaults to $(libdir)/X11/app-defaults to match
    the monolith & allow localization
2005-10-18 00:32:55 +00:00
Adam Jackson 151ba8b67f Work around automake-1.7 braindamage by providing an explicit rule for
XOrgCfg.
2005-10-17 22:25:58 +00:00
Alan Coopersmith 8df7628a2a Remove reference to XF86config-4. Add xorgcfg(1) to See Also list. 2005-10-14 00:41:51 +00:00
Alan Coopersmith b54c8154ca Set substitutions needed in xorgconfig man page. 2005-10-14 00:34:49 +00:00
Alan Coopersmith 370b8c8f1c App-defaults file not supposed to have .ad suffix when installed Fix cpp
rules to set needed flags for app-defaults file
2005-10-06 20:14:43 +00:00
Adam Jackson 8391eaa4aa Preprocess and install XOrgCfg.ad as in the monolith. 2005-10-05 21:13:49 +00:00
Alan Coopersmith cdded97a0a Add #include <xorg-config.h> for modular build 2005-10-04 00:45:42 +00:00
Alan Coopersmith 4ae4fc7d51 Add gtf to xserver/xorg/hw/xfree86/utils 2005-10-04 00:43:16 +00:00
Alan Coopersmith 4608a2b654 Man page processing/installation and other doc file updates 2005-09-30 02:37:57 +00:00
Søren Sandmann Pedersen c65fde5343 Make the server distcheck:
- Fix up the XpConfig directory to remove the stuff it installs
- Add a few files to CLEANFILES here and there
2005-09-28 20:38:42 +00:00
Alan Coopersmith f53404bdbb Add kbd_mode build system 2005-09-28 16:55:25 +00:00
Alan Coopersmith 806d74bc06 Add __SVR4 #ifdefs to work in non-Imake builds. 2005-09-28 01:57:47 +00:00
Kevin E Martin 88957862b8 Fix distcheck build and install errors. 2005-09-27 23:28:46 +00:00
Alan Coopersmith 8907195d78 Take care of more files from monolith's Xserver/hw/xfree86/etc dir:
hw/xfree86/utils/ioport/Makefile.am
Add ioport and pcitweak utils from monolith hw/xfree86/etc dir.
Generate xf86DefModeSet.c from vesamodes & extramodes
Add apSolaris.shar to EXTRA_DIST
2005-09-26 20:58:26 +00:00
Alan Coopersmith 0531c4be2f alanc@alf:/export/alanc/X.org/head/cvs-rw/xc [7:40pm - 628] head -14
ChangeLog
include xorg-config.h for modular build
Adjust XF86CONFIG defines for modular build
Fixes for modular build:
- include modular server config headers
- change default XCONFIGFILE to xorg.conf
- define XKB_RULES_DIR if not defined by Imake
2005-09-26 02:41:38 +00:00
Alan Coopersmith a5477ae7ac Add scanpci, xorgcfg, & xorgconfig utilities. 2005-09-24 02:40:51 +00:00
Alan Coopersmith 7554e1bf29 Sun bug #6321613
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6321613>
    xorgcfg dumps core when it reads a configuration file that has a
    Monitor Section, but does not have a "VendorName" entry inside it.
    (Henry Zhao, Sun Microsystems)
2005-09-23 00:27:07 +00:00
Alan Coopersmith 344a24b622 Use system curses library on Solaris for xorgcfg text mode. 2005-08-25 04:09:45 +00:00
Alan Coopersmith 9f498a37dd Display more friendly mouse protocol names. Enable mouse wheel mapping by
default.
2005-08-23 20:58:29 +00:00
Alan Coopersmith e848eb289c Rename app-defaults entries from xf86cfg to xorgcfg to match name passed to
XtAppInitialize. (Henry Zhao, Sun Microsystems) Also, display vendor
    version instead of 4.0 for server version.
2005-08-23 01:14:35 +00:00
Alan Coopersmith 6076fca825 User message cleanups/updates for modern configurations. 2005-08-23 00:32:27 +00:00
Alan Coopersmith ea5c49cb17 //bugs.freedesktop.org/show_bug.cgi?id=2901> Patch #2331
<https://bugs.freedesktop.org/attachment.cgi?id=2331> Lines ending in
    <backslash><space> break with cpp from gcc >= 3.3 (Peter Breitenlohner)
2005-08-18 01:40:33 +00:00
Alan Coopersmith d6808a48d2 Fix scanpci -v core dump when subsys vendor/device id's are NOVENDOR &
NODEVICE. Bug #3763 <https://bugs.freedesktop.org/show_bug.cgi?id=3763>
    Patch #3074 <https://bugs.freedesktop.org/attachment.cgi?id=3074>
2005-07-12 18:16:03 +00:00
Alan Coopersmith 7da3f4a786 Bug #2901 <https://bugs.freedesktop.org/show_bug.cgi?id=2901> Fix warnings
about redefined macros (Peter Breitenlohner)
2005-07-07 03:12:40 +00:00
Daniel Stone 0bb669638f Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h". 2005-07-03 08:53:54 +00:00
Daniel Stone e03198972c Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.
Add XSERV_t, TRANS_SERVER, TRANS_REOPEN to quash warnings.
Add #include <dix-config.h> or <xorg-config.h>, as appropriate, to all
    source files in the xserver/xorg tree, predicated on defines of
    HAVE_{DIX,XORG}_CONFIG_H. Change all Xfont includes to
    <X11/fonts/foo.h>.
2005-07-03 07:02:09 +00:00
Daniel Stone 9b1debcdb6 Change all misc.h and os.h references to <X11/foo.h>. 2005-07-01 22:43:43 +00:00
Eric Anholt 0802a2824c Correct the CHIPSET lines for the 3dfx cards so the tdfx driver will
recognize them. I'm not sure if this file is supposed to be maintained
    still, but I'd like to close FreeBSD ports/32121 which has been around
    for far too long.
2005-06-13 18:14:53 +00:00
Alan Coopersmith cebd7348d2 Change hardcoded /usr/X11R6 to PROJECTROOT. Change hardcoded XF86Config to
XCONFIGFILE.
2005-05-28 00:08:03 +00:00
Alan Coopersmith a8a61bbe22 Initial experimental support for AMD64 builds on Solaris 10 x86. Improved
support for 64-bit SPARC builds on Solaris as well.
2005-05-21 07:46:38 +00:00
Alan Coopersmith 0e80fe0e60 Clean up formatting, projectroot substutition, and grammatical nits. 2005-04-22 22:11:26 +00:00
Daniel Stone 292c4cff26 Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
2005-04-20 12:25:48 +00:00
Egbert Eich de5d24a200 Fixed sentinels in Xt, editres and xedit to reduce number of warnings with
gcc4 (Andreas Schwab).
2005-04-04 10:17:06 +00:00