Commit Graph

243 Commits

Author SHA1 Message Date
Keith Packard
8b87ce1974 Allow X server to build against libdrm 2.1 2006-11-04 17:41:25 -08:00
Keith Packard
543b397277 Merge branch 'origin' into randr-1.2 2006-11-02 19:00:35 -08:00
Thomas Hellstrom
06b6b971d0 Make sure we have 64-bit file-offsets in libdrm. 2006-10-29 15:22:37 +01:00
Thomas Hellstrom
92d04e746b Import libdrm functions for the drm memory manager. 2006-10-27 18:26:30 +02:00
Daniel Stone
004d00e668 GetTimeInMillis: simplify monotonic test
We don't actually need to get the CPU clock ID, which means we don't need
the monotonic_usable test.  Since there's now only one branch, the
compiler will treat that as likely, so we don't need xproto 7.0.9 anymore.

The fallthrough to gettimeofday() is preserved.
2006-10-26 01:10:08 +03:00
Daniel Stone
d285833290 GetTimeInMillis: spuport monotonic clock
Add support for CLOCK_MONOTONIC from clock_gettime, and use that in
GetTimeInMillis() if available, falling back to the old gettimeofday()
implementation.

This is _slightly_ faster on some 64-bit architectures, and _slightly_
slower on others (though barely measurable).
2006-10-25 23:57:00 +03:00
Keith Packard
59511974db Merge branch 'master' into randr-1.2 2006-10-24 17:26:20 -07:00
Joshua Baergen
62d2409793 Create xorg.conf.example (Gentoo bug #138623). 2006-10-19 11:14:26 -07:00
Alan Coopersmith
357b37b382 Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris 2006-10-18 18:11:06 -07:00
Adam Jackson
5eca750fe2 Stop building xorgcfg by default. 2006-10-17 14:53:28 -04:00
Alan Coopersmith
6776c0f0e9 Use bash on Solaris to run symlink-mesa.sh
symlink-mesa.sh won't run with Solaris Bourne Shell (/bin/sh) so explicitly
run it with /usr/bin/bash instead
(cherry picked from cde6872886 commit)
2006-10-09 17:25:10 -07:00
Alan Coopersmith
4c34224630 Merge branch 'XACE-modular' 2006-10-06 18:01:13 -07:00
Keith Packard
b4659faf9b Merge branch 'master' into randr-1.2 2006-10-04 14:46:04 -07:00
David Nusinow
a10039a100 Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev. 2006-09-21 23:58:32 -04:00
Keith Packard
2be1ac15ae Remove smashing of CFLAGS from server build.
CFLAGS is a user variable, extracted from the environment at configure time
and settable by the user at build time. We must not override this variable.
2006-09-18 12:11:18 -07:00
Eamon Walsh
0b81fccd2e Merge branch 'master' into my-XACE-modular
Conflicts:

	configure.ac
2006-09-05 18:03:25 -04:00
Matthew Allum
5ddbf4bcd4 Re-add support for tslib (1.0 release) and Xcalibrate extension. 2006-08-29 22:07:15 +01:00
Daniel Stone
cff23616fe configure.ac: allow disabling of XSDL 2006-08-29 22:44:09 +03:00
Alan Coopersmith
05541259bd Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular 2006-08-21 13:07:41 -07:00
Samuel Thibault
e641000b98 xfree86: add Hurd support (#5613)
Add support for GNU/Hurd.
2006-08-12 19:41:59 +03:00
Daniel Stone
5a3488ccac configure.ac: fix execinfo.h test (Debian #363218)
Define HAVE_EXECINFO_H as well as HAVE_BACKTRACE, when we find execinfo.h.
2006-08-12 19:25:06 +03:00
Alan Coopersmith
c2535f6792 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular 2006-08-10 10:37:59 -07:00
Daniel Stone
ed0c807de9 bump to 1.1.99.3 2006-07-30 11:08:54 +03:00
Adam Jackson
990a400905 Remove getconfig horrorshow. Replace with a static built-in rule list for now. 2006-07-26 19:03:39 -04:00
Daniel Stone
0486d3966d fix kbproto dependency
Depend on kbproto >= 1.0.3, for unconditional definition of
XkbSA_XFree86Private.
2006-07-21 19:35:04 -04:00
Daniel Stone
00b24f119f fix minor typo 2006-07-21 15:16:58 -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
Gustavo Pichorim Boiko
10f3e32726 Fix the configure check for the --{enable,disable}-dpms option 2006-07-10 16:37:53 -07:00
Tilman Sauerbeck
39b2f7b218 Bug #3042: Use autoconf to get the correct name of a struct member.
This allows us to remove the kernel version ifdefs from the code, which
are ugly and broken.
2006-07-08 19:55:53 +02:00
Keith Packard
f847f3c0a9 xorgcfg now needs libxkbui version 1.0.2 or better.
Old versions of libxkbui use XkbStrCaseCmp which doesn't exist any longer;
the server fails to link with that version of the libkbui library, so
require the current version (1.0.2).
2006-07-06 15:33:31 -07:00
Keith Packard
27ffd7e03c GL proto version 1.4.7 needed for texture-from-pixmap defines.
GLX_TEXTURE_TARGET_EXT and GLX_TEXTURE_RECTANGLE_EXT are defined as a part
of the new texture from pixmap GL extension in gl proto version 1.4.7 and
are now used by the X server code.
2006-07-06 14:43:10 -07:00
Kristian Høgsberg
28b95fd9d1 Drop unused GL/include subtree.
Woo, less Makefile's to generate.
2006-07-06 03:25:38 -04:00
Eric Anholt
a838fb70c5 Bump server version to 7.1.99.2 for gradient and repeat fixes. 2006-07-03 19:24:01 +02:00
Eric Anholt
adfe8e7437 Bump server release to 7.1.99.1.
This will be important for a couple of cairo workaround tests.
2006-06-27 21:49:00 +02:00
Adam Jackson
bf17c6dede Drop libz from the server's link line, it was only needed for LBX. 2006-06-22 12:24:09 -04:00
Alan Coopersmith
3f19803e0b APPGROUP requires both X-ACE & XC-SECURITY now 2006-06-21 18:05:51 -07:00
Alan Coopersmith
f68ecfa482 Add X-ACE to build system
- Added --disable-xace to configure.ac and issue configure error if trying
   to build XC-Security without X-ACE
 - Added XACE #define to dix-config.h
 - Added X-ACE sources to Xext/Makefile.am
2006-06-20 19:01:34 -07:00
Alan Coopersmith
481d4012e7 Don't add -ldl to XORG_LIBS if it's not needed for dlopen 2006-06-20 16:16:19 -07:00
Adam Jackson
a28652f9c3 Another round of loader sense-beating. Remove the (unused) server export
lists, a really bad hash table, the last vestiges of the other backends,
and some miscellaneous cleanups.  Good for dropping 300k from the size of
the built server on x86.
2006-06-19 00:57:18 -04:00
Adam Jackson
71fbda8049 Xprint/ -> hw/xprint
XpConfig -> hw/xprint/config
2006-06-18 21:07:28 -04:00
Daniel Stone
ddc6b99505 Bump to 1.1.99.2. 2006-06-03 11:24:33 +00:00
Daniel Stone
8e8c6faecd Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno) 2006-06-03 10:48:37 +00:00
Daniel Stone
a9ed5a8790 Kill LBX, too. 2006-06-01 22:06:41 +00:00
Daniel Stone
6d594ebc66 Ditch more alternate-loader braindamage. 2006-06-01 20:22:39 +00:00
Jeremy C. Reed
9477e5e0be On NetBSD, add -li386 for i386 and -lx86_64 for x86_64 to SYS_LIBS. (x86_64
on NetBSD not tested.)
2006-05-24 22:43:13 +00:00
Alan Coopersmith
eb696f72a0 Add AC_SUBST([SOLARIS_ASM_CFLAGS]) that I forgot when splitting them out of
the XORG_CFLAGS.
2006-05-23 16:17:09 +00:00
Adam Jackson
321dbed5f5 Bug #5209: Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev) 2006-05-15 18:27:18 +00:00
Matthieu Herrb
dd38d3bd67 Don't use AM_CONDITIONAL inside shell conditionals. Bugzilla #6916. 2006-05-14 16:22:24 +00:00
Adam Jackson
86ffb46358 Bug #5209: Re-enable building APM and ACPI support. (Michel Dänzer) 2006-05-09 18:04:29 +00:00
Alan Coopersmith
b46d6a44fa Make Xephyr build on Solaris:
Add #include <sys/file.h> on Solaris for FNONBLOCK/FASYNC definitions
hw/kdriver/linux/Makefile.am Move agp.c & agp.h to KDRIVE_HW_SOURCES since
    they're not needed for Xephyr-only builds
Add -lrt to XEPHYR_LIBS if needed to get nanosleep().
2006-05-03 23:45:16 +00:00