Commit Graph

547 Commits

Author SHA1 Message Date
Jeremy Huddleston
88033a66a5 XQuartz: Added a --enable-integrated-xpbproxy configure option for building xpbproxy as an app or as a thread.
(cherry picked from commit 8edc5fb38c)
2008-10-03 11:09:26 -07:00
Jeremy Huddleston
207ba1783b Added dep on applewmproto 1.1.0
(cherry picked from commit b350b06674)
2008-10-03 11:08:39 -07:00
Jeremy Huddleston
86fa42ed82 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-09-26 12:29:44 -07:00
Adam Jackson
97f688f2b4 xserver 1.5.1 2008-09-23 14:51:33 -04:00
Adam Jackson
68c575cb73 Move RELEASE_DATE below AC_INIT.
Doing it the other way around clobbers the setting, which means you get
a null release date string in the log.  Thanks autoconf!
2008-09-23 11:05:44 -04:00
Adam Jackson
05fb2f9e12 xserver 1.5.0
Drinkin' island is inside each of us, my son.
2008-09-03 19:14:22 -04:00
Adam Jackson
6cb7f595b9 Disable DRI2 by default. 2008-09-03 14:59:24 -04:00
Adam Jackson
ed2248f673 Disable XTrap build by default. 2008-09-03 14:58:43 -04:00
Jeremy Huddleston
144746223d XQuartz: Added pasteboard proxy code stripped out of quartz-wm.
(cherry picked from commit 1f842c71c3)
2008-09-03 09:23:06 -07:00
Jeremy Huddleston
3739525d57 XQuartz: Don't even build with GLX support since swrast now depends on libdrm 2008-08-30 14:18:07 -07:00
Jeremy Huddleston
0b2ab2327e Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-08-14 09:12:52 -07:00
Alan Coopersmith
50382652af Fix --disable/--enable-kbd_mode configure flag 2008-08-12 14:53:14 -07:00
Jeremy Huddleston
4545ba91e9 XQuartz: Disable the Xquartz AIGLX for now since it doesn't even compile any more... 2008-08-08 01:52:18 -07:00
Daniel Stone
b5932f176c DIX: Add strcasestr from FreeBSD
Add strcasestr for use on systems which don't have it.
(cherry picked from ad87c72edc commit)
2008-08-06 16:12:06 -07:00
Jeremy Huddleston
dfcf7f0db7 XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition
(cherry picked from commit 672682ebf9)
2008-08-05 18:41:44 -07:00
Jeremy Huddleston
a20a7eb85e Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-08-05 12:53:36 -07:00
Jeremy Huddleston
29bce2bb59 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 08f3fe153e)
2008-08-05 12:51:12 -07:00
Peter Hutterer
da29a25315 Require inputproto 1.4.4
for DeviceControlChanged define.
2008-07-29 10:04:24 +09:30
Adam Jackson
c0c73e9236 xserver 1.4.99.906
You know, Mesa 7.1 could release any day now and that'd be just fine.
2008-07-23 14:16:47 -04:00
Jeremy Huddleston
e5d4970d4d Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-07-11 10:12:55 -07:00
Dave Airlie
5144158ced dri2: bump libdrm numbers as 2.3.1 is released without ttm interface 2008-07-03 20:01:28 +10:00
Adam Jackson
0617653277 xserver 1.5RC5 2008-06-30 16:11:32 -04:00
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
Jeremy Huddleston
d451f3d146 Merge branch 'server-1.5-branch' into xorg-server-1.5-apple 2008-06-24 09:36:01 -07: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
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