SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,405 Commits 4 Branches 0 Tags
cc7dedd6b51a01996ddab10fe8b84e30700d1570
Commit Graph

980 Commits

Author SHA1 Message Date
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
cdc8a4b7b2 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-10-26 00:28:30 +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
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
29f28dd1a8 configure.ac: add XSERVER_LIBS to XNEST_LIBS 2006-10-23 02:52:52 +03:00
Joshua Baergen
c5dc997baf Create xorg.conf.example (Gentoo bug #138623). 2006-10-20 00:43:10 +03:00
Alan Coopersmith
d029c8f1b7 Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris 2006-10-20 00:43:10 +03:00
Adam Jackson
80642f37d4 Stop building xorgcfg by default. 2006-10-20 00:43:09 +03: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
Daniel Stone
335b503c5e Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-10-13 18:10:45 +03: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 cde68728860179dc84e615ccb378ce992513fd62 commit)
 2006-10-09 17:25:10 -07:00
Daniel Stone
9e37de193f configure.ac: reactivate warnings when building with gcc 
We were inadvertently stomping XSERVER_CFLAGS after adding the warnings, so
move them after we do that.
 2006-10-08 16:32:15 +03: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
Daniel Stone
a5d639cd87 remove merge detritus 2006-09-27 16:15:27 +03:00
Daniel Stone
ad321fad4b Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-09-24 17:56:43 +03: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
Daniel Stone
5e9d33fe87 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-09-07 15:43:31 +03: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
4524a2bf6f configure.ac: move tslib from KDRIVE_PURE_LIBS to KDRIVE_LIBS 
Yeah.  That was dumb.
 2006-08-29 23:49:26 +03:00
Daniel Stone
260c3f32b6 configure.ac: fix XSDL test 2006-08-29 23:18:12 +03:00
Daniel Stone
cff23616fe configure.ac: allow disabling of XSDL 2006-08-29 22:44:09 +03:00
Ian Romanick
21291d6ca7 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-08-25 09:34:21 -07:00
Daniel Stone
5fb8d947bb configure.ac: more thinkos 
Fix auto tests for vidmode and xf86dga.  I win at life.
 2006-08-24 23:16:43 +03:00
Daniel Stone
866ca1f929 configure.ac: fix XF86VidMode test 2006-08-24 15:46:44 +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
Daniel Stone
a56b98bb04 dix: enable null root cursor 
Enable a blank root cursor, selectable with --enable-null-root-cursor at
configure time.
 2006-08-18 18:10:09 +03:00
Daniel Stone
d6433be3cc Merge branch 'master' into input-hotplug 2006-08-12 21:50:52 +03: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
9525c2709e configure.ac: fix xephyr conditionals 
Fix Xephyr build conditions, allowing it to actually be disabled.
 2006-08-10 20:29:57 +03:00
Daniel Stone
6d8d4abaaa configure.ac: allow conditional building of XF86{DGA,Misc,VidMode} 
Allow conditional building of the above three extensions, defaulting to
auto.
 2006-08-10 20:28:06 +03:00
Daniel Stone
c85e64cba1 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-08-07 15:54:55 +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
ed0c807de9 bump to 1.1.99.3 2006-07-30 11:08:54 +03: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
Adam Jackson
990a400905 Remove getconfig horrorshow. Replace with a static built-in rule list for now. 2006-07-26 19:03:39 -04:00
Ian Romanick
28ba8d5691 Gut anything having to do with the PciBusPtr (or PciBusRec) type. 
Bump required version of libpciaccess to 0.5.0 so that
pci_device_get_bridge_buses can be used.
 2006-07-25 15:38:09 -07: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
Daniel Stone
87a6346bf7 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-21 19:36:25 -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
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
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
ecfad74c48 add support for built-in fonts 
Use --enable-builtin-fonts to only use built-in fonts, and avoid loading
fonts.
 2006-07-21 15:19:52 -04:00