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
Daniel Stone
3a23e49901
make XInput mandatory
...
Always build Xi, since GetPointerEvents/GetKeyboardEvents relies on it.
2006-07-21 15:19:51 -04:00
Daniel Stone
02d0910511
new KDrive input world order
...
Convert KDrive to GPE/GKE interface.
Add first-class drivers and enumerate every device separately through
Xi, instead of lamely attempting to aggregate them.
Add XKB support to the Linux keyboard driver.
Add 'thumb button' support to the tslib driver.
Rejig InitInput, so each DDX has to add a list of drivers it supports.
Support NewInputDeviceRequest, et al.
2006-07-21 15:19:51 -04:00
Daniel Stone
02a9531156
add basic D-BUS configuration mechanism
...
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device). Does not
link without an implemented NIDR.
2006-07-21 15:19:49 -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
Ian Romanick
12595a77d6
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-13 12:48:03 -07: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
Ian Romanick
fd49a0dcc1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-06 09:52:15 -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
Ian Romanick
e66e7b48e1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-05 15:21:36 -07: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
Ian Romanick
66cac9b174
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-06-28 14:11:49 -07: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
Ian Romanick
9d0a15dca5
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
...
Conflicts:
hw/xfree86/loader/xf86sym.c
2006-06-22 16:21:10 -07:00