Commit Graph

563 Commits

Author SHA1 Message Date
Ian Romanick
ab7a6d860d Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
2007-06-18 16:51:13 -07: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
Eamon Walsh
e2a720c9a1 Merge branch 'master' into XACE-SELINUX
Conflicts:

	dix/dixutils.c
2007-06-11 15:29:11 -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
Eamon Walsh
2a4aa63a23 Merge branch 'master' into XACE-SELINUX
Conflicts:

	include/miscstruct.h
2007-05-22 14:50:26 -04: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
Eamon Walsh
cf962a849d Merge branch 'master' into XACE-SELINUX
Conflicts:

	configure.ac
2007-04-05 14:41:39 -04:00
George Sapountzis
5a804f2e97 configure: minor cosmetic, move GLX extension options together. 2007-04-05 19:14:31 +03:00
Eamon Walsh
99b220969f Merge branch 'master' into XACE-SELINUX 2007-03-28 12:54:04 -04:00
Ian Romanick
2c6d471088 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/dri/dri.c
2007-03-28 08:08:04 -07: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
Eamon Walsh
0331c6a8fc Merge branch 'master' into XACE-SELINUX 2007-03-26 10:28:05 -04: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
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