Commit Graph

487 Commits

Author SHA1 Message Date
Jeremy Huddleston
a4069c94a6 1.4.0-apple1 2008-02-15 23:16:11 -08:00
Jeremy Huddleston
9f5507a3c5 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2007-12-20 19:04:33 -08:00
Jeremy Huddleston
641227883c Xquartz: Fixed launchd detection 2007-12-15 14:00:56 -08:00
Jeremy Huddleston
32e74d744c Xquartz: Don't hardcode libexec dir
(cherry picked from commit 67b479ef80)
2007-12-13 16:28:20 -08:00
Jeremy Huddleston
8eb15256ec Xquartz: Don't hardcode LaunchAgents dir
(cherry picked from commit 07a12d71fe)
2007-12-13 16:27:46 -08:00
Daniel Stone
d63efecc94 Bump to 1.4.0.90 2007-12-12 21:57:59 +02:00
Jeremy Huddleston
5676ba6fc0 XQuartz: Cleaned up configure, X11.app path in launchd script
Don't hardcode X11.app's path in the launchd plist.
Only install the launchd plist if we --enable-launchd.
(cherry picked from commit 6b74c535dc)
2007-12-08 00:32:13 -08:00
Jeremy Huddleston
aed01c4a8b Darwin: Use __APPLE__ instead of __DARWIN__
(cherry picked from commit 54654815fa)
2007-12-07 18:53:31 -08:00
Ben Byer
dc56305e16 ALLOCATE_LOCAL is dangerous on Darwin due to memory layout differences
from Linux, so let's define NO_ALLOCA.
(cherry picked from commit 7caf51d1a5)
2007-12-07 14:08:15 -08:00
Jeremy Huddleston
df5c9fef3c Darwin: Flattened quartz into darwin, renamed darwin xquartz
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
(cherry picked from commit 48e6a75fbd)
2007-12-05 20:26:16 -08:00
Jeremy Huddleston
3f60656eb3 Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
(cherry picked from commit e8399fd4d6)
2007-12-04 18:00:00 -08:00
Jeremy Huddleston
345e21a4b1 Darwin: RIP dumpkeymap, cr, and fullscreen
Taking out the trash.
We don't need dumpkeymap since we'll be getting keymaps straight from the OS. .Xmodmap should be sufficient for any user-needed changes.  If this is not
the case, please let us know, so we can address any problems you have.
fullscreen never worked AFAIK
cr isn't being used and xpr is much better.
(cherry picked from commit e41af2967e)
2007-12-04 16:41:50 -08:00
Jeremy Huddleston
e7026216cc Darwin: Combine launcher and server X11.app
This should hopefully eliminate confusion some people have over which X11.app is which.
Now BOTH are in /A/U/X11.app and we intelligently determine whether to execute our app_to_run
or launch the server.  If arguments are given, we launch the server.  Otherwise if we can
connect to an X DISPLAY, we execute app_to_run.  Otherwise, we launch the server.

(cherry picked from commit 0284b3631a)
(cherry picked from commit b0349d5b6c)
(cherry picked from commit c3c71a882f)
2007-12-03 20:20:05 -08:00
Jeremy Huddleston
b0069b04dd Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH 2007-12-02 18:21:40 -08:00
Jeremy Huddleston
9c6d8a035b Darwin,Rootless: Makefile cleanup 2007-11-26 13:04:57 -08:00
Jeremy Huddleston
28ae09f355 Darwin: Sync-up to master and xorg-server-1.2-apple where appropriate 2007-11-23 14:18:04 -08:00
Jeremy Huddleston
738a229a71 Various cleanups to get Xquartz to compile. 2007-11-20 06:59:11 -08:00
Jeremy Huddleston
89c4aa9d4a Force --disable-Xorg when on darwin 2007-11-20 05:57:15 -08:00
Jeremy Huddleston
db6404f9d0 Added --with-x11app-archs configure option
This configure option's value is passed to xcodebuild in ARCHS, so we can easily choose architecture targets for X11.app
2007-11-20 04:07:34 -08:00
Ben Byer
cee516e142 From Jeremy Huddleston:
1) Fixed a bug where XQUARTZ was #defined when auto but not when --enable-xquartz
2) Cleaned up missing #includes and function prototypes.
3) Fixed some invalid C syntax problems
4) Removed a bunch of dead code
5) Cleaned up code to prevent some warnings
6) Bugfix in xpr/x-hook.c - looks like someone just forgot to finish writing code for hook_remove()... I only noticed it because gcc -Wall complained about reaching the end of a non-void function... lucky for us gcc is smarter than we are.
2007-11-20 04:07:22 -08:00
Ben Byer
cad8133cce More XDarwin cleanup / dead code removal from Jeremy 2007-11-20 04:02:15 -08:00
Ben Byer
da6cfcb89b Build system patches to remove XDarwin from the build (since it doesn't
work anyway), courtesy of Jeremy Huddleston
2007-11-20 04:00:00 -08:00
Ben Byer
835de9ceae Trying to add launchd detection to tell Xtrans
to enable launchd support; fix me later.
2007-11-20 03:59:53 -08:00
Ben Byer
1bad9b87e5 And now we kill XDarwinApp -- credit, Jeremy Huddleston 2007-11-20 03:48:24 -08:00
Ben Byer
c213749b19 fixes to allow Xvfb and Xephyr to be built if you build with --disable-xdarwin 2007-11-20 03:41:29 -08:00
Ben Byer
ed161d013c Fixed glx/DarwinGlx symbol problems; other servers (such as xvfb and xnest)
should now be buildable from this code if you pass e.g. --enable-xvfb
to configure.
2007-11-20 03:40:56 -08:00
Ben Byer
6a14175622 add -DROOTLESS_WORKAROUND to CFLAGS 2007-11-20 03:30:34 -08:00
Ben Byer
a2a2bbfe84 Some autoconf hacks to make 'make dist' work correctly 2007-11-20 03:16:49 -08:00
Ben Byer
616ba3c7d6 finished committing downstream changes 2007-11-20 03:15:02 -08:00
Ben Byer
b8e6c80c0d more patches, autoconf fixes... 2007-11-20 03:13:06 -08:00
Ben Byer
120e831640 More patches from downstream 2007-11-20 03:01:12 -08:00
Ben Byer
68ad49994f added Apple-specific defaults to configure.ac 2007-11-20 02:05:41 -08:00
Alan Coopersmith
4c20d61046 Actually build Secure RPC authentication support (missed in modularization)
(cherry picked from commit 23fbd5292d)
2007-11-06 14:54:20 +00:00
Daniel Stone
bd779f8cde configure.ac/XFree86: Only build XF86Misc and XF86VidMode when appropriate
Don't build XF86Misc or XF86Vidmode in hw/xfree86/dixmod when it's been
explicitly disabled in configure, or we don't have the proto modules
installed.

(cherry picked from commit df57ae1639)
2007-10-30 00:57:49 +02:00
Eric Anholt
99dd8b9414 Bump version to 1.4.0. 2007-09-06 01:42:43 -07:00
Eric Anholt
70ed110538 Fix server version reporting to be the server package version.
Previously, the server version reported by xdpyinfo and Xorg -version would
bear some vague resemblance to a X.Org katamari version, but in the presence
of modularization (and client-server relationships with different katamari
versions on each side) those numbers don't really make sense.  Instead, just
report the package version.

When branching a stable branch, master's version should be immediately updated
to the endpoint of the stable branch plus a snapshot of 1 (for example,
1.4.0.1 after server-1.4-branch).  The stable branch should then be changed to
RC0 at that time (1.3.99.0, for example).

This scheme was partially attempted for server 1.3, but lacked the appropriate
master updates, thus why it had to be revisited now.  While here, we can also
remove a lot of versioning complexity since everything is based on the package
version.

(cherry picked from commit 47300ed2be)
2007-09-05 13:31:50 -07:00
Eric Anholt
ec56c5e958 Bump version to 1.3.99.2. 2007-08-31 20:02:52 -07:00
Eric Anholt
1a125b5214 Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it.
(cherry picked from commit 07630d897e)
2007-08-31 15:58:16 -07:00
Søren Sandmann Pedersen
ec126e29e4 Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix
bug 11620 (reported by Jens Stroebel.
(cherry picked from commit 53941c8e68)
2007-08-23 12:19:28 -07:00
Alan Coopersmith
6cef7b9611 Correct XErrorDB path and make it configurable (used by DTrace support) 2007-08-15 16:44:49 -07:00
Alan Coopersmith
59961e47df xorgcfg needs PIXMAN_CFLAGS in order to build libc_wrapper.c 2007-08-10 16:08:41 -07:00
Daniel Stone
838e59c02e configure.ac: Add $CONFIG_LIB to server libraries
Make sure all DDXes get $CONFIG_LIB.  Build-tested with Xvfb and Xdmx.
2007-08-08 01:34:59 +03:00
Eric Anholt
fef4c7a6f1 Fix driver build after pixman changes. 2007-08-07 09:01:24 -07:00
Søren Sandmann Pedersen
aa3c6aaaab Require pixman-1 0.9.4, update pixman includes to new scheme 2007-08-06 19:00:59 -04:00
Julien Cristau
a04c95f444 configure.ac: Fix argument quoting for argv[]
m4 quoting.  Yar boo sux.
2007-08-01 21:05:04 +03:00
Daniel Stone
99a88826e5 configure.ac: Actually use -lrt in monotonic clock test
If we need -lrt to use clock_gettime, then make sure we link with it.
2007-08-01 21:05:04 +03:00
Daniel Stone
1c80e04f87 configure.ac: Disable D-Bus config API support by default
This is problematic, so don't even bother with it unless someone wants it.
respeclaration is dead, long live HAL.
2007-08-01 21:05:04 +03:00
Daniel Stone
ad7421fc76 Bump version to 1.3.99.1 for development
This is not actually .1, just bumping for a different devel version.
2007-08-01 08:30:00 +03:00
Daniel Stone
1150969b82 Convert all my license statements to the standard form
Convert all my license statements to the standard, accepted form:
cf. <20070717142307.GD13478@fooishbar.org>
    http://lists.freedesktop.org/archives/xorg/2007-July/026451.html

keithp's license on configure.ac changed with his verbal permission.
2007-08-01 01:53:31 +03:00
Daniel Stone
8658f5d923 Hotplug: Add HAL support
Add support for HAL-based hotplugging, in which we just get the list of
input devices and properties from HAL.  Requires an FDI which is not yet
in mainline HAL.
2007-08-01 01:53:31 +03:00
Daniel Stone
4d3379d418 Fonts: Fix builtin fonts
Make sure the font path is always 'built-ins' when we use built-in fonts,
rather than having it as a fixed path for a while, then clobbering it
halfway through startup.
2007-08-01 01:53:31 +03:00
Daniel Stone
1cdadc2f43 Hotplug: Separate D-Bus into core and hotplug API components
Break up D-Bus into two components: a D-Bus core that can be used by any
part of the server (for the moment, just the D-Bus hotplug API, and the
forthcoming HAL hotplug API), and the old D-Bus hotplug API.
2007-08-01 01:53:31 +03:00
Daniel Stone
06dd2748da configure.ac: Properly check XFree86 proto modules
Not sure why these are conditionals, anyway.  This one really needs
revisiting, but at least causes configure, rather than the compilation,
to bomb out.
2007-08-01 01:53:30 +03:00
Daniel Stone
fd10312b42 configure.ac: Fix KDrive VESA/fbdev conditionals
Make sure we actually respect anything explicitly given on the configure
line, instead of just stomping it with what we detect.
2007-08-01 01:53:30 +03:00
Hanno Boeck
0a4e931115 xnest: fix linking since dbus
Fixes bug 8955
2007-07-12 10:17:07 +10:00
Tiago Vignatti
a92dc6b529 Remove redundant linking in kdrive. Fix configure.ac variable name and clean
it up a little.
2007-07-05 02:28:14 -03:00
Keith Packard
866f092ca0 Make Composite manual redirect windows not clip their parent.
This patch changes the semantics of manual redirect windows so that they no
longer affect the clip list of their parent. Doing this means the parent can
draw to the area covered by the child without using IncludeInferiors. More
importantly, this also means that the parent receives expose events when
that region is damaged by other actions.
2007-07-03 14:29:11 -07:00
Tiago Vignatti
62f43d8b33 Relink properly all kdrive servers when changes happen. 2007-06-27 16:27:29 -03:00
Tiago Vignatti
3860996d56 Remove double-defined. 2007-06-27 16:27:29 -03:00
Søren Sandmann Pedersen
eb2d7fe02f Replace fbFillmmx() with pixman_fill() and remove fbmmx.[ch] 2007-06-11 22:43:01 -04:00
Søren Sandmann Pedersen
f52ae237d3 Require pixman 0.9.2 2007-06-11 22:02:39 -04:00
Clark Rawlins
8d5f4368ea Really make sure BUILD_TIME doesn't have a leading zero.
date +'%k%M%S' still gives a leading zero in the hour after midnight...

Add a leading 1 and remove it in xf86PrintBanner().
2007-06-11 16:53:38 +02:00
Søren Sandmann Pedersen
54e023cec0 Don't pass regions to pixman_image_composite() anymore. 2007-06-11 09:43:15 -04:00
Michel Dänzer
5cbec267b6 Make sure BUILD_TIME doesn't have a leading zero.
It causes the compiler to treat it as an octal constant instead of decimal as
intended, which could even cause a build failure in the cases of 08 and 09.

Thanks to Clark Rawlins for pointing out the problem.
2007-06-11 12:38:41 +02:00
Adam Jackson
c1a49a9269 GNU is wrong and ` is not left-quote. 2007-06-10 22:14:57 -04:00
Dave Airlie
67a0a4da1a update xproto dependency to at least 7.0.9 2007-06-11 11:55:11 +10:00
Zephaniah E. Hull
0cbc3a4da2 Print the build time as well as the date if we can. 2007-06-04 02:03:44 -04:00
Drew Parsons
2f13b7c113 Update Xprint build for pixman.
Xprt links libfb, which now uses pixman.  Update configure.ac to
require module $PIXMAN for XPRINT.
Also, use $(top_builddir) to reference libfb.la and other local
libraries, rather than using the relative reference ../..
2007-05-30 03:07:30 +10:00
Eugene Konev
857ddbb660 Allow configurable serverconfigdir for security policy location
Allow the location of the SERVERCONFIGdir variable to be defined at
compile-time. This allows us to specify where the security policy will be
located (Debian uses this to put it in /etc). The default is to the
previous location.
2007-05-28 21:53:02 -04:00
Eric Anholt
8f98be7db3 Fix bswap detection on BSD (mis-added '_' in function names). 2007-05-24 11:20:59 -07:00
Soren Sandmann Pedersen
8e56f5be4b Add dependency on pixman 0.9.0 2007-05-15 11:13:14 -04:00
Adam Jackson
20c5250e48 Use system copy of cbrt() if available.
Also move the replacement inline into miarc.c, since that's the only user.
2007-05-11 11:43:19 -04:00
Tilman Sauerbeck
bd0abb2844 Bug #10823: Fixed default OSNAME value.
We try to get OSNAME from uname by default now.
2007-05-02 17:20:48 +02:00
Peter Hutterer
c0346e57e6 Require inputproto 1.4.2.
Requirement was introduced with c7e2ba0c9b.
2007-04-26 12:03:28 +09:30
Eric Anholt
28bb34eec6 Belatedly bump XORG_VERSION for 7.2. 2007-04-18 13:48:28 -07:00
Eric Anholt
5d8e8a7f4b Remove libminimi build.
It appears to have been a leftover of a previous incarnation of the build
system that didn't handle miinitext.c well.
2007-04-18 13:22:26 -07:00
George Sapountzis
5a804f2e97 configure: minor cosmetic, move GLX extension options together. 2007-04-05 19:14:31 +03:00
Eric Anholt
6ed08949af Move libcw setup to the only renderer requiring it (XAA).
Additionally, protect libcw setup behind checks for Render, to avoid
segfaulting if Render isn't available (xnest).

The previous setup was an ABI-preserving dance, which is better nuked now.
Now, anything that needs libcw must explicitly initialize it, and
miDisableCompositeWrapper (previously only called by EXA and presumably binary
drivers) is gone.
2007-03-27 17:31:28 -07:00
Alan Coopersmith
b8df961843 Define XF86PM on Solaris x86 builds now that we have sun_apm.c 2007-03-19 18:03:26 -07: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
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
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
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
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
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