Jeremy Huddleston
33bfb761a7
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-06-10 01:45:40 -07:00
Drew Parsons
c00ff932f8
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.
(cherry picked from commit 2a3d1421e0
)
2008-06-09 13:57:03 -04:00
Drew Parsons
30774d6b3c
Define XPRINT in XPRINT_CFLAGS (configure.ac)
...
-DXPRINT had only been set for Xprt in hw/xprint/Makefile.am
After commit 7c0709a736
it is also
required for ps/PsArea.c and PsFonts.c to ensure ‘requestingClient’ is
defined, so make it a global Xprint definition in configure.ac.
(cherry picked from commit 28a6719fd486d9a9cecad0b057d9ea7c59c66055)
(cherry picked from commit 571206832d
)
2008-06-09 13:56:53 -04:00
Dave Airlie
50e77eb838
int10: add pci_device_enable support on Linux
...
(cherry picked from commit ea4ec9e998
)
2008-06-09 13:29:32 -04:00
Jeremy Huddleston
f060c41843
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-05-23 02:31:25 -07:00
Jeremy Huddleston
a6869b03f6
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 1e1f4fb717
)
2008-05-23 02:30:59 -07:00
Adam Jackson
9211a10b98
xserver 1.4.99.902
2008-05-21 17:52:23 -04:00
Jeremy Huddleston
e2431ff488
XQuartz: Reorganized some of the build system in prep for the Mach IPC startup work.
...
(cherry picked from commit 2232c91d5c
)
2008-05-08 19:57:48 -07:00
Jeremy Huddleston
1f0706062e
Set CSRG_BASED on OSX
...
(cherry picked from commit ff085deba1
)
2008-05-08 19:56:19 -07:00
Jeremy Huddleston
89e8654ba4
XQuartz: Move server bits into bundle and setup stub in /usr/X11/bin/Xquartz in prep for startup rewrite
...
(cherry picked from commit 453a982e63
)
2008-05-06 02:49:31 -07:00
Jeremy Huddleston
1448fed9b6
XQuartz: Disabled DPMS extension
2008-04-28 15:39:02 -07:00
Jeremy Huddleston
b9420202a8
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-24 19:54:45 -07:00
Jeremy Huddleston
bf0144f380
darwin gots /dev/urandom, too yo!
2008-04-24 19:39:27 -07:00
Alan Coopersmith
7c05b4c621
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 >
(cherry picked from b1ae7c79db
commit)
2008-04-24 19:06:18 -07:00
Jeremy Huddleston
c9356f3289
Moved Apple GL bits into our DDX subtree
2008-04-23 10:13:50 -07:00
Ben Byer
a033c0b3db
add missing DARWIN_GLX_LIBS in configure.ac
2008-04-21 22:28:03 -07:00
Jeremy Huddleston
d013c23f37
XQuartz: Cleanup turning off COMPOSITE
...
(cherry picked from commit 8f920fca6f
)
2008-04-20 01:24:45 -07:00
Jeremy Huddleston
5cef157d9d
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-18 17:23:23 -07:00
Jeremy Huddleston
01a931c313
XQuartz: Don't use composite.
...
(cherry picked from commit 6d3d344b5b
)
2008-04-16 21:52:54 -07:00
Tilman Sauerbeck
d2f4471933
Fixed configure.ac for autoconf 2.62.
2008-04-15 11:47:23 +10:00
Jeremy Huddleston
12640de083
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-08 21:25:02 -07:00
Jeremy Huddleston
2d4194a8d1
XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
...
(cherry picked from commit df21312c8b
)
2008-04-08 17:02:56 -07:00
Julien Cristau
fe87d921da
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.
(cherry picked from commit 6c0cfe3d43
)
2008-04-07 10:32:13 -04:00
Eric Anholt
bd91565ac8
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.
(cherry picked from commit d1de3dda8e
)
2008-04-07 10:32:04 -04:00
Hasso Tepper
db62e494ff
configure.ac: DragonFly BSD support
...
Add support for DragonFly BSD, which is just the same as FreeBSD for all
of these cases.
(cherry picked from commit 0f87b41a43
)
2008-04-07 14:11:03 +03:00
Jeremy Huddleston
025909a605
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-04-02 17:44:10 -07:00
Kristian Høgsberg
81af92f5d9
Pick up dri2proto from the standard proto header include path.
2008-04-02 19:22:05 -04:00
Kristian Høgsberg
2156bdf3b7
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.
(cherry picked from commit c40e0b51f0
)
2008-04-01 11:58:27 -04:00
Jeremy Huddleston
d84cda5fb1
Merge branch 'server-1.5-branch' into xorg-server-1.5-apple
2008-03-31 16:44:29 -07:00
Matthieu Herrb
727e22c830
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).
(cherry picked from commit db248ffb84
)
2008-03-24 10:09:09 -04:00
Jeremy Huddleston
8bc58eb960
Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman
...
(cherry picked from commit f03202ad15
)
2008-03-18 00:11:06 -07:00
Adam Jackson
375908557f
xserver 1.4.99.901
2008-03-06 00:19:09 -05:00
Adam Jackson
a9028a492f
Branch for 1.5.
2008-03-03 15:04:49 -05:00
Matthieu Herrb
c934366424
use UTILS_SYS_LIBS to pass SYS_LIBS to utils/ioports correctly
2008-03-02 19:32:01 +01:00
George Sapountzis
cdd46aa3cd
configure: minor cleanup
...
- dmx
- darwin: remove from xorg options
- xephyr: libxv is client lib
2008-03-01 19:49:21 +02:00
Kristian Høgsberg
b71dc54352
Add DRI2 module.
2008-02-14 19:53:49 -05:00
Adam Jackson
3eaecdd66e
Disable Record by default.
2008-02-14 07:07:34 +11:00
Tiago Vignatti
315d6a2b1d
Fix Xephyr compilation without GLX.
2008-01-15 02:59:56 -02:00
Jurij Smakov
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
Dave Airlie
a18d28a5ef
damn then my cut-n-paste ate my end of lines...
2007-12-17 13:49:16 +10:00
Dave Airlie
d096bbd01b
Xquartz ate my DMX - thanks
2007-12-17 13:45:15 +10:00
Jeremy Huddleston
b4ef8885e1
Xquartz: Fixed launchd detection
2007-12-15 14:00:19 -08:00
Eamon Walsh
a14a143832
Bump server version for devPrivates rework / XACE.
2007-12-14 00:57:16 -05:00
Eamon Walsh
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
Jeremy Huddleston
cb0d7e2c26
Xquartz: Don't hardcode libexec dir
...
(cherry picked from commit 67b479ef80
)
2007-12-13 16:29:40 -08:00
Jeremy Huddleston
c39212fd73
Xquartz: Don't hardcode LaunchAgents dir
...
(cherry picked from commit 07a12d71fe
)
2007-12-13 16:29:09 -08:00
Eamon Walsh
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
Jeremy Huddleston
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 6b74c535dc
)
2007-12-07 23:26:11 -08:00
Jeremy Huddleston
0ad1c359c5
Darwin: Use __APPLE__ instead of __DARWIN__
...
(cherry picked from commit 54654815fa
)
2007-12-07 18:54:58 -08:00
Alan Coopersmith
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
Ben Byer
56f5066d47
ALLOCATE_LOCAL is dangerous on Darwin due to memory layout differences
...
from Linux, so let's define NO_ALLOCA.
(cherry picked from commit 7caf51d1a5
)
2007-12-07 14:08:36 -08:00
Jeremy Huddleston
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 48e6a75fbd
)
2007-12-05 20:32:40 -08:00
Jeremy Huddleston
8d0efe4c2a
Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
...
(cherry picked from commit e8399fd4d6
)
2007-12-04 18:00:28 -08:00
Jeremy Huddleston
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 e7026216cc
)
2007-12-03 20:22:01 -08:00
Alan Coopersmith
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
Adam Jackson
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
Jeremy Huddleston
f4dc521b38
Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH
...
(cherry picked from commit b0069b04dd
)
2007-12-02 18:22:06 -08:00
Jeremy Huddleston
601307615e
Darwin,Rootless: Makefile cleanup
...
(cherry picked from commit 9c6d8a035b
)
2007-11-26 14:49:32 -08:00
Eamon Walsh
996b621bec
registry: swap out the DTRACE XErrorDB stuff for the new registry call.
2007-11-26 15:59:44 -05:00
Eamon Walsh
c0f9e204ba
registry: rename the SERVERCONFIGdir and relocate it to /usr/lib/xorg
...
by default.
2007-11-26 15:24:15 -05:00
Jeremy Huddleston
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
Alan Coopersmith
2f387d913a
Enable use of /dev/urandom on Solaris as well
2007-11-20 18:31:07 -08:00
Eamon Walsh
2d17f47cc7
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
2007-11-19 18:10:46 -05:00
Adam Jackson
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
Adam Jackson
c67b9c5fc3
Clean up some garbage in driver enumeration.
2007-11-15 14:24:36 -05:00
Adam Jackson
3dde66f96b
Start 1.4.99
2007-11-14 15:10:59 -05:00
Eamon Walsh
1603130236
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/xace.c
Xext/xace.h
2007-11-14 13:35:50 -05:00
Ben Byer
d68bd55104
fixing GLX in Xquartz
2007-11-08 20:08:49 -08:00
Eamon Walsh
1c6cb353f7
Restore the XC-SECURITY option in configure.ac, but disabled by default.
2007-11-08 17:02:06 -05:00
Dodji Seketeli
476a9d85f8
Xephyr: do not AM_CONDITIONAL inside a shell if branch
2007-11-08 09:11:05 +01:00
Dodji Seketeli
26e1fc7b42
Xephyr: don't use Xv or GL when those are disabled.
2007-11-07 18:48:23 +01:00
Dodji Seketeli
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
Eamon Walsh
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
Adam Jackson
58332894c0
Export the server ABI versions from xorg-server.pc
2007-11-05 17:18:46 -05:00
Daniel Stone
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
Daniel Stone
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
Eamon Walsh
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
David Nusinow
7f5e71fa73
Make PCI text file directory configurable
2007-10-21 23:41:49 -04:00
Eric Anholt
a3a95d3475
Merge branch 'master' into glyph-pixmaps
...
Conflicts:
configure.ac
2007-10-19 15:44:17 -07:00
Eamon Walsh
c3f7b86255
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
os/access.c
2007-10-17 15:00:54 -04:00
Eamon Walsh
baabae623b
xselinux: Started reworking extension using new XACE hooks.
2007-10-17 13:54:56 -04:00
Keith Packard
f2da10f7bc
KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs
2007-10-17 10:51:02 +08:00
Kristian Høgsberg
695eb8b2e8
Implement GLX pbuffers.
2007-10-12 19:12:26 -04:00
Eamon Walsh
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
Alan Coopersmith
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
Christian Weisgerber
49c8285e38
FreeBSD/alpha server build requires libio (missed in modularization).
2007-10-09 15:25:16 -07:00
Dodji Seketeli
604ebb5a6d
Merge Xephyr-XV/GL stuff into master
2007-10-03 16:14:08 +02:00
Eric Anholt
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
Eric Anholt
439edc768e
Merge branch 'glyph-pixmaps'
...
Conflicts:
configure.ac
exa/exa_render.c
2007-10-02 12:14:04 -07:00
Keith Packard
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
Dodji Seketeli
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
Dodji Seketeli
8426eb2433
link and init xv
2007-10-02 16:55:13 +02:00
Alan Coopersmith
2d93e69690
Rework local client id finding code to be more uniform
2007-09-27 16:47:32 -07:00
Eamon Walsh
27612748e0
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/devices.c
2007-09-26 07:47:29 -04:00
Eamon Walsh
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
Dodji Seketeli
170fc77d9e
xserver: don't force DTRACE detection by default
...
this fixes a breakage caused by 7a4ec34e25
.
When running a non DTRACE aware system that is not darwin*, DTRACE was getting
required. Now it is not anymore.
2007-09-19 09:54:09 +02:00
Ben Byer
9b4f515717
XDarwin: We build many many different targets, let's break them out into autoconf conditionals
2007-09-18 21:40:32 -07:00
Ben Byer
7a4ec34e25
XDarwin: Disable dtrace support on Darwin 9 (since it doesn't work ... yet ...)
2007-09-18 20:37:09 -07:00
Ben Byer
3c19ec47b4
XDarwin: changed XF86BigFont support default from yes to auto so XDarwin can disable it
2007-09-18 20:15:44 -07:00
Dodji Seketeli
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