Commit graph

302 commits

Author SHA1 Message Date
Jeremy Huddleston
6b74c535dc 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.
2007-12-07 23:21:08 -08:00
Jeremy Huddleston
54654815fa Darwin: Use __APPLE__ instead of __DARWIN__ 2007-12-07 18:53:08 -08:00
Jeremy Huddleston
477e6d24df 1.3.0-apple4 2007-12-07 18:00:54 -08:00
Ben Byer
7caf51d1a5 ALLOCATE_LOCAL is dangerous on Darwin due to memory layout differences
from Linux, so let's define NO_ALLOCA.
2007-12-06 20:51:32 -08:00
Jeremy Huddleston
9e0032c0b8 Marved version 1.3.0-apple3 2007-12-05 20:17:47 -08:00
Jeremy Huddleston
48e6a75fbd Darwin: Flattened quartz into darwin, renamed darwin xquartz
Leaving xpr unflattened since we want modularity to replace that with xpc (XPluginComposite) at some point
2007-12-05 19:43:49 -08:00
Jeremy Huddleston
e8399fd4d6 Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity. 2007-12-04 17:59:13 -08:00
Jeremy Huddleston
b823224a49 Revert "build system cleanup: move all files from quartz/xpr/ to quartz/"
This reverts commit 73c6f7983d.
2007-12-04 17:34:42 -08:00
Ben Byer
73c6f7983d build system cleanup: move all files from quartz/xpr/ to quartz/ 2007-12-04 15:48:22 -08:00
Jeremy Huddleston
e41af2967e Darwin: RIP dumpkeymap, cr, and fullscreen
Taking out the trash.
We don't need dumpkeymap since we'll be getting keymaps straight from the OS. .Xmodmap should be sufficient for any user-needed changes.  If this is not
the case, please let us know, so we can address any problems you have.
fullscreen never worked AFAIK
cr isn't being used and xpr is much better.
2007-12-03 23:59:19 -08:00
Jeremy Huddleston
0284b3631a 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.
2007-12-03 15:44:38 -08:00
Jeremy Huddleston
a4bbf98c70 Darwin: Really set DEFAULT_FONT_PATH 2007-12-02 13:45:22 -08:00
Jeremy Huddleston
6a744c9480 Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH 2007-12-02 12:32:28 -08:00
Jeremy Huddleston
b6a98afe61 Darwin: Marked 1.3.0-apple2 and X11.app as 2.1.0 2007-12-01 16:23:52 -08:00
Jeremy Huddleston
2b2df4f517 Darwin,Rootless: Makefile cleanup
(cherry picked from commit 9c6d8a035b)
2007-11-26 14:11:01 -08:00
Ben Byer
e27579dfff Removed bogus dependency on xf86bigfontproto 2007-11-22 02:21:31 -08:00
Jeremy Huddleston
e63667390d Readded hw/xfree86/os-support/solaris/Makefile to configure.ac
It looks like it was mistakenly removed at some point.
2007-11-20 06:15:12 -08:00
Jeremy Huddleston
3b0201f893 Merge branch 'server-1.3-branch' into xorg-server-1.2-apple
Conflicts:

	configure.ac
2007-11-19 20:27:52 -08:00
Jeremy Huddleston
6ec763f52c Added --with-x11app-archs configure option
This configure option's value is passed to xcodebuild in ARCHS, so we can easily choose architecture targets for X11.app
2007-11-19 02:38:24 -08:00
Ben Byer
604e6afc8e 1.2a11 2007-11-19 02:38:24 -08:00
Ben Byer
213b51710c From Jeremy Huddleston:
1) Fixed a bug where XQUARTZ was #defined when auto but not when --enable-xquartz
2) Cleaned up missing #includes and function prototypes.
3) Fixed some invalid C syntax problems
4) Removed a bunch of dead code
5) Cleaned up code to prevent some warnings
6) Bugfix in xpr/x-hook.c - looks like someone just forgot to finish writing code for hook_remove()... I only noticed it because gcc -Wall complained about reaching the end of a non-void function... lucky for us gcc is smarter than we are.
2007-11-19 02:38:24 -08:00
Ben Byer
905d672c05 More XDarwin cleanup / dead code removal from Jeremy 2007-11-19 02:38:23 -08:00
Ben Byer
0cf45239c2 Build system patches to remove XDarwin from the build (since it doesn't
work anyway), courtesy of Jeremy Huddleston
2007-11-19 02:38:23 -08:00
Ben Byer
51e0071e32 bump to 1.2a10 2007-11-19 02:38:23 -08:00
Ben Byer
ed6d0b75e6 Trying to add launchd detection to tell Xtrans
to enable launchd support; fix me later.
2007-11-19 02:38:23 -08:00
Ben Byer
9f33e82262 bump to 1.2a9 2007-11-19 02:38:22 -08:00
Ben Byer
9e9633c670 And now we kill XDarwinApp -- credit, Jeremy Huddleston 2007-11-19 02:38:22 -08:00
Ben Byer
c3a514ba45 bump to 1.2a8 2007-11-19 02:38:21 -08:00
Ben Byer
fe794635bd fixes to allow Xvfb and Xephyr to be built if you build with --disable-xdarwin 2007-11-19 02:38:21 -08:00
Ben Byer
f86db8249b bump to version 1.2a7 2007-11-19 02:38:21 -08:00
Ben Byer
df17777fe7 Fixed glx/DarwinGlx symbol problems; other servers (such as xvfb and xnest)
should now be buildable from this code if you pass e.g. --enable-xvfb
to configure.
2007-11-19 02:38:20 -08:00
Ben Byer
707ae28034 bump version to 1.2a6 2007-11-19 02:38:20 -08:00
Ben Byer
a36983602f bump version to 1.2a5 2007-11-19 02:38:20 -08:00
Ben Byer
b6681aff2b bumped version to 1.2a4 2007-11-19 02:38:20 -08:00
Ben Byer
375d506209 bump version to 1.2a3 2007-11-19 02:38:19 -08:00
Ben Byer
966d329b14 add -DROOTLESS_WORKAROUND to CFLAGS 2007-11-19 02:38:19 -08:00
Ben Byer
fe7d2be313 Some autoconf hacks to make 'make dist' work correctly 2007-11-19 02:38:18 -08:00
Ben Byer
f86d2ef33f finished committing downstream changes 2007-11-19 02:38:18 -08:00
Ben Byer
b3dc1483f7 more patches, autoconf fixes... 2007-11-19 02:38:18 -08:00
Ben Byer
6ff9f43ae2 More patches from downstream 2007-11-19 02:38:18 -08:00
Ben Byer
a5b49a19f9 added Apple-specific defaults to configure.ac 2007-11-19 02:38:17 -08:00
Keith Packard
f9a0b93660 Update version to 1.3.0.0 2007-04-19 19:09:43 -07:00
Keith Packard
970cacb264 Bump to version 1.2.99.905 (1.3 RC5) 2007-04-05 23:48:40 -07:00
Keith Packard
042ef1f573 Bump version to 1.2.99.904 (1.3 RC4) 2007-04-05 23:21:19 -07:00
Keith Packard
00e33f87f4 Set version to 1.2.99.903 (1.3 RC3) 2007-03-26 21:21:50 -07:00
Keith Packard
0ebe537983 Update to version 1.2.99.902 2007-03-14 16:36:13 -07:00
Keith Packard
cb86fced0e Set version to 1.3-rc1 (1.2.99.901). 2007-03-04 19:48:40 -08:00
Alan Coopersmith
68b79fb193 Propogate $LIBS for xtrans, clock_gettime, libm, etc. to libs used for each server
(cherry picked from commit 40f84793bc)
2007-02-17 17:23:58 -08:00
Keith Packard
12505d9c0a Merge crtc/output-based mode selection code.
This code comes from the intel driver, so there's no history in this tree.

As the crtc/output-based mode selection code uses ddc, the ddc and i2c
modules have been merged into the server. Attempts to load them are safely
ignored now.
2007-02-14 18:13:15 -08:00
Keith Packard
f1b95fda6c Add support for the DamagePost (XDamage 1.1) request.
This makes damageproto >= 1.1 a requirement to build.
(cherry picked from 0b73a7eb17)
2007-01-29 23:01:37 -08:00