Eric Anholt
b4b0d901d9
Merge branch 'randr-1.2'
...
Conflicts:
dix/events.c
dix/getevents.c
hw/xfree86/common/xf86Mode.c
hw/xfree86/dri/Makefile.am
hw/xfree86/os-support/drm/xf86drm.c
hw/xfree86/os-support/xf86drm.h
2006-11-27 15:43:15 -08:00
Aaron Plattner
64de3baf85
Add a -showDefaultLibPath option.
...
A corollary to the previous change, this option prints $libdir.
2006-11-22 14:46:51 -08:00
Jeremy C. Reed
2eab230d9b
For NetBSD, define PCVT_SUPPORT (System has PCVT console).
...
Noticed by Joerg Sonnenberger. This fixes problem with console
switching.
This was in original imake NetBSD.cf.
2006-11-14 16:37:18 -06:00
Adam Jackson
f80a8ae6e6
Disable Xprt server build by default.
2006-11-13 18:26:05 -05:00
George Sapountzis
5bfe7f4dfc
DRI: call drmSetServerInfo() before drmOpen().
...
Also, remove some libdrm remnants.
2006-11-13 01:54:32 +02:00
Dave Airlie
fd91630b73
make X server use system libdrm - this requires libdrm >= 2.3.0
...
This patch blacklists the load "drm" line, moves some functions in dri module
links dri module against libdrm, and removes the X copy of libdrm
2006-11-09 09:30:33 +11:00
Daniel Stone
b0a7443ca8
configure.ac: axe redundant SDL test
2006-11-08 15:30:03 +02:00
Keith Packard
028bbdc041
Merge master back to randr-1.2
2006-11-04 17:46:26 -08:00
Keith Packard
8b87ce1974
Allow X server to build against libdrm 2.1
2006-11-04 17:41:25 -08:00
Samuel Thibault
412e93349e
kdrive: make building of Linux support conditional (bug #5613 )
...
Only try to build Linux support on Linux. We should probably disable all
OS-dependent DDXes if we don't have a workable OS (and only build
Xephyr/Xfake), but that's future work.
2006-11-04 19:08:23 +02:00
Alan Coopersmith
49a26681b2
Add DTrace probe points for X server <-> client communications
...
See http://people.freedesktop.org/~alanc/dtrace/ for more details
2006-11-03 12:54:43 -08:00
Keith Packard
543b397277
Merge branch 'origin' into randr-1.2
2006-11-02 19:00:35 -08:00
Daniel Stone
64139c1950
bump to 1.2.99.0
2006-11-02 03:22:09 +02:00
Daniel Stone
be291a6d97
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-11-02 03:15:25 +02:00
Alan Coopersmith
40f84793bc
Propogate $LIBS for xtrans, clock_gettime, libm, etc. to libs used for each server
2006-11-01 14:34:46 -08:00
Daniel Stone
d7d931abe0
configure.ac: remove check for rate/period
...
Keyboard stuff is now handled in the kbd driver.
2006-11-01 23:48:58 +02: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
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
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 cde6872886
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
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
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
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
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
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
Alan Coopersmith
1e8a594957
Fix Solaris build with Sun compilers to work when exa is built before
...
hw/xfree86/os-support/solaris (as it is by default now).
2006-05-02 01:37:25 +00:00
Adam Jackson
4ae1263669
Remove cfb16, no longer used.
2006-04-06 18:59:11 +00:00
Fredrik Höglund
e1fc15a85f
Put the screensaver extension back in the Xext module.
...
Move the screenSaverSuspended variable to DIX globals.
Restore the old link order for the Xorg and Xdmx binaries.
2006-04-05 21:08:45 +00:00
Adam Jackson
c6b3b3354c
Bump to 1.1.99.1.
2006-04-02 22:51:42 +00:00
Adam Jackson
323fec2029
Reorder link order for Xdmx to fix new screensaver variable reference
...
properly; remove previous awful hack.
2006-04-02 00:46:20 +00:00
Adam Jackson
e5b1d38e14
Disable Xprint freetype support momentarily. Needs ttf2pt1.c, which exists
...
in the monolith but has an advertising clause in the license.
2006-04-01 23:53:33 +00:00
Daniel Stone
1e764feab5
Bug #5801 : Check for MTRR support under Linux. Minor refactoring of MTRR
...
checks for other OSes.
2006-04-01 21:20:31 +00:00
Daniel Stone
978c7b14a1
Make Xprint AC_ARG_ENABLEs and AC_ARG_WITHs unconditional also.
2006-04-01 21:02:40 +00:00
Daniel Stone
71a6f2ef6c
Unconditionally run XP_USE_FREETYPE AM_CONDITIONAL, not only in the Xprint
...
path.
2006-04-01 20:58:42 +00:00
Fredrik Höglund
7ea30b507f
Move the screensaver extension from module to builtins.
...
Add the server side implementation of the ScreenSaverSuspend request.
Require scrnsaverproto >= 1.1, and change the linking order of the Xorg
static libs.
2006-03-31 18:49:38 +00:00