Commit Graph

45 Commits

Author SHA1 Message Date
Peter Hutterer
0ac1755977 Merge branch 'master' into mpx
Conflicts:

	Xext/sampleEVI.c
2008-01-26 13:55:07 +10:30
Eamon Walsh
e915a26397 xselinux: Move the extension to extmod instead of being built-in. 2008-01-25 19:22:19 -05:00
Peter Hutterer
8da83836b6 Merge branch 'master' into mpx
Conflicts:

	XTrap/xtrapddmi.c
	Xext/security.c
	Xext/xprint.c
	Xext/xtest.c
	Xext/xvdisp.c
	Xi/exevents.c
	Xi/grabdevb.c
	Xi/grabdevk.c
	Xi/opendev.c
	Xi/ungrdev.c
	Xi/ungrdevb.c
	Xi/ungrdevk.c
	dix/cursor.c
	dix/devices.c
	dix/dixutils.c
	dix/events.c
	dix/getevents.c
	dix/main.c
	dix/window.c
	hw/xfree86/ramdac/xf86Cursor.c
	include/dix.h
	include/input.h
	include/inputstr.h
	mi/midispcur.c
	mi/miinitext.c
	mi/misprite.c
	render/animcur.c
	xfixes/cursor.c
	xkb/xkbAccessX.c
2008-01-03 17:04:54 +10:30
Eamon Walsh
9d03cad144 Remove SecurityPolicy file and associated references in the manpages. 2007-11-08 16:46:31 -05:00
Peter Hutterer
0b729051c0 Merge branch 'master' into mpx
Conflicts:

	Xi/extinit.c
	Xi/grabdev.c
	Xi/setmode.c
	Xi/ungrdev.c
	dix/devices.c
	dix/events.c
	dix/getevents.c
	include/dix.h
	mi/midispcur.c
	mi/misprite.c
	xkb/xkbActions.c
	xkb/xkbEvents.c
	xkb/xkbPrKeyEv.c
2007-11-07 15:37:23 +10:30
Eamon Walsh
af4dde0ac1 xselinux: Remove config file, this has been moved to the policy. 2007-10-17 14:13:02 -04:00
Peter Hutterer
ab88cb8d2e Xext: add missing geint.h to Makefile.am (un-breaks make dist) 2007-10-03 18:08:33 +09:30
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
Matthieu Herrb
4062db4020 typo in comment 2007-09-04 22:39:14 +02:00
Peter Hutterer
583e988b9f Install geext.h, otherwise drivers won't build. 2007-07-10 10:10:04 +09:30
Peter Hutterer
1f97a76476 Merge branch 'master' into mpx
Conflicts:

	dix/devices.c
	hw/xfree86/common/xf86Xinput.c
	hw/xfree86/loader/xf86sym.c
	mi/mieq.c
2007-06-19 17:20:52 +09:30
Eamon Walsh
e2a720c9a1 Merge branch 'master' into XACE-SELINUX
Conflicts:

	dix/dixutils.c
2007-06-11 15:29:11 -04:00
Eugene Konev
857ddbb660 Allow configurable serverconfigdir for security policy location
Allow the location of the SERVERCONFIGdir variable to be defined at
compile-time. This allows us to specify where the security policy will be
located (Debian uses this to put it in /etc). The default is to the
previous location.
2007-05-28 21:53:02 -04:00
Peter Hutterer
5e43910929 Add GenericEvent extension to Xext.
This adds (unconditional) support for the GE extension. Anything from now on
that sends events in MPX will have to use the GE extension. No GE, no MPX
events. GE is not actually used yet from anywhere with this commit.

You will need to update x11proto, xextproto, libX11, libXext and xcb to the
matching xge branches. Things will _NOT_ work without the updated protocol
headers and libraries.
2007-04-30 12:57:42 +09:30
Eamon Walsh
7f16c38ae2 Add SELinux extension configure-time support. 2006-12-12 13:27:03 -05:00
Eamon Walsh
d1110c5c83 Generalize the handling of configuration files that ship with extensions. 2006-09-08 15:28:48 -04:00
Eamon Walsh
0b81fccd2e Merge branch 'master' into my-XACE-modular
Conflicts:

	configure.ac
2006-09-05 18:03:25 -04:00
Matthew Allum
5ddbf4bcd4 Re-add support for tslib (1.0 release) and Xcalibrate extension. 2006-08-29 22:07:15 +01:00
Alan Coopersmith
c2535f6792 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular 2006-08-10 10:37:59 -07:00
Daniel Stone
bf2d7499c8 add securitysrv.h 2006-07-30 11:17:02 +03:00
Daniel Stone
84683f19b4 get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE
Get rid of almost all uses of these definitions.  They're still defined for
delinquent out-of-tree drivers, and also for the Mesa build.  As well as
for miinitext.c.  But largely gone.
2006-07-18 18:17:38 -04:00
Alan Coopersmith
f68ecfa482 Add X-ACE to build system
- Added --disable-xace to configure.ac and issue configure error if trying
   to build XC-Security without X-ACE
 - Added XACE #define to dix-config.h
 - Added X-ACE sources to Xext/Makefile.am
2006-06-20 19:01:34 -07:00
Daniel Stone
a73e0f8cdf Die XTESTEXT1, die! 2006-06-01 18:47:47 +00:00
Fredrik Höglund
e1fc15a85f Put the screensaver extension back in the Xext module.
Move the screenSaverSuspended variable to DIX globals.
Restore the old link order for the Xorg and Xdmx binaries.
2006-04-05 21:08:45 +00:00
Fredrik Höglund
7ea30b507f Move the screensaver extension from module to builtins.
Add the server side implementation of the ScreenSaverSuspend request.
Require scrnsaverproto >= 1.1, and change the linking order of the Xorg
    static libs.
2006-03-31 18:49:38 +00:00
Kristian Høgsberg
966d93ef6d Make the server distcheck and tag 1.0.99.1 snapshot.
Bump CVS version to 1.0.99.1.
Distcheck fixes.
2006-03-21 22:54:38 +00:00
Eric Anholt
ea0b3f65f7 Fix build of Xorg by putting xf86bigfont back into builtin instead of
module sources list.
2006-02-16 21:45:12 +00:00
Keith Packard
8987b2c1ef Make more extensions optional in build (for kdrive). Fix kdrive build for
actual hardware. Fix kdrive pointer signed/unsigned types. Add
    kdrive-required YX rotation functions. Replace rgb text file loading
    with static rgb color table.
2006-02-16 07:17:31 +00:00
Eric Anholt
c845e152f5 Bug #5871: Drop special build infrastructure left over from libcwrapper
times. (George Fufutos)
2006-02-16 05:46:08 +00:00
Eric Anholt
1bbd5e49b1 Bug #5869: Remove traces of EXTMODULE define, which doesn't appear to be
useful any more. (George Fufutos)
2006-02-16 04:59:45 +00:00
Dave Airlie
506eca5f57 Wrap sdk_HEADERS in if XORG as otherwise installing non-xorg servers
breaks.
2006-01-18 06:56:52 +00:00
Adam Jackson
b076dd787f Spell it XINERAMA_SRCS, not PANORAMIX_SRCS. 2005-12-13 17:34:06 +00:00
Alan Coopersmith
438a5549f0 Bugzilla #4715 <https://bugs.freedesktop.org/show_bug.cgi?id=4715> Files in
xserver/xorg/Xext not included in tarball after make dist
2005-12-12 03:06:18 +00:00
Kevin E Martin
7c00afd0ec Define XFree86Server only where it is required. 2005-12-02 06:02:45 +00:00
Kevin E Martin
da5d66f2ff Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
2005-11-29 16:39:33 +00:00
Kevin E Martin
1859c62607 include/dix-config.h.in Add support for more extensions
Add missing files to EXTRA_DIST
2005-10-17 07:18:59 +00:00
Alan Coopersmith
29b5f846d2 Bug #4715 <https://bugs.freedesktop.org/show_bug.cgi?id=4715> Add
SecurityPolicy to EXTRA_DIST (Bill Crawford)
2005-10-09 17:47:34 +00:00
Alan Coopersmith
4608a2b654 Man page processing/installation and other doc file updates 2005-09-30 02:37:57 +00:00
Alan Coopersmith
256fa24945 Add SecurityPolicy file for XCSECURITY extension.
Add README to EXTRA_DIST
2005-09-25 17:48:09 +00:00
Søren Sandmann Pedersen
df938987d6 Add buildsystem for Xprint, and:
Wed Aug 17 14:50:58 2005 Soren Sandmann <sandmann@redhat.com>
Include <X11/extensions/Print{,str}.h> instead of "Print{,str}.h"
Include <X11/fonts/fontstruct.h> isntead of "fonts/fontstruct.h"
Wed Aug 17 14:54:49 2005 Søren Sandmann <sandmann@redhat.com>
Conditionally compile in xprint.c
Add Xprint
2005-08-17 19:03:18 +00:00
Kevin E Martin
86529c07d6 Fix distcheck for server 2005-07-28 23:28:34 +00:00
Søren Sandmann Pedersen
562acf2e69 Add -I$(top_builddir)/hw/xfree86/dixmods/extmod to Xext/Makefile.am Patch
from Stefan Dirsch
2005-07-14 23:41:15 +00:00
Adam Jackson
23d25a656d Remove references to DDX-specific extensions 2005-07-13 23:41:21 +00:00
Daniel Stone
826a6f029f Continuing Makefile cleanup; add DIX_CFLAGS and XORG_CFLAGS everywhere. 2005-07-02 18:59:44 +00:00
Daniel Stone
ded56b1a74 Adding initial build system. 2005-07-01 20:29:53 +00:00