Commit Graph

505 Commits

Author SHA1 Message Date
Adam Jackson
32cd2c5109 xserver 1.5RC4.
Remember kids, distcheck before you tag.
2008-06-30 11:18:27 -04:00
Adam Jackson
6a2ee7e0bb xserver 1.5RC3. 2008-06-30 10:40:50 -04:00
Dan Nicholson
8017c99901 Actually enable building GLX without Mesa source
(cherry picked from commit e837244947)
2008-06-26 16:14:52 -04:00
Kristian Høgsberg
a194718e9d Move GL/glx on level up now that it's the only thing left under GL.
(cherry picked from commit c3eb5b80d8)
2008-06-26 16:14:52 -04:00
Kristian Høgsberg
0234d3d48f 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.
(cherry picked from commit e5aad4bc08)
2008-06-26 16:14:51 -04:00
Jeremy Huddleston
d88da6638e Moved Apple GL bits into our DDX subtree
(cherry picked from commit c9356f3289)
(cherry picked from commit d09c520b32)
2008-06-26 16:14:51 -04:00
Ben Byer
e8a1eda65d add missing DARWIN_GLX_LIBS in configure.ac
(cherry picked from commit a033c0b3db)
(cherry picked from commit 744d0cfda7)
2008-06-26 16:14:51 -04:00
George Sapountzis
9b4d5b6521 glcore: drop GLcore (build system)
(cherry picked from commit dd7a53f8f2)
2008-06-26 16:14:50 -04:00
Donnie Berkholz
f2c30a57e3 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.
(cherry picked from commit efb723e166)

Conflicts:

	configure.ac
2008-06-26 16:14:50 -04:00
Hasso Tepper
3a7657b713 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.
(cherry picked from commit 08073862f8)
2008-06-24 12:38:10 -04:00
Alan Coopersmith
2f8ad7f938 Check for strcasestr and workaround it on systems without it
(cherry picked from ed65e8b4f0 commit)
2008-06-23 19:41:10 -07:00
Matthieu Herrb
7e3ec36e0e Merge branch 'server-1.5-branch' of git+ssh://herrb@git.freedesktop.org/git/xorg/xserver into server-1.5-branch 2008-06-18 09:20:05 +02:00
Ian Romanick
fba700f1f6 Bug #15169: Make the server build again on Alpha.
Still won't work until the kernel makes the resource files actually exist.

(cherry picked from commit f3490d3eba)
2008-06-17 10:48:41 -04:00
Matthieu Herrb
d254903413 configure.ac: fix the help string for --with-freetype.
Default value was changed to 'no' in e5b1d38e14
but the help string wasn't updated.
2008-06-14 14:40:32 -06:00
Sascha Hlusiak
b4c5832c75 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.
(cherry picked from commit 47eb658e80)
2008-06-11 11:27:01 -04: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
Adam Jackson
9211a10b98 xserver 1.4.99.902 2008-05-21 17:52:23 -04: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
Tilman Sauerbeck
d2f4471933 Fixed configure.ac for autoconf 2.62. 2008-04-15 11:47:23 +10: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
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
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
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