Commit Graph

315 Commits

Author SHA1 Message Date
Peter Hutterer
1f0075786f Merge branch 'master' into mpx
Conflicts:

	configure.ac
	dix/getevents.c
	hw/xfree86/ramdac/xf86Cursor.c
	mi/mipointer.c
	xkb/xkbUtils.c
2007-03-05 12:37:17 +10:30
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
Adam Jackson
d21c95f80b Hook up --with-builderstring for vendor build identification. 2007-02-12 17:22:39 -05: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
Peter Hutterer
15a81b6325 Merge branch 'master' 2007-01-28 17:18:57 +10:30
Alan Coopersmith
5abd50e37c Correct help lines for configure's --with-vendor-name flags 2007-01-24 18:54:38 -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
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
Peter Hutterer
2d0a63126b Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver 2006-12-19 10:31:40 +10:30
Peter Hutterer
d8b5394eda Cleaning up ifdef MPX from remaining files, removing it from configure.ac.
Removing building mpx extension from Makefile.am
2006-12-18 17:35:34 +10:30
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
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
Peter Hutterer
3c8f166022 Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into mpx
Conflicts:

	dix/events.c
2006-12-05 18:28:33 +10:30
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
Peter Hutterer
416f1bb99a mpx: SelectEvents and GetEventBase requests.
Some renaming and cleaning up in extinit.c
	MPXLastEvent added

Xi:	ShouldFreeInputMask() from XI is not static any more, used in mpx

dix:	GetPointerEvents() allocates MPX event for MPX devices.
	DeliverDeviceEvents() caters for MPX devices.
2006-12-01 15:56:52 +10:30
Peter Hutterer
afd6af6551 mpx: Infrastructure for MPX extension, GetExtensionVersion request works. 2006-11-29 17:55:15 +10:30
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
Peter Hutterer
7ce2dc5784 dix:
merge with code cleanup from master
        GetPointerEvents treats events in the same way as XINPUT devices when flag
        has POINTER_MULTIPOINTER set.

xfree86/common:
    added XI86_MP_DEVICE flag and parsing in xf86ProcessCommonOptions
    added POINTER_MULTIPOINTER define. Is used in xf86PostMotionEvent and
    xf86PostButtonEvent for the flags that are passed into GetPointerEvents()

global:
    added flags to configure.ac to enable/disable MPX define
    added flags to dix-config.h.in to define MPX
2006-11-16 12:51:08 +10:30
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