Commit Graph

31 Commits

Author SHA1 Message Date
Jeremy Huddleston 511beddffa XQuartz: Provide in-tree implementation of strndup(3) if needed
This function was added to Mac OS X 10.7, so we need to provide it
for earlier releases.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-12-19 21:43:29 -08:00
Jeremy Huddleston bea57392c7 XQuartz: Fix Makefile dependencies
automake generates _DEPENDENCIES from _LIBADD, but it strips out variables.
This resulted in not relinking if some components were rebuilt (like
libdix, libos, etc).

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-28 13:07:20 -07:00
Jeremy Huddleston dd5d91fc95 XQuartz: Remove explicit link against libGL
This was indented to force a link against OpenGL.framework's libGL, but it
actually resulted in linking against mesa's libGL due to the ordering of -L

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-03 16:01:18 -04:00
Jeremy Huddleston fbc8aae8e9 XQuartz: Move -lXplugin to LDFLAGS from LDADD
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-06-01 20:41:11 -07:00
Jeremy Huddleston f46835a096 XQuartz: Redirect stdout/stderr to asl
In order to improve logging in XQuartz, stdout and stderr should be redirected
to asl (syslog).

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-05-12 20:19:40 -07:00
Gaetan Nadon 5f169f5493 XQuartz: remove undefined XSERVER_CFLAGS variable
This is a variable local to configure.ac which is not AC_SUBST()
It is undefined in any generated Makefile.

Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-03-15 08:24:02 -07:00
Jeremy Huddleston 0a361d0e5f XQuartz: Use --with-launchd-id-prefix for consistency with xinit
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME
(cherry picked from commit 990038ab006b2f5e03dcef385514ba4e4584bd25)
2009-09-04 00:42:31 -07:00
Jeremy Huddleston be4dd35ffe XQuartz: Initial support for automatic updates through Sparkle
(cherry picked from commit c45f1be36426bceeef9af67c26351114f14f5277)
2009-07-20 22:04:18 -07:00
Peter Hutterer c2c515ead3 dix: remove all but main() from main.c
All other functions are pushed into where they seemed to fit.
main.c is now linked separately into libmain.a and linked in by the various
DDXs.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-04-28 16:03:56 +10:00
Jeremy Huddleston 1c504dff8a XQuartz: Fix builddir != srcdir issues and undef _XSERVER64 where appropriate on fat binary compilation 2009-01-15 21:03:27 -08:00
Jeremy Huddleston 1beff89810 XQuartz: misc 1.6 updates (still --disable-glx)
rlAccel is not longer compatable, and it's not worth fixing
  Don't override DeviceCursorInitialize with a noop
  Don't do a SwitchCoreKeyboard (which wasn't even needed in the first place)
(cherry picked from commit c137f681680e1d04b1513a8be68aeda4d1c56fd5)
2009-01-11 01:55:26 -08:00
Jeremy Huddleston 895186e026 XQuartz: Re-enable rlAccel
It was incorrectly blamed for some crashes a few months ago, and it should be
safe to use until we get an EXA driver to replace it.
(cherry picked from commit 8121f30bd29591fc74fbc680fbbf20210271fa58)
2008-12-28 22:17:03 -08:00
Jeremy Huddleston 22b2811e6a XQuartz: Name the startup shell script X11 for better compatability
(cherry picked from commit f84613d6fcbbb5f769ee34cff0900353a13693cf)
2008-12-21 21:33:17 -08:00
Jeremy Huddleston fa4f2527a5 XQuartz: pbproxy: Simplify linking
(cherry picked from commit 909cc5c4dca0f63e90505575bbd454b46a4670cc)
2008-12-03 21:59:23 -08:00
Jeremy Huddleston 3d527b91b4 XQuartz: Added option to enable/disable test extensions
defaults write org.x.X11 enable_test_extensions -boolean true
(cherry picked from commit fd4710aff3723d5f3422cf6a6530172eafc556d9)
(cherry picked from commit 635019ad18db921fec99256294debd8571074abf)
2008-11-28 13:02:54 -08:00
Jeremy Huddleston a9796c7bc4 XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...
(cherry picked from commit cbae2b447357b3fed6ff19414c60dd3792045600)
2008-11-28 13:02:41 -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 42944936326ef8732f622db9f75b79a92980550d)
2008-11-15 19:52:34 -08:00
Jeremy Huddleston b078936571 XQuartz: Initial work on readding GLX to the 1.5 server
(cherry picked from commit a186cab6ae82340770c13b37ff5df731ce2a0ceb)
2008-11-14 15:10:32 -08:00
Jeremy Huddleston f12d7ad164 XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app
(cherry picked from commit 183ca5d68b4f34e248749f304ce140de11bd451b)
2008-10-28 22:01:40 -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 8edc5fb38c922f28659d2f823148339a8907c4d9)
(cherry picked from commit 88033a66a5549870fd053795b019d4c22950425b)
2008-10-03 11:11:47 -07:00
Jeremy Huddleston 1885582444 XQuartz: Placate automake which doesn't like escaped newlines even in comments...
(cherry picked from commit 73db1170129a31ad2d55a7e83ac6dfc8030e47f1)
2008-08-29 21:18:26 -07:00
Michel Dänzer 073116cc44 Remove commented out lines that make automake 1.9 puke. 2008-08-08 12:15:27 +02:00
Jeremy Huddleston 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
Jeremy Huddleston 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
Jeremy Huddleston c180a52332 XQuartz: Removed code path for old startup
(cherry picked from commit a9ee6b0d00fab01a78408a85e6542e88c19fda7c)
2008-06-10 10:51:58 -07:00
Jeremy Huddleston 2393dae6ff XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/
(cherry picked from commit 7f840e9dc180421eaa9b0ea3ab993fdd5b2466e5)
2008-06-04 12:24:04 -07:00
Jeremy Huddleston 4be2104c80 XQuartz: More work towards Mach-IPC startup... started working on FD passing
(cherry picked from commit 27fbfeacfa16d620801ac3492b25c1e50aec8588)
2008-05-18 22:45:19 -07:00
Jeremy Huddleston 2408303d79 XQuartz: Added functionality to add a file descriptor to the connection list after the server is already running.
(cherry picked from commit 543c2cd68d1ffef65d4644b860faad7191c6b9da)
2008-05-17 14:56:53 -07:00
Jeremy Huddleston adc62f62b9 Xquartz: Xquartz stub now can send Mach IPC to start the server.
(cherry picked from commit 55a3bca8ea42f8677897f94bf0a429bdc08c6696)
2008-05-17 14:56:26 -07:00
Jeremy Huddleston a7800d9355 XQuartz: Starting to work on the new Mach IPC startup stuff for better launchd, ApplicationServices, and Dock support
(cherry picked from commit 9b67fca9b7d3050d3d5582a5210270db7eb2ed05)
2008-05-12 10:42:12 -07:00
Jeremy Huddleston 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