andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,823 Commits 86 Branches 473 Tags 48 MiB
782394fe53
Commit Graph

536 Commits

Author SHA1 Message Date
Eamon Walsh
23fc429aad Merge branch 'master' into XACE-SELINUX 2007-03-05 12:18:54 -05:00
Ben Byer
7f2b9f3790 autoconf fixes for XDarwin (created DARWIN_LIBS) 2007-03-03 19:27:53 -08:00
Matthias Hopf
b11dfac287 Legacy framebuffer support wasn't compiled if Xorg wasn't explicitly enabled. 2007-03-02 12:30:26 +01:00
Eamon Walsh
c16343ac2c Make mfb, cfb, and afb support configurable at build-time. 2007-02-27 14:14:47 -05:00
Ben Byer
4660eaaffb configure fixes for darwin 2007-02-18 14:09:51 -08:00
Daniel Stone
a88844eccb configure.ac: disable dmx per default 
Disable DMX until it gets ported to the new input API.
 2007-02-17 20:35:39 +02:00
Ben Byer
d287b76471 cleaned up some linking ugliness in hw/darwin/quartz 2007-02-17 03:47:42 -08:00
Ben Byer
81444486be autoconf goodness for XDarwin, courtesy of pogma 2007-02-17 02:23:11 -08:00
Ben Byer
cece060157 build fix for configure.ac / BUILD_DARWIN, oops 2007-02-17 01:00:13 -08:00
Keith Packard
d4eb4d0650 Merge crtc/output-based mode selection code. 
This code comes from the intel driver, so there's no history in this tree.

As the crtc/output-based mode selection code uses ddc, the ddc and i2c
modules have been merged into the server. Attempts to load them are safely
ignored now.
 2007-02-15 20:36:20 -08:00
Daniel Stone
8f6961d385 configure.ac: add xdarwin stubs 
Add stub AM_CONDITIONALs to at least fix the build.
 2007-02-15 19:08:46 +02:00
Daniel Stone
a3b62623b8 change versioning for new server version scheme 
See:
http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446
 2007-02-15 17:07:42 +02:00
Eamon Walsh
f452507ca9 Merge branch 'master' into my-XACE-SELINUX 2007-02-15 09:47:20 -05:00
Eamon Walsh
04632835b7 Merge branch 'master' into my-XACE-SELINUX 2007-02-15 09:27:05 -05:00
Ian Romanick
c4fe1bcce1 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-02-14 15:39:52 -08:00
Adam Jackson
d21c95f80b Hook up --with-builderstring for vendor build identification. 2007-02-12 17:22:39 -05:00
Ian Romanick
16eb7254f8 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-02-09 12:38:49 -08:00
Alan Hourihane
eb228e8d1e clean up more of the vbo fallout 2007-02-04 22:06:59 +00:00
Dave Airlie
d8e148ec84 update xserver for vbo code in mesa 2007-02-04 18:39:04 +11:00
Ian Romanick
a216de9b7f Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-01-25 10:17:32 -08:00
Alan Coopersmith
5abd50e37c Correct help lines for configure's --with-vendor-name flags 2007-01-24 18:54:38 -08:00
Ian Romanick
c279d5fdc5 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-01-19 12:59:54 -08:00
Ian Romanick
079a6a55a5 Convert to new pci_device_cfg_write_u* interface. 2007-01-15 11:39:24 -08:00
Eric Anholt
7fccec91c4 Bug #9555: Always define _GNU_SOURCE in glibc environments. 
This keeps us from having to define _POSIX_C_SOURCE, _BSD_SOURCE, and
_XOPEN_SORUCE to get the C environment we want in different places.  It also
fixes the build on linux due to RTLD_DEFAULT having not been defined.
 2007-01-10 13:10:43 -08:00
Ian Romanick
da09964a93 Merge branch 'origin' into pci-rework 
Conflicts:

	hw/xfree86/int10/generic.c
 2007-01-09 15:27:34 -08:00
Michel Dänzer
359d20532b Require glproto >= 1.4.8 for GLX. 
It builds against 1.4.7 as well, but it hardcodes the GLX_EXT_tfp tokens that
were finalized in 1.4.8, so GLX_EXT_tfp breaks if the client side was built
against an older glproto. This will hopefully alert people to rebuild other
components (in particular Mesa) against the new glproto as well.
 2007-01-09 09:53:45 +01:00
Alan Coopersmith
88740c4855 Use PKG_CHECK_EXISTS(libdrm) to determine if DRI should be enabled on Solaris 2007-01-08 17:36:28 -08:00
Eric Anholt
0b73a7eb17 Add support for the DamagePost (XDamage 1.1) request. 
This makes damageproto >= 1.1 a requirement to build.
 2007-01-05 18:26:58 -08:00
Alan Coopersmith
2fd4626fa6 Make GLX byteswap macros more portable 
- Use autoconf tests instead of platform-specific #ifdef's to decide
  which macros to use.
- Provide fallbacks for platforms like Solaris that don't provide any
  of the existing known forms.
 2007-01-03 15:44:55 -08:00
Eamon Walsh
a81dbaae05 Merge branch 'master' into my-XACE-SELINUX 2006-12-19 16:11:19 -05:00
James Steven Supancic III
a5fcf1e5e7 Fix RENDER issues (bug #7555) and implement RENDER add/remove screen 
support (bug #8485).
 2006-12-16 12:02:38 -05:00
Eamon Walsh
5719afe6d3 Change symbol in libaudit library test. 2006-12-12 13:27:03 -05:00
Eamon Walsh
28e80cd65b Add SELinux extension configure-time support. 2006-12-12 13:27:02 -05: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
Daniel Stone
edabf45425 configure.ac: add CONFIG_LIB to Xvfb 2006-12-06 23:24:24 +02:00
Daniel Stone
d17ec01e83 remove CID support (bug #5553) 
Remove CID from all our fontpaths.
(cherry picked from 69820a10e3 commit)
 2006-12-06 23:24:23 +02:00
Alan Coopersmith
a5d6499d66 Fix syntax error in configure check for SYSV_IPC that broke with Sun cc 2006-12-01 16:42:37 -08:00
Eric Anholt
5dbcd34a0a Register dependency on new RandR protocol. 2006-11-27 16:26:14 -08:00
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
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 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
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
Ian Romanick
6c514ca14c Use XSERVER_LIBS instead of XORG_LIBS for -lpciaccess. The former is 
only for libraries that are built as part of the xserver build.
 2006-06-22 15:51:16 -07: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
Ian Romanick
aa131c51e0 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-21 14:39:52 -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
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
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
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
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
Daniel Stone
4c317bbc12 Add full FreeType support for Xprint. (Drew Parsons) 2006-03-31 07:21:41 +00:00
Kristian Høgsberg
52d9ce7f4f Fix another typo. 2006-03-28 21:45:14 +00:00
Kristian Høgsberg
7df64898ea Fix a couple of typos. 2006-03-28 07:46:04 +00:00
Kristian Høgsberg
a06342eccc Add --enable-glx-tls ./configure option to enable use of TLS for storing 
current GL context. Use this option to let AIGLX load DRI drivers
    compiled for TLS.
 2006-03-28 02:57:07 +00:00
Adam Jackson
77531dfb9f Silence some editorializing in the configure help text. 2006-03-28 01:22:01 +00:00
Daniel Stone
5be8a66d32 Fix remnants of previous busted _XkbStrCaseCmp commit. 2006-03-27 22:28:32 +00:00
Kristian Høgsberg
966d93ef6d Make the server distcheck and tag 1.0.99.1 snapshot. 
Bump CVS version to 1.0.99.1.
Distcheck fixes.
 2006-03-21 22:54:38 +00:00
Daniel Stone
8c1bb37d06 Typo fix, reindent. 2006-03-17 08:55:07 +00:00
Kristian Høgsberg
2d2d38d17c Check for glproto when building GLX and make sure we have at least 1.4.6. 
Drop glx_ansic.h wrapper and call xalloc, xrealloc, xfree and str-funcs
    directly.
 2006-03-17 01:47:25 +00:00
Adam Jackson
175980580e Bump to requiring fixesproto >= 4.0 and compositeproto >= 0.3. 2006-03-15 23:05:53 +00:00
Matthieu Herrb
6fe377af5a - OpenBSD needs -Wl,-export-dynamic to export symbols from main executable 
to modules.
- Probe for OpenBSD aperture driver and define HAS_APERTURE_DRV
    accordingly.
 2006-03-15 21:25:38 +00:00
Kristian Høgsberg
c3342c8000 Merge accel_indirect branch to HEAD. 2006-03-12 00:11:34 +00:00
Alan Coopersmith
fc0772de36 Add HAS_MMAP for Xvfb 
Fix Xvfb option parsing to exit on bad arguments, not just issue error
    messages and continue on. (Coverity #492)
 2006-03-11 02:10:14 +00:00
Matthias Hopf
d8f8bfecce Do Xorg configure checks for Xgl only as well 2006-03-09 14:23:57 +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
Matthieu Herrb
01a0bf881a OpenBSD supports PCVT and WSCONS. PCCONS is long gone. 2006-02-24 17:01:57 +00:00
Eric Anholt
d97f29be22 Bug #5453: Don't forget to still do AM_CONDITIONAL for XVMC even if XV is 
disabled, and also force XVMC disabled if XV is disabled. (Dag-Erling
    Sm�rgrav)
 2006-02-16 21:35:32 +00:00
Keith Packard
8987b2c1ef Make more extensions optional in build (for kdrive). Fix kdrive build for 
actual hardware. Fix kdrive pointer signed/unsigned types. Add
    kdrive-required YX rotation functions. Replace rgb text file loading
    with static rgb color table.
 2006-02-16 07:17:31 +00:00
Eric Anholt
dc0354104c Move EXA implementation up to the top level and remove its XFree86 
dependencies. It was nearly abstract enough already to be used by
    multiple DDXes. This will be useful for EXA development through
    providing a fake acceleration implementation within Xephyr, so that
    testing can be done on new EXA code without worrying about buggy
    drivers.
 2006-02-16 00:14:11 +00:00
Eric Anholt
6770f1bdb1 Define NO_LIBCWRAPPER in dix-config.h, and rely on Mesa including 
dix-config.h if DIX_HAVE_CONFIG_H is defined to get it and _XSERVER64,
    instead of defining things like this per directory.
 2006-02-15 21:09:14 +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
Eric Anholt
efc3fab7f4 Make kdrive (i.e. Xephyr only) buildable on FreeBSD and probably other OSes 
without linux VT switching, fbdev, and vm86 support.
 2006-02-10 07:52:05 +00:00
Adam Jackson
0dc0f17f27 Speed up checkout and autogen by removing disused iplan2p4 and ilbm. 2006-01-26 04:10:43 +00:00
Adam Jackson
14fdd81614 Remove xf8_32wid, it's dead code with no maintainer interest. Also remove 
cfb24, since xf8_32wid was the only user.
 2006-01-25 23:05:26 +00:00
Daniel Stone
4fc9eb592a Bomb out if symlink-mesa.sh failed. 2006-01-10 02:32:20 +00:00
Adam Jackson
13c9e0c094 Bug #5525: Build a working Xprt. (Drew Parsons) 2006-01-06 23:06:15 +00:00
Eric Anholt
e6dab3d7c4 Fix the AC_TRY_RUN for sys/linker.h which had no hope due to lacking a 
main() to instead use a nice AC_CHECK_HEADERS that works. Also, fix the
    nearby SYSV IPC check which was lacking an argument and giving bogus
    results (it's "AC_TRY_LINK(includes, main, yes, no)").
 2005-12-30 12:05:47 +00:00
Adam Jackson
54922aeadb Disable building LBX by default. 2005-12-29 20:29:26 +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
Eric Anholt
b1b40ed6a8 Initial commit of XGL build infrastructure and XGL code changes for 
building within the xorg server tree. Requires additional, uncommitted
    dix changes to successfully build, and successful running is still yet
    to happen.
 2005-12-28 10:31:46 +00:00
Adam Jackson
05c139d4cd Enough build fixes to get {sdl,ephyr,fake} to link. 2005-12-28 10:02:54 +00:00
Adam Jackson
022aa1127c Get Xsdl closer to linking. 2005-12-28 01:01:06 +00:00
Adam Jackson
9dd0af6cb4 Skeletal kdrive build system. Totall non-functional atm. 2005-12-27 08:31:37 +00:00
Adam Jackson
7e3cb9a09a Remove unused layer module. 2005-12-25 22:25:15 +00:00
Daniel Stone
5fd978b1e7 Make LBX configuration default to auto. 2005-12-23 07:40:44 +00:00
Kevin E Martin
0d7ec5c7d9 Update package version for X11R7 release. 2005-12-21 02:30:08 +00:00
Kevin E Martin
2cf86fce41 Update package version number for final X11R7 release candidate. Update 
release string to 6.99.99.904.
 2005-12-15 00:20:27 +00:00
Adam Jackson
7fa2d11d85 Bug #4361: Define XF86CONFIGFILE properly so config file generation works 2005-12-09 03:57:41 +00:00
Kevin E Martin
26b41ff439 Fix sgml docs build. 2005-12-09 03:02:21 +00:00
Kevin E Martin
3a6bdf0715 Add configure option to set the top level font dir. 2005-12-08 19:21:12 +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
20c0ebe7b3 Change to use the app-defaults default dir configured in libXt. 2005-12-07 16:18:02 +00:00
Adam Jackson
84faf8dc97 Bug #5230: Fix whitespace bugs. 2005-12-06 16:22:47 +00:00
Adam Jackson
f259fd680c Disable the xf8_32wid logic for now, breaks distcheck 2005-12-03 22:47:47 +00:00
Alan Coopersmith
26f9c43056 Bugzilla #4809 <https://bugs.freedesktop.org/show_bug.cgi?id=4809> Patch 
#3908 <https://bugs.freedesktop.org/attachment.cgi?id=3908> xf8_32wid
    and cfb24 only need to be built on sparc
 2005-12-03 17:04:45 +00:00
Kevin E Martin
98231c6b38 Update package version number for X11R7 RC3 release. Update release string 
to 6.99.99.903 (i.e., 7.0 RC3).
 2005-12-03 05:47:25 +00:00
Kevin E Martin
7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Kevin E Martin
14b9315379 Add missing XvExtension and XvMCExtension defines. 2005-12-01 22:06:49 +00:00
Kevin E Martin
df8fa21d31 Fix typo: xorg_bus_linuxbsdpci ==> xorg_bus_linuxpci 2005-12-01 16:20:09 +00:00
Eric Anholt
ccfaf82367 Bug #5160: Fix the modular build to try to use the same logic for choosing 
the architecture/os-specific bus support as monolithic.
 2005-12-01 05:04:07 +00:00
Adam Jackson
ed826d563c Only build dlloader modules by default. 2005-11-29 23:34:30 +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
Kevin E Martin
381931b15b Add configure option to install libxf86config.a (disabled by default). 2005-11-23 07:14:46 +00:00
Felix Kuehling
1c8c1179c0 Fix Xprt library dependencies in the case that Xprint is auto-detected by 
configure.
 2005-11-21 04:24:07 +00:00
Alan Coopersmith
a1f110bda8 Make sure XKM_OUTPUT_DIR (used in code) ends in / (so paths don't get hosed 
when appending file names) but XKB_COMPILED_DIR (used in Makefiles)
    does not so install-sh -d doesn't get confused when the directory
    already exists.
 2005-11-20 23:01:02 +00:00
Alan Coopersmith
385730d239 Add xext to list of modules xorgcfg depends on. 2005-11-20 04:15:15 +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
Adam Jackson
21f7d03dbc Fix builds when not building the Xorg DDX. 2005-11-16 07:28:19 +00:00
Alan Coopersmith
bd9fb533b3 Default xkb-output directory needs trailing slash. 2005-11-14 00:01:34 +00:00
Kevin E Martin
0e7e4c7064 Fix typo to enable DGA support. 
EXTMODULE is required to build DGA support into extmod.
 2005-11-10 04:59:21 +00:00
Kevin E Martin
1b26fe6d20 Update package version number for X11R7 RC2 release. Update release string 
to 6.99.99.902 (i.e., 7.0 RC2).
 2005-11-09 21:28:54 +00:00
Kevin E Martin
c9709c0a38 Add newly checked in files to Xorg server build. 
Fix release date. Enable DGA extension by default.
 2005-11-08 22:47:57 +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
f5daec674a Add support for enabling/disabling DBE (part of generic enable/disable 
extension support in the server).
 2005-11-02 15:56:40 +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
Adam Jackson
81e913d310 Bug #4840: Typo, x$xRES -> x$RES. (George Fufutos) 2005-10-21 18:23:33 +00:00
Donnie Berkholz
279cf9f79d Bug #4817 <https://bugs.freedesktop.org/show_bug.cgi?id=4817> Restore '=' 
to '==' in test for mmx_capable.
 2005-10-20 22:41:28 +00:00
Kevin E Martin
5744308e29 Update package version number for RC1 release. Update release string to 
6.99.99.901 (i.e., 7.0 RC1).
 2005-10-18 22:06:54 +00:00
Kristian Høgsberg
eec3df1503 Fix whitespace in AS_HELP_STRING uses, convert all help strings to use 
AS_HELP_STRING.
 2005-10-17 17:11:12 +00:00
Kevin E Martin
1859c62607 include/dix-config.h.in Add support for more extensions 
Add missing files to EXTRA_DIST
 2005-10-17 07:18:59 +00:00
Donnie Berkholz
a7d6a4fb32 Change '==' to portable '='. 2005-10-16 03:02:53 +00:00
Kevin E Martin
c2e461c7e9 Fix typo and add new Makefiles to AC_OUTPUT 
Fix typos
Add xorg.conf.man to CLEANFILES
Add missing files to EXTRA_DIST
 2005-10-15 20:44:44 +00:00
Kristian Høgsberg
21e7339c1e Hook up lbx. 2005-10-14 22:44:56 +00:00
Alan Coopersmith
d62943c040 Set default font path to match the default in the monolith so fonts are 
actually found.
 2005-10-14 22:19:51 +00:00
Donnie Berkholz
7e3e9ed97b Add XTRAP_LIB to XPRINT_EXTENSIONS to fix xprint build when xtrap is 
enabled.
 2005-10-14 06:10:06 +00:00
Donnie Berkholz
821584fcd3 Require glproto >= 1.4.1 if building DRI with GLX. This fixes a build 
failure on a number of hyperpipe functions.
 2005-10-14 05:36:39 +00:00
Alan Coopersmith
1df705e465 AC_SUBST VENDOR_STRING & VENDOR_RELEASE for xorgcfg's app-defaults file 2005-10-13 20:30:38 +00:00
Kristian Høgsberg
5a71a5667e Add Xprint init scrips to EXTRA_DIST. 2005-10-07 19:01:10 +00:00
Kevin E Martin
578e18d11b Add darwin to dist 
Include missing docs in EXTRA_DIST
Include headers and other files in dist
 2005-10-07 14:27:47 +00:00
Søren Sandmann Pedersen
e4ed43c3a6 symlink.sh: 
New files linked:
xorgconf.cpp Options
usb.3 usb_hid_usages
lynx_ppc.S
BUSmemcpy.S IODelay.S PortIO.S SlowBcopy.S
sun_inout.s
xaaTEGlyphBlt.S
xkbcomp/compiled/README
New files excluded:
All of lib/GL/apple
xlibi18n/*/*.mapfile
xxserver/xorg/configure.ac, xkb/Makefile.am:
Install README.compiled in the xkb output dir
 2005-10-06 22:25:35 +00:00
Kevin E Martin
30c1369bf5 Add support for building DMX config and examples programs Add missing files 
to EXTRA_DIST Install Xdmx man page
 2005-10-06 02:35:22 +00:00
Kristian Høgsberg
dc6ac8e46f Add DGA configure option and add various files that we should be dist'ing. 
Simplify xf86DefModeSet.c rule a bit.
 2005-10-05 21:38:40 +00:00
Alan Coopersmith
8c524f9966 Xdmx & Xprint also need xau & xdmcp module dependencies 2005-10-05 15:33:40 +00:00
Alan Coopersmith
da989e988c Xnest depends on xdmcp & xau modules too 2005-10-05 02:18:10 +00:00
Adam Jackson
34a8411ede Bug #4038: Unbreak the SYSVIPC check for cross builds. (Detlef Vollman) 2005-10-05 00:55:08 +00:00
Alan Coopersmith
4ae4fc7d51 Add gtf to xserver/xorg/hw/xfree86/utils 2005-10-04 00:43:16 +00:00
Alan Coopersmith
14a2bd3330 Add missing ] (Dawid Gajownik) 
Add getconfig (Dawid Gajownik)
 2005-10-03 15:37:57 +00:00
Adam Jackson
a7e3c6fa8c Real configure check for execinfo.h (Yuri Vasilevski) 2005-10-03 06:31:48 +00:00
Alan Coopersmith
a07dd03748 Add hw/xfree86/getconfig 2005-10-01 07:17:55 +00:00
Alan Coopersmith
4608a2b654 Man page processing/installation and other doc file updates 2005-09-30 02:37:57 +00:00
Alan Coopersmith
f53404bdbb Add kbd_mode build system 2005-09-28 16:55:25 +00:00
Søren Sandmann Pedersen
003655c02a Make XpConfig build system call mkfont{scale,dir} 2005-09-27 18:36:14 +00:00
Søren Sandmann Pedersen
f3d0cb4a57 Get XpConfig build system in pretty much working state 2005-09-27 16:15:55 +00:00
Kevin E Martin
ca64aab609 Add build system for building docs and fix setuid issues. 
Add build system for sgml docs.
 2005-09-27 14:09:31 +00:00
Søren Sandmann Pedersen
6c5c54b9a2 Various small fixups to get XpConfig to 'build' 2005-09-26 23:07:44 +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
Søren Sandmann Pedersen
9abccb5e65 Add initial build system for XpConfig 2005-09-26 19:33:06 +00:00