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
Jeremy Huddleston
Peter Hutterer
Keith Packard
John Tapsell
Julien Cristau
Mikhail Gusarov
Eric Anholt
Kristian Høgsberg
Alan Coopersmith
Adam Jackson
Mathieu Bérard
Matthieu Herrb
Tomas Carnecky
Alan Hourihane
Daniel Stone
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