f841d4e3cc
Move RELEASE_DATE closer to AC_INIT so it's more likely to be updated
2008-12-03 23:02:03 +01:00
110a71d11a
Test for DRI2 extension in dri_internal.h and only enable AIGLX DRI2 if found.
2008-12-03 11:22:38 -05:00
180bad8477
Add visibility flags to XSERVER_CFLAGS.
...
This is done to actually change DIX_CFLAGS, as not all "modules" use
XORG_CFLAGS.
Also export the symbols that are required by other modules after
the change.
2008-12-02 02:50:45 -02:00
afeacb8e74
Bump dri2proto requirement to 1.99.3.
2008-12-01 21:34:23 -05:00
45c8bd0fe5
Enable compiling the X Server and modules with hidden symbols by default.
...
Note that it checks if support for symbol visibility is available by
the compiler, not if it is functional. It may have problems on non x86
architectures.
To disable the feature, just pass the option "--disable-visibility"
to the X Server configure script.
Unless using an alternate build schema, drivers built from a git
checkout will use the same "visibility" related CFLAGS used to compile
the X Server.
2008-11-28 02:01:57 -02:00
fc70839431
Add server support for RRGetScreenResourcesCurrent
...
This depends on randrproto 1.2.99.1
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-11-26 15:50:54 -08:00
f710ce269c
bump master to 1.6.99.1 (now the 1.6 branch is created)
2008-11-26 20:02:44 +00:00
4715f079b9
Merge commit 'origin/master'
2008-11-25 22:19:08 -08:00
9ffc671939
Move matrix operations from X server to pixman 0.13.2
...
pixman 0.13.2 now holds all of the matrix operations. This leaves
the protocol conversion routines and some ABI stubs in place
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-11-25 22:17:58 -08:00
5bb86bafd6
PCI: Remove non-pciaccess path for x86.
2008-11-24 23:40:02 -05:00
c2f254da69
Randr now depends on Render for matrices
2008-11-24 13:24:36 -08:00
8e2287c220
XQuartz: Updated some code to use newer server API
2008-11-22 13:57:45 -08:00
701f8e3a94
XQuartz: Update applewm deps
...
(cherry picked from commit 0ad91c59be8759a9c9e9d4f639056d8c689a3bc5)
2008-11-21 11:55:43 -08:00
10d472bf9d
Support for BSD apm
...
XXX check amd64 pci init
2008-11-21 18:07:03 +01:00
1e4412abc4
drop unused HAVE_LIBDRM_2_2
...
Signed-off-by: Julien Cristau <jcristau@debian.org>
2008-11-20 15:25:43 +01:00
570835b9a8
Use bsd_pci stub routines on Solaris too, since we use pciaccess for real work
...
Depends on commit 70e18a3b6b
2008-11-19 10:19:20 -08:00
e8112784e8
XQuartz: Integrated xpbproxy into the server.
...
Added a configure option called --enable-standalone-xpbproxy which is useful for deveoping xpbproxy.
The 'active' switch in preferences just disables the in-server xpbproxy (not this standalone).
(cherry picked from commit 42944936326ef8732f622db9f75b79a92980550d)
2008-11-15 19:52:34 -08:00
e5271c3747
Set libdrm flags correctly even when only DRI2 is enabled.
2008-11-15 13:27:42 +01:00
b078936571
XQuartz: Initial work on readding GLX to the 1.5 server
...
(cherry picked from commit a186cab6ae82340770c13b37ff5df731ce2a0ceb)
2008-11-14 15:10:32 -08:00
6d21fbf006
kdrive: Bye bye Xvesa
2008-11-05 11:39:46 -05:00
d972399566
Purge device-based WindowAccess code.
...
Really, this was a bad idea. It's not security, the UI features that would
have been cool (e.g. clicking through windows) aren't implemented anyway, and
there's nothing you can't achieve just by using plain XI anyway.
Requires inputproto 1.9.99.6.
2008-11-04 16:04:15 +10:30
f4036f6ace
Remove XEvIE
...
It's unmaintained and has been broken for quite a while; MPX finally
smashed it completely.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-11-04 16:01:07 +10:30
3695f62d07
XQuartz: Require applewmproto-1.1.1
...
(cherry picked from commit ed235e3406e603a8a92c4b72f9f9018bae72ad65)
2008-10-21 09:32:09 -07:00
6dbfca571f
Depend on xtrans >= 1.2.2 for TRANS_NOXAUTH
2008-10-07 10:07:03 -07:00
6020c3fbfe
XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
...
(cherry picked from commit 8edc5fb38c922f28659d2f823148339a8907c4d9)
(cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b)
2008-10-03 11:11:47 -07:00
505c216d03
Added dep on applewmproto 1.1.0
...
(cherry picked from commit b350b066740a2e72585153e35478538cf1bca9ef)
2008-10-03 11:11:37 -07:00
106eb37e02
Require inputproto 1.9.99.5
...
Pull and rebuild your input drivers, while you're at it.
2008-09-26 13:32:13 +09:30
a39377cbcb
Revert "Render: Use built-in SHA1 library"
...
This reverts commit d3bd31fddf
2008-09-23 09:22:07 -07:00
d3bd31fddf
Render: Use built-in SHA1 library
...
Getting an external library for SHA1 is a mess, so just use our own,
regrettably. Public domain implementation.
2008-09-23 18:56:32 +03:00
ab17f88506
Don't use our version of ffs() if the system has one
2008-09-22 02:49:15 +02:00
52bbfc5bfa
scrnsaver is optional at build time.
2008-09-15 10:43:46 -04:00
ce781cac1b
Fix distcheck.
2008-09-11 16:48:23 -07:00
1669308be6
XQuartz: Added pasteboard proxy code stripped out of quartz-wm.
...
(cherry picked from commit 1f842c71c35db031a24de646429834d6054adf1d)
(cherry picked from commit 144746223d8dc3f6ff2a0e805aa27a6e57df558a)
2008-09-03 09:33:58 -07:00
5d7d959b11
XQuartz: Don't even build with GLX support since swrast now depends on libdrm
...
(cherry picked from commit 3739525d57dff2b3b034b5768f357b1c25577909)
2008-08-30 14:21:11 -07:00
5af77d43fe
DRI2: Drop sarea use, implement server side swap buffers.
2008-08-29 12:33:28 -04:00
cc78d977ca
Convert Solaris #ifdef's for <sys/kd.h> to AC_CHECK_HEADERS check
...
Upcoming virtual terminal support changes in Solaris kernel will provide
<sys/kd.h> on SPARC too, so this gets us ready for them.
2008-08-22 10:14:11 -07:00
3c03d9f1ef
Remove sparcPci.c
...
There is no way this code can have been building for anyone since pciaccess
was merged. BSD and Linux were already using OS code on sparc, the only
people who could want this are Solaris, who should be using pciaccess
anyway.
2008-08-18 14:37:42 -04:00
e1ae8db625
Drop dead PowerPC PCI code.
...
Also add a warning for anyone still using legacy PCI code.
2008-08-18 09:53:48 -04:00
1e62e77327
Require inputproto 1.9.99.4
2008-08-15 15:19:44 +09:30
c1e9b7dc6f
Sledgehammer off the DRI2 build system.
2008-08-13 14:13:55 -04:00
9f9268821b
The smart scheduler is not optional.
2008-08-11 13:52:38 -04:00
02efa78ce2
add libXinerama to the list of dependencies.
...
Now that panoramiXext.h is installed bt libXinerama, it becomes required
to build Xext.
2008-08-10 18:29:35 +02:00
4a0947bf06
XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more...
...
(cherry picked from commit 4545ba91e9d6ad62b6cafde3c73a672d3ded91a2)
2008-08-08 01:53:36 -07:00
e72b1d21e4
XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition
2008-08-06 13:37:21 -07:00
30851efdd4
XQuartz: Fixed first-client-can't-connect bug
...
Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
(cherry picked from commit 08f3fe153edc5ab4ca010e8ce82d5c3fc0ddb72c)
2008-08-05 12:54:51 -07:00
2198e237b2
Cosmetic cleanup to Xvfb/Xdmx configure check output.
2008-07-31 13:46:06 -04:00
a70754a9fd
require inputproto 1.9.99.3
2008-07-29 14:16:25 +01:00
806e8cf3c0
Remove SPARC muldiv code. Was used by ELF loader, which is no more.
2008-07-24 14:25:24 -04:00
5c1e254cc8
Remove xorgcfg
...
Us shipping a GUI configuration utility (especially as part of the
server!) was pretty pointless. There was pretty much nothing it could
configure which wasn't already runtime adjustable: if you could get a
server up with functioning input and output, there wasn't much xorgcfg
could do for you.
Au revoir.
2008-07-24 03:01:45 +03:00
b74927c384
Remove ioport
...
I don't know why we would possibly be shipping this.
2008-07-24 02:42:13 +03:00
8c05183790
Remove kbd_mode
...
We only built this on BSD and Solaris, and if such a tool is generally
useful, ship it with the OS.
2008-07-24 02:40:02 +03:00
55803473ad
Bump inputproto to 1.9.99.2 for XI_PROP_ENABLED
2008-07-21 10:32:57 +01:00
0b45ba488d
Drop the FONTCACHE extension.
...
This appears to have been dead code since X-TT was merged.
2008-07-18 10:54:10 -04:00
f7bfa4ae97
configure.ac: Remove non-existant directory
...
Oops.
2008-07-17 23:03:57 +03:00
16e40ecf43
Remove dead code, useless #defines, et al
2008-07-17 22:37:31 +03:00
b0a99fb02b
configure.ac: Fix release date
...
Instead of putting something that's always wrong, at least just put
unreleased, which will be more obviously wrong if it's, well, in a
release.
2008-07-17 21:42:17 +03:00
711720650c
Everyone has urandom
...
If you don't have urandom, please just add a fallback to /dev/random,
rather than building our own random generator.
2008-07-17 21:39:46 +03:00
446fe9eecd
Dead code removal
...
Remove a whole bunch of code that was never built, be it entire files or
just dead ifdefs.
2008-07-17 21:37:50 +03:00
ad7a7ae290
XF86BigFont is disabled by default
...
3c19ec47b4
2008-07-17 18:51:05 +02:00
b9a0cee026
Drop hw/xfree86/os-support/lynxos/
...
This has never worked in any modular release, clearly no one cares.
2008-07-17 10:32:35 -04:00
22e64108ec
XFree86: Remove XFree86-Misc extension
...
Its last remaining purpose in life has been destroyed by input
properties. Au revoir: it's been fun, by which I mean awful.
2008-07-16 06:25:26 +03:00
ad87c72edc
DIX: Add strcasestr from FreeBSD
...
Add strcasestr for use on systems which don't have it.
2008-07-16 03:02:17 +03:00
c3c901cf44
configure.ac: Fix SHA1 handling
...
Fix and marginally simplify the SHA1 handling. First, we allow people
to override it. Secondly, we try for libmd. Then, we try for OpenSSL
with pkg-config. In a last, desperate move, we try libcrypto on its
own. This allows the server to, y'know, _link_ when using OpenSSL,
instead of failing because we only have -lcrypto, and not -lssl.
2008-07-16 03:02:15 +03:00
441f084bfe
config: Don't attempt to use D-Bus when not strictly necessary
...
If we have D-Bus but have explicitly disabled it, don't build it.
2008-07-16 03:02:04 +03:00
ae38151ddd
configure.ac: Add GLX_SYS_LIBS for Xvfb and Xnest
...
This fixes the linking for these two when using DRI2, which requires
DLOPEN_LIBS.
2008-07-16 01:38:22 +03:00
ccec16e519
Bug #7300 : Move xf86RAC to hw/xfree86/common
2008-07-15 11:24:08 -04:00
3f3f66de66
Fix the configure tests for swap16/__swap16 macros on OpenBSD.
...
BSD systems need <sys/types.h> included before <sys/endian.h> for
macros to work.
<https://bugs.freedesktop.org/show_bug.cgi?id=16531 >
2008-07-14 22:20:41 +02:00
1e96782011
dri2: bump libdrm numbers as 2.3.1 is released without ttm interface
2008-07-03 20:00:22 +10:00
6447f80c17
Use AC_CHECK_LIB before PKG_CHECK_MODULES for openssl
...
Previously, the code was using PKG_CHECK_EXISTS before PKG_CHECK_MODULES,
(to cater to OpenBSD systems that include openssl by default but without
a .pc file). But this meant that systems that didn't have openssl installed
at all would not get any error message at configure time.
Now, if the SHA1_Init function is found in -lcrypto without any additional
flags, then that's used. Otherwise, pkg-config is used to find the right
flags to link against libcrypto. And if that fails, a nice error message
is now generated.
2008-06-30 13:19:19 -07:00
d6b8d9eaff
DRI: Ensure we have the DRI headers from Mesa
...
Change the DRI configure check to look for the dri pkg-config file. This
prevents people who built an Xlib libGL from bombing later in the build.
2008-06-29 10:11:40 -07:00
cbc20d92de
XTrap delenda est.
2008-06-25 09:52:36 -04:00
385943e0e9
Set --enable-builtin-fonts as default.
...
Some reasons to embed fonts by default:
1. X server doesn't pick a good default font path so it's easiest just
to built in the core fonts and let new X hackers more happy. Developers
and distro guys are wise enough to just set --disable-builtin-fonts
when they want.
2. Seems that this is by far the most popular FAQ
(http://www.x.org/wiki/FAQErrorMessages ).
3. No one gave a good argument to not do this:
http://lists.freedesktop.org/archives/xorg/2008-May/035479.html
2008-06-24 23:13:32 -03:00
f3b29efc4d
Remove NOFONTSERVERACCESS macro
...
dix: this is semantically different but it goes through the same path in
the code.
2008-06-24 23:10:56 -03:00
2725ba1fca
Also remove xorgconfig from configure.ac.
2008-06-24 14:41:32 -04:00
41a65e1104
Fix ipc check on OpenBSD
2008-06-19 16:58:06 +02:00
f3490d3eba
Bug #15169 : Make the server build again on Alpha.
...
Still won't work until the kernel makes the resource files actually exist.
2008-06-17 10:35:24 -04:00
6bbfadb909
... and stay dead.
2008-06-13 11:00:50 -04:00
f31bd087e8
Death to mfb.
...
Anyone still interested in 1 or 4 bpp framebuffers, talk to fb.
2008-06-13 10:51:18 -04:00
d15b379030
Remove xgl.
...
This code hasn't been updated with anything even resembling what anyone is
shipping in nearly thirty months. It hasn't built out of the box since
7.1. Most of its features over AIGLX are accomplished with DRI2 and
friends.
2008-06-12 16:00:50 -04:00
8cf7755a85
Require x11proto 7.0.13, xextproto 7.0.4 and inputproto 1.9.99.1
2008-05-28 18:05:25 +09:30
26c1958c32
Merge branch 'master' into mpx
2008-05-26 17:37:31 +09:30
77b688a730
XQuartz: Don't need launchd checking in configure.ac anymore since its functionality has been removed from libxtrans and into the mach startup code.
...
(cherry picked from commit 1e1f4fb717d2f3a3227be2a034d28d6a4f29b5d1)
2008-05-23 02:32:28 -07:00
e837244947
Actually enable building GLX without Mesa source
2008-05-21 17:03:25 -07:00
ea4ec9e998
int10: add pci_device_enable support on Linux
2008-05-22 08:58:42 +10:00
20ea99c655
Death to afb.
...
Planar framebuffer people, please talk to wfb for all your 1988 hardware
needs.
2008-05-21 17:03:25 -04:00
c3eb5b80d8
Move GL/glx on level up now that it's the only thing left under GL.
2008-05-21 13:33:36 -04:00
e5aad4bc08
Get out of the mesa symlinking business.
...
This copies over the files generated from mesa/src/mesa/glapi. There's
a corresponding mesa commit that makes it easy to generate the glapi files
straight into the xserver tree when the XML definitions change.
The only few files that are copied from mesa but aren't generated are
glapi.[ch] and glthread.[ch]. Everything in there is technically DRI
driver API and the whole setup is still a bit fragile, but it's not a new
problem.
The --with-mesa-source configure option is still around since other
parts of the server (XGL and DMX - grep for MESA_SOURCE) need that,
but for common case of building with GLX and AIGLX support, that
option is no longer needed.
2008-05-21 12:15:18 -04:00
641ce9c706
drop xprint remnants: xpstubs
2008-05-21 18:13:04 +03:00
99d28c3ef3
Merge branch 'master' into mpx
...
Conflicts:
Xext/xprint.c (removed in master)
config/hal.c
dix/main.c
hw/kdrive/ati/ati_cursor.c (removed in master)
hw/kdrive/i810/i810_cursor.c (removed in master)
hw/xprint/ddxInit.c (removed in master)
xkb/ddxLoad.c
2008-05-20 10:20:14 +09:30
895d4e274d
BSD's also have /dev/urandom.
2008-05-17 13:05:58 +02:00
99e4531f7c
The great kdrive purge.
...
Most of these drivers didn't work. ati was the only one that even came
close. The igs, ipaq, itsy, pcmcia, savage, sis530, trident, trio, ts300,
and vxworks directories have never built since modularisation, so clearly
no one can miss them.
2008-05-16 08:16:01 -04:00
ed65e8b4f0
Check for strcasestr and workaround it on systems without it
2008-05-12 18:50:04 -07:00
1c8bd318fb
X n'est pas une print API.
2008-05-12 14:15:11 -04:00
7b3066d9b9
Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver into upstream-experimental
2008-05-10 00:01:15 +10:00
2a3d1421e0
Disable D-BUS from Xprint.
...
Use dummy config functions to replace those from config/config.c, and
therefore do not link Xprt with $CONFIG_LIB.
Works around an endlessly spinning loop in dix/dispatch.c::Dispatch()
(WaitForSomething() not waiting) when built with dbus, which was
causing Xprt to use 95% cpu.
2008-05-09 23:58:19 +10:00
315f089056
XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
...
(cherry picked from commit 2232c91d5c277673929eab2abb5e0495c00877cb)
2008-05-08 19:58:24 -07:00
90b963c0da
Set CSRG_BASED on OSX
...
(cherry picked from commit ff085deba18682caa2f93d61a75b38db87d747b1)
2008-05-08 19:58:04 -07:00
b6a0c6d486
Allow using libmd instead of libcrypto for SHA1 hashing in render/glyph.c
...
Builders can force one or the other by passing SHA1_LIB & SHA1_CFLAGS
to configure
2008-05-06 17:06:34 -07:00
7295e54433
XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
...
(cherry picked from commit 453a982e6382cff06ea27abba225440b07068f50)
2008-05-06 02:49:48 -07:00
3344569529
Merge branch 'master' into mpx
...
Conflicts:
Xi/exevents.c
dix/devices.c
2008-05-02 11:00:14 +09:30
c3dc4bdbb0
XQuartz: Disabled DPMS extension
...
(cherry picked from commit 1448fed9b6d484f471b9b2982c76ca921a9273b9)
2008-04-28 15:42:02 -07:00
e251c9e75a
Remove all traces of #ifdef XINPUT and the matching bits from the configure.ac
2008-04-25 16:49:35 +09:30
5869e3f555
darwin gots /dev/urandom, too yo!
...
(cherry picked from commit bf0144f38034bc59f108bb2c5270ff37fbe70e10)
2008-04-24 19:54:57 -07:00
b1ae7c79db
Bug 14247: If pkg-config can't find openssl.pc, just link with -lcrypto
...
X.Org bugzilla #14247 <http://bugs.freedesktop.org/show_bug.cgi?id=14247 >
2008-04-24 19:02:43 -07:00
d09c520b32
Moved Apple GL bits into our DDX subtree
...
(cherry picked from commit c9356f32892978faecb30f7b7af7488820ce37ff)
2008-04-23 10:22:34 -07:00
00effad583
xephyr: XEPHYR_DRI is identical to XF86DRI
2008-04-23 18:11:56 +03:00
7ffc68c5cc
xephyr: libGL is client lib
2008-04-23 18:11:56 +03:00
cdc4571b58
drop TOGCUP remnants
2008-04-23 18:11:56 +03:00
dd7a53f8f2
glcore: drop GLcore (build system)
2008-04-23 18:11:55 +03:00
efb723e166
glcore: prepare for dynamic loading
...
glcore gets linked with -ldl, -lpthread for s3tc and glapi
xserver needs
DLOPEN_LIBS - to dlopen the glcore dso
LD_EXPORT_SYMBOLS_FLAG - to export symbols for glcore to use
the ld flag is added to kdrive only when GLX is enabled, the net overhead for
Xephyr is ~155KB, could be reduced with --dynamic-list.
2008-04-23 18:11:55 +03:00
00815b3e52
Don't set DRI2=yes if we can't find dri2proto or libdrm
2008-04-22 23:35:55 +02:00
b44e89f468
Update to tslib 1.0
...
Update the pkgconfig checks to tslib 1.0, and fix the LIBS definitions.
2008-04-22 16:28:39 +01:00
744d0cfda7
add missing DARWIN_GLX_LIBS in configure.ac
...
(cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44)
2008-04-22 01:40:05 -07:00
4bcfed2f9c
Revert "Removed XWin DDX"
...
This reverts commit 6550078b09
2008-04-20 08:35:42 -07:00
14396fdeba
XQuartz: Cleanup turning off COMPOSITE
...
(cherry picked from commit 8f920fca6f9149185649d52569d33bf81b6c6857)
2008-04-20 01:24:54 -07:00
6550078b09
Removed XWin DDX
2008-04-19 09:29:46 -07:00
587c010a1c
Rootless: Kill off rlAccel
2008-04-19 09:27:21 -07:00
4da9ec16e9
Remove appgroup mentions from configure.ac
2008-04-18 19:54:09 -04:00
25827fde68
Nuke the MIT-SUNDRY-NONSTANDARD extension.
...
This extension provided bug-compatibility with pre-X11R6, but has been
stubbed out in our server since 2006 to return BadRequest when you actually
asked for it.
2008-04-18 16:37:08 -07:00
f6617b4127
Death to Extended Visual Information.
2008-04-18 18:28:01 -04:00
571206832d
Define XPRINT in XPRINT_CFLAGS (configure.ac)
...
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736
2008-04-18 01:14:01 +10:00
dc10f0a0e2
Fix composite on !darwin
...
2ffdb0eb64
2008-04-17 11:15:09 +02:00
2ffdb0eb64
XQuartz: Don't use composite.
...
(cherry picked from commit 6d3d344b5b95b6dc4166556d03cfd8c9576dc3f0)
2008-04-16 21:54:00 -07:00
eabcfce0a6
Stop building mfb/afb/xf1bpp by default.
2008-04-11 09:51:26 -04:00
0dab6fa358
So long, and thanks for all the cfb.
2008-04-11 09:47:51 -04:00
3c337e18b9
Fixed configure.ac for autoconf 2.62.
2008-04-10 21:36:38 +02:00
a7e3ad1c6b
Remove NDEBUG (assert() disable) define from the X Server.
...
A few pieces of code were abusing this define for other purposes, which are
converted to #ifndef DEBUG instead. There should be no ABI consequences
to this change.
The rationale is that having the define in xorg-server.h also disables
assert() drivers, which is unexpected, and also difficult to avoid since
xorg-server.h is included in their config.h, and you can't put a #undef in
config.h. As for removing it from the server instead of moving it to an
internal header, we probably shouldn't have unnecessary assert()s in
critical server paths anyway, and if we do we could #define NDEBUG in the
specific cases needed.
2008-04-10 10:35:14 -07:00
6d031cbdef
configure.ac: Do the dolt
...
Use dolt instead of libtool whereever practical. See:
http://lists.debian.org/debian-devel/2008/04/msg00286.html
2008-04-09 14:37:02 +03:00
3f51f493b6
XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
...
(cherry picked from commit df21312c8b0e9ef0c809bfc57cdf64f27db0d8a7)
(cherry picked from commit 2d4194a8d124e7a9c7cd1b83635ba6957aa4ae1c)
2008-04-08 17:03:18 -07:00
08073862f8
configure.ac: Fix monotonic test harder
...
This was only introduced in a later version of POSIX, so define that
version to get it from more conformant systems.
2008-04-08 13:01:23 +03:00
0f87b41a43
configure.ac: DragonFly BSD support
...
Add support for DragonFly BSD, which is just the same as FreeBSD for all
of these cases.
2008-04-07 14:09:04 +03:00
6c0cfe3d43
Fix the clock_gettime check for glibc-based non-Linux systems
...
We need to define _POSIX_C_SOURCE on glibc, not just Linux, so add a new
test for the __GLIBC__ macro.
2008-04-04 19:12:57 +02:00
d1de3dda8e
Fix clock_gettime presence detect on FreeBSD.
...
For non-Linux, _POSIX_C_SOURCE and friends restrict symbols defined rather
than enabling defines of symbols. Additionally, CLOCK_MONOTONIC was
apparently added to the standard around 2000 anyway, not 1993.
2008-04-04 08:01:25 -07:00
b5a0a865c3
Pick up dri2proto from the standard proto header include path.
2008-04-02 19:21:41 -04:00
c40e0b51f0
Implement DRI2 direct rendering and update AIGLX to DRI interface changes.
...
Get rid of glcontextmodes.[ch] from build, rename __GlcontextModes to
__GLXcontext. Drop all #includes of glcontextmodes.h and glcore.h.
Drop the DRI context modes extension.
Add protocol code to DRI2 module and load DRI2 extension by default.
2008-03-31 16:50:58 -04:00
47eb658e80
Support to pass arbitrary options via HAL hotplugging
...
Parse "input.x11_options" and pass every key/name pair to the driver.
Remove check for input.capabilities, because that's part of the fdi files.
Thanks to Dustin Spicuzza <dustin@virtualroadside.com> for the patch.
2008-03-25 17:37:25 +01:00
4c76607b69
Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
...
(cherry picked from commit f03202ad15457c98be7ca78cc59bac88cf5f1966)
2008-03-21 19:33:21 -07:00
db248ffb84
test for the presence of pci_system_init_dev_mem() before calling it.
...
This avoids creating a dependency on -current libpciaccess for
BSD systems other than OpenBSD (which don't otherwise need it).
2008-03-16 18:46:11 +01:00
7c16b68ab8
1.5 has branched, start 1.5.99.x.
2008-03-03 15:09:11 -05:00
c934366424
use UTILS_SYS_LIBS to pass SYS_LIBS to utils/ioports correctly
2008-03-02 19:32:01 +01:00
cdd46aa3cd
configure: minor cleanup
...
- dmx
- darwin: remove from xorg options
- xephyr: libxv is client lib
2008-03-01 19:49:21 +02:00
b71dc54352
Add DRI2 module.
2008-02-14 19:53:49 -05:00
3eaecdd66e
Disable Record by default.
2008-02-14 07:07:34 +11:00
315d6a2b1d
Fix Xephyr compilation without GLX.
2008-01-15 02:59:56 -02:00
36ff05771b
GL: Add GLX compile flags lost in modular X server changes
...
RISC chips that trap on unaligned loads and stores need to
define __GLX_ALIGN64. This used to get added to the cflags
in the old *.cf files but it no longer does in the modular
X server.
Also, Alpha needs to pass -mieee to the compiler as well.
This is a simple backport of a patch that debian, and probably other
distributions, have been applying forever. To the best of my
knowledge the patch was written by Jurij Smakov. See Debian bug
number #388125 .
I just checked and this has been rotting for more than a year in
freedesktop bugzilla as #8392 .
Signed-off-by: David S. Miller <davem@davemloft.net>
2007-12-29 00:00:04 +02:00
a18d28a5ef
damn then my cut-n-paste ate my end of lines...
2007-12-17 13:49:16 +10:00
d096bbd01b
Xquartz ate my DMX - thanks
2007-12-17 13:45:15 +10:00
b4ef8885e1
Xquartz: Fixed launchd detection
2007-12-15 14:00:19 -08:00
a14a143832
Bump server version for devPrivates rework / XACE.
2007-12-14 00:57:16 -05:00
86b2e59bfb
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
configure.ac
This is the last pull before merging to master.
2007-12-14 00:32:24 -05:00
cb0d7e2c26
Xquartz: Don't hardcode libexec dir
...
(cherry picked from commit 67b479ef80cb740a24981335eb8d596744168a62)
2007-12-13 16:29:40 -08:00
c39212fd73
Xquartz: Don't hardcode LaunchAgents dir
...
(cherry picked from commit 07a12d71fefd78c380078efa835700f2868ab204)
2007-12-13 16:29:09 -08:00
c8feb73f58
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/EVI.c
Xext/bigreq.c
Xext/cup.c
Xext/dpms.c
Xext/fontcache.c
Xext/mitmisc.c
Xext/xcmisc.c
Xext/xf86bigfont.c
Xext/xtest.c
configure.ac
dbe/dbe.c
hw/darwin/darwin.h
hw/darwin/darwinEvents.c
hw/darwin/iokit/xfIOKit.h
hw/darwin/iokit/xfIOKitCursor.c
hw/darwin/quartz/fullscreen/fullscreen.c
hw/darwin/quartz/fullscreen/quartzCursor.c
hw/darwin/quartz/quartz.c
hw/darwin/quartz/quartzCommon.h
hw/darwin/quartz/quartzCursor.c
hw/darwin/quartz/xpr/dri.c
hw/darwin/quartz/xpr/dristruct.h
hw/darwin/quartz/xpr/xprCursor.c
hw/darwin/quartz/xpr/xprFrame.c
hw/xfree86/modes/xf86RandR12.c
include/cursor.h
miext/rootless/rootlessCommon.h
miext/rootless/rootlessScreen.c
miext/rootless/rootlessWindow.c
render/picturestr.h
Trying to pick up the pieces from the darwin churn here...
2007-12-13 18:38:25 -05:00
a1b0346853
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 6b74c535dc331d1d621b2541492a3336f69d70a2)
2007-12-07 23:26:11 -08:00
0ad1c359c5
Darwin: Use __APPLE__ instead of __DARWIN__
...
(cherry picked from commit 54654815fa5e59b25cfd1fa72610120b72c10175)
2007-12-07 18:54:58 -08:00
4fc288a13f
Check for <sys/sdt.h> as well when determining to enable dtrace probes
...
Avoids auto-detecting dtrace is present on systems with the ISDN trace tool
named dtrace installed, but not the dynamic tracing facility named dtrace
2007-12-07 17:28:37 -08:00
56f5066d47
ALLOCATE_LOCAL is dangerous on Darwin due to memory layout differences
...
from Linux, so let's define NO_ALLOCA.
(cherry picked from commit 7caf51d1a5a86ae884e0087795636222c082962c)
2007-12-07 14:08:36 -08:00
bc65a24393
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 48e6a75fbdd0fee86e364f02ace83f20b312a2b2)
2007-12-05 20:32:40 -08:00
8d0efe4c2a
Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
...
(cherry picked from commit e8399fd4d66a2b77b770c277e2fa424229a721b2)
2007-12-04 18:00:28 -08:00
f8d7729df3
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 e7026216ccaa8e4fb073800ba947c9909d4faada)
2007-12-03 20:22:01 -08:00
60086d9016
Use pkg-config to get -I, -L & -R flags needed for OpenSSL
...
Still just uses -lcrypto instead of the full library list from --libs
2007-12-03 11:31:21 -08:00
1faba797cb
Death to libcwrapper.
...
This has been deprecated since 1.1. Since we're breaking ABI again anyway,
remove it entirely.
2007-12-03 14:12:58 -05:00
f4dc521b38
Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH
...
(cherry picked from commit b0069b04dddaa2df6d4cdf86f96fd8a2a257e47e)
2007-12-02 18:22:06 -08:00
601307615e
Darwin,Rootless: Makefile cleanup
...
(cherry picked from commit 9c6d8a035b712b219833653ac637b89703a9b0c3)
2007-11-26 14:49:32 -08:00
996b621bec
registry: swap out the DTRACE XErrorDB stuff for the new registry call.
2007-11-26 15:59:44 -05:00
c0f9e204ba
registry: rename the SERVERCONFIGdir and relocate it to /usr/lib/xorg
...
by default.
2007-11-26 15:24:15 -05:00
bcbaf2a0ce
Darwin: Dead code removal, Code cleanup, Added launcher
...
Imported changes from xorg-server-1.2-apple to make master more current wrt
file layout, build system changes, and dead code removal.
2007-11-21 19:52:11 -08:00
2f387d913a
Enable use of /dev/urandom on Solaris as well
2007-11-20 18:31:07 -08:00
2d17f47cc7
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
2007-11-19 18:10:46 -05:00
514ba4ca72
Bug #1612 : Use a stronger PRNG.
...
Currently just reads from /dev/urandom, and only on Linux.
2007-11-16 19:53:11 -05:00
c67b9c5fc3
Clean up some garbage in driver enumeration.
2007-11-15 14:24:36 -05:00
3dde66f96b
Start 1.4.99
2007-11-14 15:10:59 -05:00
1603130236
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/xace.c
Xext/xace.h
2007-11-14 13:35:50 -05:00
d68bd55104
fixing GLX in Xquartz
2007-11-08 20:08:49 -08:00
1c6cb353f7
Restore the XC-SECURITY option in configure.ac, but disabled by default.
2007-11-08 17:02:06 -05:00
476a9d85f8
Xephyr: do not AM_CONDITIONAL inside a shell if branch
2007-11-08 09:11:05 +01:00
26e1fc7b42
Xephyr: don't use Xv or GL when those are disabled.
2007-11-07 18:48:23 +01:00
950f9995d1
Xnest: fix lib dependancy to make libtool happy
...
This fixes an undefined symbol error happening when compiling
the server with the --disable-xv configure switch.
Basically, xnest was linking against
@XSERVER_LIBS@ and @XNEST_LIBS@ and the order of the libraries
given to the linker at the end of the process was bogus.
* configure.ac: make XNEST_LIBS contain the $XSERVER_LIBS re-ordered
in such a way that the linker finds the symbols of all the libs contained
in $XNEST_LIBS.
* hw/xnest/Makefile.am: don't link against @XSERVER_LIBS@ anymore because
XNEST_LIBS contains the right thing.
2007-11-07 18:43:16 +01:00
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
58332894c0
Export the server ABI versions from xorg-server.pc
2007-11-05 17:18:46 -05:00
dda10c9066
Remove all traces of external RGB database (and Speedo)
...
Remove all references to an external RGB database (which hasn't been enabled
for a very long time). Also get rid of some references to Speedo fonts.
2007-11-05 16:28:35 +00:00
df57ae1639
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.
2007-10-28 15:46:26 +02:00
b633d54b94
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
2007-10-25 12:19:30 -04:00
7f5e71fa73
Make PCI text file directory configurable
2007-10-21 23:41:49 -04:00
a3a95d3475
Merge branch 'master' into glyph-pixmaps
...
Conflicts:
configure.ac
2007-10-19 15:44:17 -07:00
c3f7b86255
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
os/access.c
2007-10-17 15:00:54 -04:00
baabae623b
xselinux: Started reworking extension using new XACE hooks.
2007-10-17 13:54:56 -04:00
f2da10f7bc
KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs
2007-10-17 10:51:02 +08:00
695eb8b2e8
Implement GLX pbuffers.
2007-10-12 19:12:26 -04:00
6adeba1730
dix: Add a new "registry" mechanism for registering string names of things.
...
Supports protocol requests, events, and errors, and resource names.
Modify XRES extension to use it.
2007-10-11 14:18:59 -04:00
fdef7be5c8
Sun bug 6589829: include zoneid of shm segment in access policy for MIT-SHM
...
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6589829 >
<http://www.opensolaris.org/os/community/arc/caselog/2007/500/ >
2007-10-09 18:44:51 -07:00
49c8285e38
FreeBSD/alpha server build requires libio (missed in modularization).
2007-10-09 15:25:16 -07:00
604ebb5a6d
Merge Xephyr-XV/GL stuff into master
2007-10-03 16:14:08 +02:00
a358b87f45
Just link against libcrypto instead of relying on openssl pkg-config.
...
Also fix incorrect library inclusion by kdrive which broke the build.
2007-10-02 13:14:12 -07:00
439edc768e
Merge branch 'glyph-pixmaps'
...
Conflicts:
configure.ac
exa/exa_render.c
2007-10-02 12:14:04 -07:00
c8ccf469dc
Do not build hw/xfree86/os-support/bus/ix86Pci.c on Linux.
...
Linux has custom PCI bus support functions, so this generic code is
unnecessary.
2007-10-02 08:59:40 -07:00
a38ad562a6
make xephyr talk DRI protocol with hostX
...
* configure.ac,include/dix-config.h.in: define the XEPHYR_DRI macro.
define it when --enable-xephyr and --enable-dri are both turned on.
* hw/kdrive/ephyr/XF86dri.c: copy this from mesa source to enable
Xephyr to talk DRI protocol the host X. In mesa, this is used by libGL.so to
talk DRI protocol with the server.
* hw/kdrive/ephyr/ephyr.c: finally initialise the DRI extension
in the ephyrInitScreen() function.
* hw/kdrive/ephyr/ephyrdri.c,ephyrdriext.c: safeguard the compilation
using the XEPHYR_DRI macro.
2007-10-02 16:55:14 +02:00
8426eb2433
link and init xv
2007-10-02 16:55:13 +02:00
2d93e69690
Rework local client id finding code to be more uniform
2007-09-27 16:47:32 -07:00
27612748e0
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/devices.c
2007-09-26 07:47:29 -04:00
97c150b61b
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04:00
170fc77d9e
xserver: don't force DTRACE detection by default
...
this fixes a breakage caused by 7a4ec34e25
2007-09-19 09:54:09 +02:00
9b4f515717
XDarwin: We build many many different targets, let's break them out into autoconf conditionals
2007-09-18 21:40:32 -07:00
7a4ec34e25
XDarwin: Disable dtrace support on Darwin 9 (since it doesn't work ... yet ...)
2007-09-18 20:37:09 -07:00
3c19ec47b4
XDarwin: changed XF86BigFont support default from yes to auto so XDarwin can disable it
2007-09-18 20:15:44 -07:00
2e3e08d31e
xserver: test presence of strlcpy in configure
...
* configure.ac: define HAVE_STRLCPY when function strlcat is present
this serves at least to unbreak libxtrans code compilation.
2007-09-11 08:50:41 +02:00
321e0a2160
fixed cut-and-paste typo
2007-09-09 16:29:08 -07:00
84eb7e6224
Fix Xdmx build
2007-09-06 13:37:24 +01:00
35ec8b89f4
DDX changes for XDarwin
...
Creating a real DDX section for XDarwin instead of
stuffing it into the XORG section in a half-assed manner.
2007-09-06 05:34:14 -07:00
f3f614cd01
Revert "configure.ac: exclude pci-access dependency from XDarwin"
...
This reverts commit 20c6677d1b
2007-09-05 20:34:25 -07:00
bf1641b94c
XDARWIN: Add launchd support
...
This adds a bit of glue to configure.ac to support launchd detection;
on OS X (or other platforms which choose to implement launchd), this allows
the system to automagically start the Xserver as necessary to serve clients.
2007-09-05 20:34:25 -07:00
71c21dea74
added HAVE_LAUNCHD check to configure.ac (mostly for OSX)
2007-09-05 20:34:25 -07:00
7381e9149e
added an exclusion for setting XORG on darwin
2007-09-05 15:51:11 -07:00
20c6677d1b
configure.ac: exclude pci-access dependency from XDarwin
...
XDarwin doesn't need any of this pci stuff since it doesn't talk directly to hardware,
so it doesn't make sense to require it when building on OSX/Darwin.
2007-09-05 14:31:01 -07:00
47300ed2be
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.
2007-09-05 12:43:28 -07:00
6c89d1237c
Kdrive: unbreak kdrive linking
...
* configure.ac: re-sort Kdrive libs so that symbols get properly resolved.
Basically, all some libs are present in both $KDRIVE_LIBS and $XSERVER_LIBS,
and some libs orders are not correct. So I made sure Kdrive servers don't have
to link against $KDRIVE_LIBS *and* $XSERVER_LIBS. They just have to link
against $KDRIVE_LIBS now.
* hw/kdrive/*/Makefile.am: update those makefile to reflect the change in configure.ac
2007-09-05 17:46:49 +02:00
f7f79724fd
Increase despair by fixing xprint build after my _DEPENDENCIES changes.
2007-09-04 16:08:13 -07:00
07630d897e
Bug #7364 : Require renderproto 0.9.3 on 64-bit, and fix build with it.
2007-08-31 15:16:01 -07:00
a02db0d500
Convert servers to using _DEPENDENCIES to ensure proper rebuilds.
...
This cleans up server Makefile.ams a little bit, but also means that people
messing with configure.ac need to be careful with whether they put libraries
in the _LIBS or _SYS_LIBS targets. Hopefully the comment in configure.ac will
clarify the issues.
2007-08-31 13:09:45 -07:00
adf46b57ce
Replace BSD custom PCI code with a stub implementation thanks to pciaccess.
...
Note that pciaccess doesn't yet have Net/OpenBSD support, but the relevant
code should go there instead of disconnected code in the X Server.
While here, remove the now-disabled INCLUDE_XF86_NO_DOMAIN from the headers,
and un-disable xf8StdAccResFromOS for those OSes without domain support which
will need it.
2007-08-28 10:13:27 -07:00
4017d31902
devPrivates rework: since API is already broken, switch everything
...
over to new system.
Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
2007-08-28 09:28:25 -04:00
8554707326
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
include/miscstruct.h
mi/mibstore.c
mi/midispcur.c
os/Makefile.am
2007-08-28 07:25:21 -04:00
7d54399cfd
Add XSERVER_LIBPCIACCESS to xorg-server.h when using libpciaccess
2007-08-26 22:11:45 -07:00
8b6b40b727
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
...
Conflicts:
hw/xfree86/common/xf86.h
hw/xfree86/common/xf86Init.c
hw/xfree86/common/xf86pciBus.c
hw/xfree86/int10/generic.c
hw/xfree86/int10/helper_exec.c
hw/xfree86/loader/xf86sym.c
hw/xfree86/os-support/bus/Pci.c
hw/xfree86/os-support/bus/Pci.h
hw/xfree86/os-support/bus/linuxPci.c
hw/xfree86/os-support/linux/int10/linux.c
2007-08-23 18:19:17 -07:00
943dd6ad99
Revert "Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"" since the pixman changes have been pushed now.
...
This reverts commit 57f7f2a532
2007-08-23 12:15:03 -04:00
57f7f2a532
Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"
...
The corresponding pixman code hasn't been pushed, so revert until the code is
ready.
This reverts commit 53941c8e68
2007-08-22 09:02:03 -07:00
b6a7c0112c
Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/xorg/xserver
2007-08-21 14:26:34 -04:00
53941c8e68
Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix
...
bug 11620 (reported by Jens Stroebel.
2007-08-21 14:26:14 -04:00
23fbd5292d
Actually build Secure RPC authentication support (missed in modularization)
2007-08-17 15:29:47 -07:00
6cef7b9611
Correct XErrorDB path and make it configurable (used by DTrace support)
2007-08-15 16:44:49 -07:00
59961e47df
xorgcfg needs PIXMAN_CFLAGS in order to build libc_wrapper.c
2007-08-10 16:08:41 -07:00
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
fef4c7a6f1
Fix driver build after pixman changes.
2007-08-07 09:01:24 -07:00
aa3c6aaaab
Require pixman-1 0.9.4, update pixman includes to new scheme
2007-08-06 19:00:59 -04:00
acc9a42c92
Temporarily disable Security and SELinux extensions
...
while changes to XACE are being made.
2007-08-06 12:16:59 -04:00
19b3b1fd8f
Use strong hash (SHA1) for glyphs
...
Using a cryptographically strong hash means that comparing the
hash alone is sufficient for determining glyph equality (no need
to compare the glyph bits directly). This will allow us to replace
system-memory copies of the glyph bits, (which we've only been
holding onto for comparisons), with Pixmaps.
2007-08-02 22:49:56 -07:00
e34fcd2bf4
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/devices.c
dix/property.c
include/dix.h
2007-08-02 14:27:03 -04:00
a04c95f444
configure.ac: Fix argument quoting for argv[]
...
m4 quoting. Yar boo sux.
2007-08-01 21:05:04 +03:00
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
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
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
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
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
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
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
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
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
0a4e931115
xnest: fix linking since dbus
...
Fixes bug 8955
2007-07-12 10:17:07 +10:00
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
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
62f43d8b33
Relink properly all kdrive servers when changes happen.
2007-06-27 16:27:29 -03:00
3860996d56
Remove double-defined.
2007-06-27 16:27:29 -03:00
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
eb2d7fe02f
Replace fbFillmmx() with pixman_fill() and remove fbmmx.[ch]
2007-06-11 22:43:01 -04:00
f52ae237d3
Require pixman 0.9.2
2007-06-11 22:02:39 -04:00
e2a720c9a1
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dixutils.c
2007-06-11 15:29:11 -04:00
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
54e023cec0
Don't pass regions to pixman_image_composite() anymore.
2007-06-11 09:43:15 -04:00
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
c1a49a9269
GNU is wrong and ` is not left-quote.
2007-06-10 22:14:57 -04:00
67a0a4da1a
update xproto dependency to at least 7.0.9
2007-06-11 11:55:11 +10:00
0cbc3a4da2
Print the build time as well as the date if we can.
2007-06-04 02:03:44 -04:00
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
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
8f98be7db3
Fix bswap detection on BSD (mis-added '_' in function names).
2007-05-24 11:20:59 -07:00
2a4aa63a23
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
include/miscstruct.h
2007-05-22 14:50:26 -04:00
8e56f5be4b
Add dependency on pixman 0.9.0
2007-05-15 11:13:14 -04:00
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
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
c0346e57e6
Require inputproto 1.4.2.
...
Requirement was introduced with c7e2ba0c9b
2007-04-26 12:03:28 +09:30
28bb34eec6
Belatedly bump XORG_VERSION for 7.2.
2007-04-18 13:48:28 -07:00
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
cf962a849d
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
configure.ac
2007-04-05 14:41:39 -04:00
5a804f2e97
configure: minor cosmetic, move GLX extension options together.
2007-04-05 19:14:31 +03:00
99b220969f
Merge branch 'master' into XACE-SELINUX
2007-03-28 12:54:04 -04:00
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
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
0331c6a8fc
Merge branch 'master' into XACE-SELINUX
2007-03-26 10:28:05 -04:00
b8df961843
Define XF86PM on Solaris x86 builds now that we have sun_apm.c
2007-03-19 18:03:26 -07:00
23fc429aad
Merge branch 'master' into XACE-SELINUX
2007-03-05 12:18:54 -05:00
7f2b9f3790
autoconf fixes for XDarwin (created DARWIN_LIBS)
2007-03-03 19:27:53 -08:00
b11dfac287
Legacy framebuffer support wasn't compiled if Xorg wasn't explicitly enabled.
2007-03-02 12:30:26 +01:00
c16343ac2c
Make mfb, cfb, and afb support configurable at build-time.
2007-02-27 14:14:47 -05:00
4660eaaffb
configure fixes for darwin
2007-02-18 14:09:51 -08:00
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
d287b76471
cleaned up some linking ugliness in hw/darwin/quartz
2007-02-17 03:47:42 -08:00
81444486be
autoconf goodness for XDarwin, courtesy of pogma
2007-02-17 02:23:11 -08:00
cece060157
build fix for configure.ac / BUILD_DARWIN, oops
2007-02-17 01:00:13 -08:00
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
8f6961d385
configure.ac: add xdarwin stubs
...
Add stub AM_CONDITIONALs to at least fix the build.
2007-02-15 19:08:46 +02:00
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
f452507ca9
Merge branch 'master' into my-XACE-SELINUX
2007-02-15 09:47:20 -05:00
04632835b7
Merge branch 'master' into my-XACE-SELINUX
2007-02-15 09:27:05 -05:00
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
d21c95f80b
Hook up --with-builderstring for vendor build identification.
2007-02-12 17:22:39 -05:00
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
eb228e8d1e
clean up more of the vbo fallout
2007-02-04 22:06:59 +00:00
d8e148ec84
update xserver for vbo code in mesa
2007-02-04 18:39:04 +11:00
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
5abd50e37c
Correct help lines for configure's --with-vendor-name flags
2007-01-24 18:54:38 -08:00
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
079a6a55a5
Convert to new pci_device_cfg_write_u* interface.
2007-01-15 11:39:24 -08:00
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
da09964a93
Merge branch 'origin' into pci-rework
...
Conflicts:
hw/xfree86/int10/generic.c
2007-01-09 15:27:34 -08:00
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
88740c4855
Use PKG_CHECK_EXISTS(libdrm) to determine if DRI should be enabled on Solaris
2007-01-08 17:36:28 -08:00
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
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
a81dbaae05
Merge branch 'master' into my-XACE-SELINUX
2006-12-19 16:11:19 -05:00
a5fcf1e5e7
Fix RENDER issues (bug #7555 ) and implement RENDER add/remove screen
...
support (bug #8485 ).
2006-12-16 12:02:38 -05:00
5719afe6d3
Change symbol in libaudit library test.
2006-12-12 13:27:03 -05:00
28e80cd65b
Add SELinux extension configure-time support.
2006-12-12 13:27:02 -05:00
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
edabf45425
configure.ac: add CONFIG_LIB to Xvfb
2006-12-06 23:24:24 +02:00
d17ec01e83
remove CID support (bug #5553 )
...
Remove CID from all our fontpaths.
(cherry picked from 69820a10e33e4582c192360996e866007114639d commit)
2006-12-06 23:24:23 +02:00
a5d6499d66
Fix syntax error in configure check for SYSV_IPC that broke with Sun cc
2006-12-01 16:42:37 -08:00
5dbcd34a0a
Register dependency on new RandR protocol.
2006-11-27 16:26:14 -08:00
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
64de3baf85
Add a -showDefaultLibPath option.
...
A corollary to the previous change, this option prints $libdir.
2006-11-22 14:46:51 -08:00
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
f80a8ae6e6
Disable Xprt server build by default.
2006-11-13 18:26:05 -05:00
5bfe7f4dfc
DRI: call drmSetServerInfo() before drmOpen().
...
Also, remove some libdrm remnants.
2006-11-13 01:54:32 +02:00
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
b0a7443ca8
configure.ac: axe redundant SDL test
2006-11-08 15:30:03 +02:00
028bbdc041
Merge master back to randr-1.2
2006-11-04 17:46:26 -08:00
8b87ce1974
Allow X server to build against libdrm 2.1
2006-11-04 17:41:25 -08:00
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
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
543b397277
Merge branch 'origin' into randr-1.2
2006-11-02 19:00:35 -08:00
64139c1950
bump to 1.2.99.0
2006-11-02 03:22:09 +02:00
be291a6d97
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-11-02 03:15:25 +02:00
40f84793bc
Propogate $LIBS for xtrans, clock_gettime, libm, etc. to libs used for each server
2006-11-01 14:34:46 -08:00
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
06b6b971d0
Make sure we have 64-bit file-offsets in libdrm.
2006-10-29 15:22:37 +01:00
92d04e746b
Import libdrm functions for the drm memory manager.
2006-10-27 18:26:30 +02:00
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
cdc8a4b7b2
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-26 00:28:30 +03:00
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
59511974db
Merge branch 'master' into randr-1.2
2006-10-24 17:26:20 -07:00
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
29f28dd1a8
configure.ac: add XSERVER_LIBS to XNEST_LIBS
2006-10-23 02:52:52 +03:00
c5dc997baf
Create xorg.conf.example (Gentoo bug #138623 ).
2006-10-20 00:43:10 +03:00
d029c8f1b7
Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris
2006-10-20 00:43:10 +03:00
80642f37d4
Stop building xorgcfg by default.
2006-10-20 00:43:09 +03:00
62d2409793
Create xorg.conf.example (Gentoo bug #138623 ).
2006-10-19 11:14:26 -07:00
357b37b382
Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris
2006-10-18 18:11:06 -07:00
5eca750fe2
Stop building xorgcfg by default.
2006-10-17 14:53:28 -04:00
335b503c5e
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-10-13 18:10:45 +03:00
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 cde68728860179dc84e615ccb378ce992513fd62 commit)
2006-10-09 17:25:10 -07:00
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
4c34224630
Merge branch 'XACE-modular'
2006-10-06 18:01:13 -07:00
b4659faf9b
Merge branch 'master' into randr-1.2
2006-10-04 14:46:04 -07:00
a5d639cd87
remove merge detritus
2006-09-27 16:15:27 +03:00
ad321fad4b
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-09-24 17:56:43 +03:00
a10039a100
Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev.
2006-09-21 23:58:32 -04:00
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
5e9d33fe87
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-09-07 15:43:31 +03:00
0b81fccd2e
Merge branch 'master' into my-XACE-modular
...
Conflicts:
configure.ac
2006-09-05 18:03:25 -04:00
5ddbf4bcd4
Re-add support for tslib (1.0 release) and Xcalibrate extension.
2006-08-29 22:07:15 +01:00
4524a2bf6f
configure.ac: move tslib from KDRIVE_PURE_LIBS to KDRIVE_LIBS
...
Yeah. That was dumb.
2006-08-29 23:49:26 +03:00
260c3f32b6
configure.ac: fix XSDL test
2006-08-29 23:18:12 +03:00
cff23616fe
configure.ac: allow disabling of XSDL
2006-08-29 22:44:09 +03:00
21291d6ca7
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-08-25 09:34:21 -07:00
5fb8d947bb
configure.ac: more thinkos
...
Fix auto tests for vidmode and xf86dga. I win at life.
2006-08-24 23:16:43 +03:00
866ca1f929
configure.ac: fix XF86VidMode test
2006-08-24 15:46:44 +03:00
05541259bd
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
2006-08-21 13:07:41 -07:00
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
d6433be3cc
Merge branch 'master' into input-hotplug
2006-08-12 21:50:52 +03:00
e641000b98
xfree86: add Hurd support ( #5613 )
...
Add support for GNU/Hurd.
2006-08-12 19:41:59 +03:00
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
c2535f6792
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular
2006-08-10 10:37:59 -07:00
9525c2709e
configure.ac: fix xephyr conditionals
...
Fix Xephyr build conditions, allowing it to actually be disabled.
2006-08-10 20:29:57 +03:00
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
c85e64cba1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-08-07 15:54:55 +03:00
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
ed0c807de9
bump to 1.1.99.3
2006-07-30 11:08:54 +03:00
87fe85f38b
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-30 10:51:34 +03:00
990a400905
Remove getconfig horrorshow. Replace with a static built-in rule list for now.
2006-07-26 19:03:39 -04:00
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
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
87a6346bf7
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
2006-07-21 19:36:25 -04:00
0486d3966d
fix kbproto dependency
...
Depend on kbproto >= 1.0.3, for unconditional definition of
XkbSA_XFree86Private.
2006-07-21 19:35:04 -04:00
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
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
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
3a23e49901
make XInput mandatory
...
Always build Xi, since GetPointerEvents/GetKeyboardEvents relies on it.
2006-07-21 15:19:51 -04:00
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
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
00b24f119f
fix minor typo
2006-07-21 15:16:58 -04:00
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
12595a77d6
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-13 12:48:03 -07:00
10f3e32726
Fix the configure check for the --{enable,disable}-dpms option
2006-07-10 16:37:53 -07:00
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
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
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
fd49a0dcc1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-06 09:52:15 -07:00
28b95fd9d1
Drop unused GL/include subtree.
...
Woo, less Makefile's to generate.
2006-07-06 03:25:38 -04:00
e66e7b48e1
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-07-05 15:21:36 -07:00
a838fb70c5
Bump server version to 7.1.99.2 for gradient and repeat fixes.
2006-07-03 19:24:01 +02:00
66cac9b174
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework
2006-06-28 14:11:49 -07:00
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
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
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
bf17c6dede
Drop libz from the server's link line, it was only needed for LBX.
2006-06-22 12:24:09 -04:00
3f19803e0b
APPGROUP requires both X-ACE & XC-SECURITY now
2006-06-21 18:05:51 -07:00
aa131c51e0
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
2006-06-21 14:39:52 -07:00
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
481d4012e7
Don't add -ldl to XORG_LIBS if it's not needed for dlopen
2006-06-20 16:16:19 -07:00
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
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
71fbda8049
Xprint/ -> hw/xprint
...
XpConfig -> hw/xprint/config
2006-06-18 21:07:28 -04:00
46f55f5dea
Initial batch of changes for PCI rework. All future changes will be
...
tracked individually.
2006-06-07 14:09:02 -07:00
ddc6b99505
Bump to 1.1.99.2.
2006-06-03 11:24:33 +00:00
8e8c6faecd
Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno)
2006-06-03 10:48:37 +00:00
a9ed5a8790
Kill LBX, too.
2006-06-01 22:06:41 +00:00
6d594ebc66
Ditch more alternate-loader braindamage.
2006-06-01 20:22:39 +00:00
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
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
321dbed5f5
Bug #5209 : Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev)
2006-05-15 18:27:18 +00:00
dd38d3bd67
Don't use AM_CONDITIONAL inside shell conditionals. Bugzilla #6916 .
2006-05-14 16:22:24 +00:00
86ffb46358
Bug #5209 : Re-enable building APM and ACPI support. (Michel Dänzer)
2006-05-09 18:04:29 +00:00
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
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
4ae1263669
Remove cfb16, no longer used.
2006-04-06 18:59:11 +00:00
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
c6b3b3354c
Bump to 1.1.99.1.
2006-04-02 22:51:42 +00:00
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
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
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
978c7b14a1
Make Xprint AC_ARG_ENABLEs and AC_ARG_WITHs unconditional also.
2006-04-01 21:02:40 +00:00
71a6f2ef6c
Unconditionally run XP_USE_FREETYPE AM_CONDITIONAL, not only in the Xprint
...
path.
2006-04-01 20:58:42 +00:00
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
4c317bbc12
Add full FreeType support for Xprint. (Drew Parsons)
2006-03-31 07:21:41 +00:00
52d9ce7f4f
Fix another typo.
2006-03-28 21:45:14 +00:00
7df64898ea
Fix a couple of typos.
2006-03-28 07:46:04 +00:00
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
77531dfb9f
Silence some editorializing in the configure help text.
2006-03-28 01:22:01 +00:00
5be8a66d32
Fix remnants of previous busted _XkbStrCaseCmp commit.
2006-03-27 22:28:32 +00:00
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
8c1bb37d06
Typo fix, reindent.
2006-03-17 08:55:07 +00:00
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
175980580e
Bump to requiring fixesproto >= 4.0 and compositeproto >= 0.3.
2006-03-15 23:05:53 +00:00
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
c3342c8000
Merge accel_indirect branch to HEAD.
2006-03-12 00:11:34 +00:00
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
d8f8bfecce
Do Xorg configure checks for Xgl only as well
2006-03-09 14:23:57 +00:00
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
01a0bf881a
OpenBSD supports PCVT and WSCONS. PCCONS is long gone.
2006-02-24 17:01:57 +00:00
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
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
Julien Cristau
Kristian Høgsberg
Paulo Cesar Pereira de Andrade
Keith Packard
Alan Hourihane
Adam Jackson
Jeremy Huddleston
Matthieu Herrb
Rémi Cardona
Alan Coopersmith
Michel Dänzer
Peter Hutterer
Daniel Stone
John Tapsell
Mikhail Gusarov
Eric Anholt
Mathieu Bérard
Tomas Carnecky
Brad Smith
Dave Airlie
Carl Worth
Dan Nicholson
Tiago Vignatti
Ian Romanick
Peter Hutterer
Dave Airlie
George Sapountzis
Drew Parsons
Drew Parsons
Ross Burton
Ben Byer
Tilman Sauerbeck
Hasso Tepper
Sascha Hlusiak
Jeremy Huddleston
Kristian Høgsberg
Jurij Smakov
Jeremy Huddleston
Eamon Walsh
Jeremy Huddleston
Ben Byer
Adam Jackson
Dodji Seketeli
David Nusinow
Keith Packard
Christian Weisgerber
Dodji Seketeli
Ben Byer
Alan Hourihane
Søren Sandmann Pedersen
Carl Worth
Hanno Boeck
Keith Packard
Clark Rawlins
Adam Jackson
Zephaniah E. Hull
Eugene Konev
Soren Sandmann Pedersen
Ben Byer
Matthias Hopf
Ben Byer
Keith Packard
James Steven Supancic III
Aaron Plattner
Jeremy C. Reed
Samuel Thibault
Thomas Hellstrom
Joshua Baergen
Matthew Allum
Ian Romanick
Daniel Stone
Gustavo Pichorim Boiko
Eric Anholt
Alan Coopersmith
Adam Jackson
Ian Romanick
Jeremy C. Reed
Adam Jackson
Fredrik Höglund