Commit Graph

398 Commits

Author SHA1 Message Date
Jeremy Huddleston
bdd5dcac68 1.4.0-apple4 2008-04-26 19:23:04 -07:00
Jeremy Huddleston
239be26a43 XQuartz: Disable RECORD
(cherry picked from commit db7d118527)
2008-04-25 17:57:23 -07:00
Jeremy Huddleston
21fc95930f Moved Apple GL bits into our DDX subtree 2008-04-23 10:35:59 -07:00
Jeremy Huddleston
22d15afc51 1.4.0-apple3 2008-04-21 20:04:28 -07:00
Jeremy Huddleston
e36c7d425c XQuartz: Cleanup turning off COMPOSITE
(cherry picked from commit 8f920fca6f)
2008-04-20 01:24:18 -07:00
Jeremy Huddleston
6497d31257 1.4.0-apple2 2008-04-18 00:36:28 -07:00
Jeremy Huddleston
6d3d344b5b XQuartz: Don't use composite. 2008-04-16 21:49:19 -07:00
Jeremy Huddleston
bc4883e00b Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2008-04-08 21:25:37 -07:00
Jeremy Huddleston
df21312c8b XQuartz: Fix issue where clicking on an X11 window might send that event to an X11 window in another space.
(cherry picked from commit 2e78818232)
2008-04-08 16:59:56 -07:00
Hasso Tepper
dd6b0de38d 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:28 +03:00
Jeremy Huddleston
f03202ad15 Rootless: Removed safeAlphaXXXX() in favor of using fb/pixman 2008-03-17 23:57:41 -07:00
Jeremy Huddleston
a4069c94a6 1.4.0-apple1 2008-02-15 23:16:11 -08:00
Jeremy Huddleston
9f5507a3c5 Merge branch 'server-1.4-branch' into xorg-server-1.4-apple 2007-12-20 19:04:33 -08:00
Jeremy Huddleston
641227883c Xquartz: Fixed launchd detection 2007-12-15 14:00:56 -08:00
Jeremy Huddleston
32e74d744c Xquartz: Don't hardcode libexec dir
(cherry picked from commit 67b479ef80)
2007-12-13 16:28:20 -08:00
Jeremy Huddleston
8eb15256ec Xquartz: Don't hardcode LaunchAgents dir
(cherry picked from commit 07a12d71fe)
2007-12-13 16:27:46 -08:00
Daniel Stone
d63efecc94 Bump to 1.4.0.90 2007-12-12 21:57:59 +02:00
Jeremy Huddleston
5676ba6fc0 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-08 00:32:13 -08:00
Jeremy Huddleston
aed01c4a8b Darwin: Use __APPLE__ instead of __DARWIN__
(cherry picked from commit 54654815fa)
2007-12-07 18:53:31 -08:00
Ben Byer
dc56305e16 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:15 -08:00
Jeremy Huddleston
df5c9fef3c 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:26:16 -08:00
Jeremy Huddleston
3f60656eb3 Darwin: Rework build system to more accurately reveal code infrastructure and facilitate future modularity.
(cherry picked from commit e8399fd4d6)
2007-12-04 18:00:00 -08:00
Jeremy Huddleston
345e21a4b1 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.
(cherry picked from commit e41af2967e)
2007-12-04 16:41:50 -08:00
Jeremy Huddleston
e7026216cc 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 0284b3631a)
(cherry picked from commit b0349d5b6c)
(cherry picked from commit c3c71a882f)
2007-12-03 20:20:05 -08:00
Jeremy Huddleston
b0069b04dd Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH 2007-12-02 18:21:40 -08:00
Jeremy Huddleston
9c6d8a035b Darwin,Rootless: Makefile cleanup 2007-11-26 13:04:57 -08:00
Jeremy Huddleston
28ae09f355 Darwin: Sync-up to master and xorg-server-1.2-apple where appropriate 2007-11-23 14:18:04 -08:00
Jeremy Huddleston
738a229a71 Various cleanups to get Xquartz to compile. 2007-11-20 06:59:11 -08:00
Jeremy Huddleston
89c4aa9d4a Force --disable-Xorg when on darwin 2007-11-20 05:57:15 -08:00
Jeremy Huddleston
db6404f9d0 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-20 04:07:34 -08:00
Ben Byer
cee516e142 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-20 04:07:22 -08:00
Ben Byer
cad8133cce More XDarwin cleanup / dead code removal from Jeremy 2007-11-20 04:02:15 -08:00
Ben Byer
da6cfcb89b Build system patches to remove XDarwin from the build (since it doesn't
work anyway), courtesy of Jeremy Huddleston
2007-11-20 04:00:00 -08:00
Ben Byer
835de9ceae Trying to add launchd detection to tell Xtrans
to enable launchd support; fix me later.
2007-11-20 03:59:53 -08:00
Ben Byer
1bad9b87e5 And now we kill XDarwinApp -- credit, Jeremy Huddleston 2007-11-20 03:48:24 -08:00
Ben Byer
c213749b19 fixes to allow Xvfb and Xephyr to be built if you build with --disable-xdarwin 2007-11-20 03:41:29 -08:00
Ben Byer
ed161d013c 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-20 03:40:56 -08:00
Ben Byer
6a14175622 add -DROOTLESS_WORKAROUND to CFLAGS 2007-11-20 03:30:34 -08:00
Ben Byer
a2a2bbfe84 Some autoconf hacks to make 'make dist' work correctly 2007-11-20 03:16:49 -08:00
Ben Byer
616ba3c7d6 finished committing downstream changes 2007-11-20 03:15:02 -08:00
Ben Byer
b8e6c80c0d more patches, autoconf fixes... 2007-11-20 03:13:06 -08:00
Ben Byer
120e831640 More patches from downstream 2007-11-20 03:01:12 -08:00
Ben Byer
68ad49994f added Apple-specific defaults to configure.ac 2007-11-20 02:05:41 -08:00
Alan Coopersmith
4c20d61046 Actually build Secure RPC authentication support (missed in modularization)
(cherry picked from commit 23fbd5292d)
2007-11-06 14:54:20 +00:00
Daniel Stone
bd779f8cde 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.

(cherry picked from commit df57ae1639)
2007-10-30 00:57:49 +02:00
Eric Anholt
99dd8b9414 Bump version to 1.4.0. 2007-09-06 01:42:43 -07:00
Eric Anholt
70ed110538 Fix server version reporting to be the server package version.
Previously, the server version reported by xdpyinfo and Xorg -version would
bear some vague resemblance to a X.Org katamari version, but in the presence
of modularization (and client-server relationships with different katamari
versions on each side) those numbers don't really make sense.  Instead, just
report the package version.

When branching a stable branch, master's version should be immediately updated
to the endpoint of the stable branch plus a snapshot of 1 (for example,
1.4.0.1 after server-1.4-branch).  The stable branch should then be changed to
RC0 at that time (1.3.99.0, for example).

This scheme was partially attempted for server 1.3, but lacked the appropriate
master updates, thus why it had to be revisited now.  While here, we can also
remove a lot of versioning complexity since everything is based on the package
version.

(cherry picked from commit 47300ed2be)
2007-09-05 13:31:50 -07:00
Eric Anholt
ec56c5e958 Bump version to 1.3.99.2. 2007-08-31 20:02:52 -07:00
Eric Anholt
1a125b5214 Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it.
(cherry picked from commit 07630d897e)
2007-08-31 15:58:16 -07:00
Søren Sandmann Pedersen
ec126e29e4 Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix
bug 11620 (reported by Jens Stroebel.
(cherry picked from commit 53941c8e68)
2007-08-23 12:19:28 -07:00