Jeremy Huddleston
f4dc521b38
Darwin: Added {/,/System/}Library/Fonts to DEFAULT_FONT_PATH
...
(cherry picked from commit b0069b04dddaa2df6d4cdf86f96fd8a2a257e47e)
2007-12-02 18:22:06 -08:00
Jeremy Huddleston
601307615e
Darwin,Rootless: Makefile cleanup
...
(cherry picked from commit 9c6d8a035b712b219833653ac637b89703a9b0c3)
2007-11-26 14:49:32 -08:00
Eamon Walsh
996b621bec
registry: swap out the DTRACE XErrorDB stuff for the new registry call.
2007-11-26 15:59:44 -05:00
Eamon Walsh
c0f9e204ba
registry: rename the SERVERCONFIGdir and relocate it to /usr/lib/xorg
...
by default.
2007-11-26 15:24:15 -05:00
Jeremy Huddleston
bcbaf2a0ce
Darwin: Dead code removal, Code cleanup, Added launcher
...
Imported changes from xorg-server-1.2-apple to make master more current wrt
file layout, build system changes, and dead code removal.
2007-11-21 19:52:11 -08:00
Alan Coopersmith
2f387d913a
Enable use of /dev/urandom on Solaris as well
2007-11-20 18:31:07 -08:00
Eamon Walsh
2d17f47cc7
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
hw/xnest/Pixmap.c
include/dix.h
2007-11-19 18:10:46 -05:00
Adam Jackson
514ba4ca72
Bug #1612 : Use a stronger PRNG.
...
Currently just reads from /dev/urandom, and only on Linux.
2007-11-16 19:53:11 -05:00
Adam Jackson
c67b9c5fc3
Clean up some garbage in driver enumeration.
2007-11-15 14:24:36 -05:00
Adam Jackson
3dde66f96b
Start 1.4.99
2007-11-14 15:10:59 -05:00
Eamon Walsh
1603130236
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
Xext/xace.c
Xext/xace.h
2007-11-14 13:35:50 -05:00
Ben Byer
d68bd55104
fixing GLX in Xquartz
2007-11-08 20:08:49 -08:00
Eamon Walsh
1c6cb353f7
Restore the XC-SECURITY option in configure.ac, but disabled by default.
2007-11-08 17:02:06 -05:00
Dodji Seketeli
476a9d85f8
Xephyr: do not AM_CONDITIONAL inside a shell if branch
2007-11-08 09:11:05 +01:00
Dodji Seketeli
26e1fc7b42
Xephyr: don't use Xv or GL when those are disabled.
2007-11-07 18:48:23 +01:00
Dodji Seketeli
950f9995d1
Xnest: fix lib dependancy to make libtool happy
...
This fixes an undefined symbol error happening when compiling
the server with the --disable-xv configure switch.
Basically, xnest was linking against
@XSERVER_LIBS@ and @XNEST_LIBS@ and the order of the libraries
given to the linker at the end of the process was bogus.
* configure.ac: make XNEST_LIBS contain the $XSERVER_LIBS re-ordered
in such a way that the linker finds the symbols of all the libs contained
in $XNEST_LIBS.
* hw/xnest/Makefile.am: don't link against @XSERVER_LIBS@ anymore because
XNEST_LIBS contains the right thing.
2007-11-07 18:43:16 +01:00
Eamon Walsh
a52c9b2a59
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
2007-11-05 19:08:36 -05:00
Adam Jackson
58332894c0
Export the server ABI versions from xorg-server.pc
2007-11-05 17:18:46 -05:00
Daniel Stone
dda10c9066
Remove all traces of external RGB database (and Speedo)
...
Remove all references to an external RGB database (which hasn't been enabled
for a very long time). Also get rid of some references to Speedo fonts.
2007-11-05 16:28:35 +00:00
Daniel Stone
df57ae1639
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.
2007-10-28 15:46:26 +02:00
Eamon Walsh
b633d54b94
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
GL/glx/glxscreens.c
hw/xnest/Screen.c
render/glyph.c
render/glyphstr.h
render/render.c
2007-10-25 12:19:30 -04:00
David Nusinow
7f5e71fa73
Make PCI text file directory configurable
2007-10-21 23:41:49 -04:00
Eric Anholt
a3a95d3475
Merge branch 'master' into glyph-pixmaps
...
Conflicts:
configure.ac
2007-10-19 15:44:17 -07:00
Eamon Walsh
c3f7b86255
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
os/access.c
2007-10-17 15:00:54 -04:00
Eamon Walsh
baabae623b
xselinux: Started reworking extension using new XACE hooks.
2007-10-17 13:54:56 -04:00
Keith Packard
f2da10f7bc
KDRIVE_LOCAL_LIBS includes some system libraries, not just internal x server libs
2007-10-17 10:51:02 +08:00
Kristian Høgsberg
695eb8b2e8
Implement GLX pbuffers.
2007-10-12 19:12:26 -04:00
Eamon Walsh
6adeba1730
dix: Add a new "registry" mechanism for registering string names of things.
...
Supports protocol requests, events, and errors, and resource names.
Modify XRES extension to use it.
2007-10-11 14:18:59 -04:00
Alan Coopersmith
fdef7be5c8
Sun bug 6589829: include zoneid of shm segment in access policy for MIT-SHM
...
<http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6589829 >
<http://www.opensolaris.org/os/community/arc/caselog/2007/500/ >
2007-10-09 18:44:51 -07:00
Christian Weisgerber
49c8285e38
FreeBSD/alpha server build requires libio (missed in modularization).
2007-10-09 15:25:16 -07:00
Dodji Seketeli
604ebb5a6d
Merge Xephyr-XV/GL stuff into master
2007-10-03 16:14:08 +02:00
Eric Anholt
a358b87f45
Just link against libcrypto instead of relying on openssl pkg-config.
...
Also fix incorrect library inclusion by kdrive which broke the build.
2007-10-02 13:14:12 -07:00
Eric Anholt
439edc768e
Merge branch 'glyph-pixmaps'
...
Conflicts:
configure.ac
exa/exa_render.c
2007-10-02 12:14:04 -07:00
Keith Packard
c8ccf469dc
Do not build hw/xfree86/os-support/bus/ix86Pci.c on Linux.
...
Linux has custom PCI bus support functions, so this generic code is
unnecessary.
2007-10-02 08:59:40 -07:00
Dodji Seketeli
a38ad562a6
make xephyr talk DRI protocol with hostX
...
* configure.ac,include/dix-config.h.in: define the XEPHYR_DRI macro.
define it when --enable-xephyr and --enable-dri are both turned on.
* hw/kdrive/ephyr/XF86dri.c: copy this from mesa source to enable
Xephyr to talk DRI protocol the host X. In mesa, this is used by libGL.so to
talk DRI protocol with the server.
* hw/kdrive/ephyr/ephyr.c: finally initialise the DRI extension
in the ephyrInitScreen() function.
* hw/kdrive/ephyr/ephyrdri.c,ephyrdriext.c: safeguard the compilation
using the XEPHYR_DRI macro.
2007-10-02 16:55:14 +02:00
Dodji Seketeli
8426eb2433
link and init xv
2007-10-02 16:55:13 +02:00
Alan Coopersmith
2d93e69690
Rework local client id finding code to be more uniform
2007-09-27 16:47:32 -07:00
Eamon Walsh
27612748e0
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
dix/devices.c
2007-09-26 07:47:29 -04:00
Eamon Walsh
97c150b61b
Merge branch 'master' into XACE-SELINUX
...
Conflicts:
afb/afbpntwin.c
afb/afbscrinit.c
afb/afbwindow.c
cfb/cfb.h
cfb/cfballpriv.c
cfb/cfbscrinit.c
cfb/cfbwindow.c
configure.ac
fb/wfbrename.h
hw/xfree86/xf4bpp/ppcIO.c
hw/xfree86/xf4bpp/ppcPntWin.c
hw/xfree86/xf4bpp/ppcWindow.c
hw/xfree86/xf8_32bpp/cfbscrinit.c
mfb/mfb.h
mfb/mfbpntwin.c
mfb/mfbscrinit.c
mfb/mfbwindow.c
mi/miexpose.c
Note: conflicts caused by devPrivates rework vs. paintwindow changes.
2007-09-19 07:25:55 -04:00
Dodji Seketeli
170fc77d9e
xserver: don't force DTRACE detection by default
...
this fixes a breakage caused by 7a4ec34e25 .
When running a non DTRACE aware system that is not darwin*, DTRACE was getting
required. Now it is not anymore.
2007-09-19 09:54:09 +02:00
Ben Byer
9b4f515717
XDarwin: We build many many different targets, let's break them out into autoconf conditionals
2007-09-18 21:40:32 -07:00
Ben Byer
7a4ec34e25
XDarwin: Disable dtrace support on Darwin 9 (since it doesn't work ... yet ...)
2007-09-18 20:37:09 -07:00
Ben Byer
3c19ec47b4
XDarwin: changed XF86BigFont support default from yes to auto so XDarwin can disable it
2007-09-18 20:15:44 -07:00
Dodji Seketeli
2e3e08d31e
xserver: test presence of strlcpy in configure
...
* configure.ac: define HAVE_STRLCPY when function strlcat is present
this serves at least to unbreak libxtrans code compilation.
2007-09-11 08:50:41 +02:00
Ben Byer
321e0a2160
fixed cut-and-paste typo
2007-09-09 16:29:08 -07:00
Alan Hourihane
84eb7e6224
Fix Xdmx build
2007-09-06 13:37:24 +01:00
Ben Byer
35ec8b89f4
DDX changes for XDarwin
...
Creating a real DDX section for XDarwin instead of
stuffing it into the XORG section in a half-assed manner.
2007-09-06 05:34:14 -07:00
Ben Byer
f3f614cd01
Revert "configure.ac: exclude pci-access dependency from XDarwin"
...
This reverts commit 20c6677d1b .
2007-09-05 20:34:25 -07:00
Ben Byer
bf1641b94c
XDARWIN: Add launchd support
...
This adds a bit of glue to configure.ac to support launchd detection;
on OS X (or other platforms which choose to implement launchd), this allows
the system to automagically start the Xserver as necessary to serve clients.
2007-09-05 20:34:25 -07:00
Ben Byer
71c21dea74
added HAVE_LAUNCHD check to configure.ac (mostly for OSX)
2007-09-05 20:34:25 -07:00