Commit Graph

624 Commits

Author SHA1 Message Date
Eric Anholt
d6498ea621 Move the apple fat binary hacks back to a header file, and make it apple-only.
(cherry picked from commit dd098501d8)
2009-01-30 16:44:49 -08:00
Jeremy Huddleston
b530a0e97b XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation
(cherry picked from commit f020900641)
2009-01-30 16:44:49 -08:00
Keith Packard
251d0d8090 Update version to 1.5.99.901 (1.6 RC1) 2009-01-12 13:03:30 -08:00
Jeremy Huddleston
69ddac2328 Apple: Don't use DRI2
(cherry picked from commit a1d35cee59)
2009-01-12 10:41:59 -08:00
Jeremy Huddleston
4130761f15 XQuartz: Fat binary buildfixes
Let Xarch.h set X_BYTE_ORDER for us.
Determine _XSERVER64 at build time.
(cherry picked from commit f54736c2b0)
(cherry picked from commit cc677cb4f4)
2009-01-09 11:03:37 -08:00
Jeremy Huddleston
b8877bb9e4 XQuartz: pbproxy: We explicitly need libX11 for pbproxy
(cherry picked from commit 32824120da)
(cherry picked from commit 8c6e8fa811)
2009-01-09 11:02:29 -08:00
Jeremy Huddleston
9eb5f30929 XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
Also some prefix related fixes.
(cherry picked from commit fd459e9658)
(cherry picked from commit 99b2cbf061)
2008-12-16 12:03:05 -08:00
Jeremy Huddleston
53d93d0d29 Removed unised option from configure.ac for launchd
(cherry picked from commit 87e4de0a9a)
(cherry picked from commit 451050b1e2)
2008-12-16 12:03:04 -08:00
Jeremy Huddleston
df3f23fe8d XQuartz: pbproxy: Simplify linking
(cherry picked from commit 909cc5c4dc)
(cherry picked from commit cbb9ee57f8)
2008-12-16 12:03:04 -08:00
Keith Packard
523aae1fa6 Bump version to 1.5.99.3 (1.6 beta3)
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 22:10:56 -08:00
Adam Jackson
0d27dd23cf Default to x86emu even on i386 linux
vm86 mode is a bad idea anyway, and using the emulator everywhere
means we get a consistent set of bugs.
(cherry picked from commit 58a27d2932)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:49:55 -08:00
Kristian Høgsberg
de83a342f4 Test for DRI2 extension in dri_internal.h and only enable AIGLX DRI2 if found.
(cherry picked from commit 110a71d11a)

Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-09 20:39:06 -08:00
Keith Packard
b268458eab Bump version to 1.5.99.2 (1.6 beta 2)
Signed-off-by: Keith Packard <keithp@keithp.com>
2008-12-02 23:43:02 -08:00
Kristian Høgsberg
cbf4fec529 Bump dri2proto requirement to 1.99.3. 2008-12-01 21:37:04 -05:00
Peter Hutterer
b983c4fa1e Require inputproto 1.5
Also claim to now support XI 1.5.

Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
2008-12-01 08:16:57 +10:00
Keith Packard
f0e7a792be Add server support for RRGetScreenResourcesCurrent
This depends on randrproto 1.2.99.1

Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit fc70839431)
2008-11-26 15:55:56 -08:00
Keith Packard
4715f079b9 Merge commit 'origin/master' 2008-11-25 22:19:08 -08:00
Keith Packard
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
Adam Jackson
5bb86bafd6 PCI: Remove non-pciaccess path for x86. 2008-11-24 23:40:02 -05:00
Keith Packard
c2f254da69 Randr now depends on Render for matrices 2008-11-24 13:24:36 -08:00
Jeremy Huddleston
8e2287c220 XQuartz: Updated some code to use newer server API 2008-11-22 13:57:45 -08:00
Jeremy Huddleston
701f8e3a94 XQuartz: Update applewm deps
(cherry picked from commit 0ad91c59be)
2008-11-21 11:55:43 -08:00
Matthieu Herrb
10d472bf9d Support for BSD apm
XXX check amd64 pci init
2008-11-21 18:07:03 +01:00
Rémi Cardona
1e4412abc4 drop unused HAVE_LIBDRM_2_2
Signed-off-by: Julien Cristau <jcristau@debian.org>
2008-11-20 15:25:43 +01:00
Alan Coopersmith
570835b9a8 Use bsd_pci stub routines on Solaris too, since we use pciaccess for real work
Depends on commit 70e18a3b6b to get
definition of xf86InitVidMem on Solaris.
2008-11-19 10:19:20 -08:00
Jeremy Huddleston
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 4294493632)
2008-11-15 19:52:34 -08:00
Michel Dänzer
e5271c3747 Set libdrm flags correctly even when only DRI2 is enabled. 2008-11-15 13:27:42 +01:00
Jeremy Huddleston
b078936571 XQuartz: Initial work on readding GLX to the 1.5 server
(cherry picked from commit a186cab6ae)
2008-11-14 15:10:32 -08:00
Adam Jackson
6d21fbf006 kdrive: Bye bye Xvesa 2008-11-05 11:39:46 -05:00
Peter Hutterer
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
Daniel Stone
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
Jeremy Huddleston
3695f62d07 XQuartz: Require applewmproto-1.1.1
(cherry picked from commit ed235e3406)
2008-10-21 09:32:09 -07:00
Jeremy Huddleston
6dbfca571f Depend on xtrans >= 1.2.2 for TRANS_NOXAUTH 2008-10-07 10:07:03 -07:00
Jeremy Huddleston
6020c3fbfe XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
(cherry picked from commit 8edc5fb38c)
(cherry picked from commit 88033a66a5)
2008-10-03 11:11:47 -07:00
Jeremy Huddleston
505c216d03 Added dep on applewmproto 1.1.0
(cherry picked from commit b350b06674)
2008-10-03 11:11:37 -07:00
Peter Hutterer
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
Keith Packard
a39377cbcb Revert "Render: Use built-in SHA1 library"
This reverts commit d3bd31fddf.

X.org should not be providing a custom SHA1 implementation.
2008-09-23 09:22:07 -07:00
John Tapsell
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
Julien Cristau
ab17f88506 Don't use our version of ffs() if the system has one 2008-09-22 02:49:15 +02:00
Mikhail Gusarov
52bbfc5bfa scrnsaver is optional at build time. 2008-09-15 10:43:46 -04:00
Eric Anholt
ce781cac1b Fix distcheck. 2008-09-11 16:48:23 -07:00
Jeremy Huddleston
1669308be6 XQuartz: Added pasteboard proxy code stripped out of quartz-wm.
(cherry picked from commit 1f842c71c3)
(cherry picked from commit 144746223d)
2008-09-03 09:33:58 -07:00
Jeremy Huddleston
5d7d959b11 XQuartz: Don't even build with GLX support since swrast now depends on libdrm
(cherry picked from commit 3739525d57)
2008-08-30 14:21:11 -07:00
Kristian Høgsberg
5af77d43fe DRI2: Drop sarea use, implement server side swap buffers. 2008-08-29 12:33:28 -04:00
Alan Coopersmith
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
Adam Jackson
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
Adam Jackson
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
Peter Hutterer
1e62e77327 Require inputproto 1.9.99.4 2008-08-15 15:19:44 +09:30
Adam Jackson
c1e9b7dc6f Sledgehammer off the DRI2 build system. 2008-08-13 14:13:55 -04:00
Mathieu Bérard
9f9268821b The smart scheduler is not optional. 2008-08-11 13:52:38 -04:00