Commit Graph

2196 Commits

Author SHA1 Message Date
Alan Coopersmith
90af38fa0c Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	Xext/appgroup.c
2006-06-21 16:23:31 -07:00
Alan Coopersmith
3e098efa35 Correct ifdef - should be XACE, not XCSECURITY 2006-06-21 16:21:03 -07:00
Alan Coopersmith
77c947b900 Move Xserver internal API for appgroup from Xagsrv.h to appgroup.h
(Since all use is inside the xserver module, might as well keep the header
 in the Xserver module instead of in proto/XExt to allow easier synchronization
 of updates.)
2006-06-21 16:18:41 -07:00
Greg Kroah-Hartman
40aafaf154 fix a number of compiler warnings in os/* 2006-06-21 14:36:09 -07:00
Greg Kroah-Hartman
77aa701e89 add some function prototypes to hw/xprint/DiPrint.h as they are exported 2006-06-21 14:16:48 -07:00
Greg Kroah-Hartman
865884d050 fix compiler warning in dix/xpstubs.c when XPRINT is not defined 2006-06-21 14:16:28 -07:00
Kristian Høgsberg
ed18d776f0 Fix #2488 for fb too: sample pixel center when transforming. 2006-06-21 16:22:14 -04:00
Matthias Hopf
ea5e0eabd1 Bug 4320: Fastpath corner case improvement for Composite. 2006-06-21 17:08:55 +02:00
Eamon Walsh
9af315a9be Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE 2006-06-20 19:03:05 -07: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
Alan Coopersmith
a46c06dab8 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver
Conflicts:

	Xext/appgroup.c
	Xext/security.c
	dix/devices.c
	dix/dispatch.c
	dix/dixutils.c
	dix/events.c
	dix/extension.c
	dix/property.c
	dix/window.c
	os/access.c
2006-06-20 18:40:18 -07:00
Alan Coopersmith
d44b2a0a57 Move Xserver API for security extension to securitysrv.h 2006-06-20 18:22:51 -07:00
Alan Coopersmith
a544359465 Move Xserver API for security extension to securitysrv.h 2006-06-20 18:14:27 -07:00
Alan Coopersmith
49b368c0bb Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-20 16:22:39 -07:00
Alan Coopersmith
481d4012e7 Don't add -ldl to XORG_LIBS if it's not needed for dlopen 2006-06-20 16:16:19 -07:00
Alan Coopersmith
63f6e6bbfd Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-20 16:03:34 -07:00
Alan Coopersmith
6df52fb774 Delete code that's been inside #if 0 since X11R6.7. 2006-06-20 16:02:55 -07:00
Alan Coopersmith
88ede2cec7 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-20 15:29:55 -07:00
Eamon Walsh
227a319340 Add XACE extension source files.
(Copied from XACE-SELINUX branch in Xorg monolith CVS since these were never
 imported to modular cvs or git trees.)
2006-06-20 15:29:42 -07:00
Matthieu Herrb
2b58685402 Check setuid() return value. Bugzilla #7116. 2006-06-20 21:07:53 +02:00
Kristan Høgsberg
4365d16c86 Pull over convolution filter fixes from xgl-0-0-1 branch.
Cherry-picking patches:

	8a5ea68800 and
	4d755fe142
2006-06-19 22:21:49 -04:00
Eamon Walsh
f818e0ab60 Modify XC-SECURITY and XC-APPGROUP extensions to work with XACE
(cherry picked from 0106715000 commit)
2006-06-19 17:24:30 -07:00
Alan Coopersmith
0707eb33d6 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-19 17:09:51 -07:00
Eamon Walsh
37f0ae0245 Replace XC-SECURITY code with XACE security hooks
(cherry picked from 8526cd6395 commit)
2006-06-19 17:09:37 -07:00
Alan Coopersmith
98d17bba71 Tell git to ignore emacs *~ droppings and git .msg files 2006-06-19 17:07:59 -07:00
Eric Anholt
569c808a23 Fix crash when using PICT_x4a4 by supplying an appropriate fbFetchPixel_x4a4. 2006-06-19 16:42:09 -07:00
Eamon Walsh
8d9ccc90a5 Add XACE extension
(partially cherry picked from 8d4f21ab53 commit)
2006-06-19 16:35:03 -07:00
Eric Anholt
5542665041 Clean up gcc warnings from picture format CARD32 -> enum change. 2006-06-19 15:11:56 -07:00
Eric Anholt
520c80f4b8 Don't forget to step the rows when verifying the equivalence of fb/sys areas.
This is only used by fakexa, but we would have missed some errors without this
fix.
2006-06-19 15:11:55 -07:00
Eric Anholt
e793f0eeee Correct component ordering when fetching [ax]4b4g4r4 pixels.
Noticed by:	rendercheck
2006-06-19 15:11:55 -07:00
Eric Anholt
e1672a12eb Convert PICT_* names from #defines to an enum to aid in debugging. 2006-06-19 15:11:55 -07:00
Greg Kroah-Hartman
9742d55c82 update .gitignore to handle Xprint move 2006-06-19 14:40:14 -07:00
Greg Kroah-Hartman
d97a21acb8 fix compiler warnings in hw/xfree86/i2c/fi1236.c 2006-06-19 14:36:54 -07:00
Greg Kroah-Hartman
29c78321e8 fix compiler warning in hw/xfree86/i2c/tda9850.c 2006-06-19 14:36:41 -07:00
Greg Kroah-Hartman
9f2793551f fix compiler warning in hw/vfb/InitOutput.c 2006-06-19 11:50:47 -07:00
Greg Kroah-Hartman
b20ae5ddb7 fix compiler warnings in hw/xfree86/xf4bpp/ppcGC.c 2006-06-19 11:38:52 -07:00
Greg Kroah-Hartman
4d258f3196 fix compiler warnings in XTrap/xtrapdi.c 2006-06-19 11:27:47 -07:00
Greg Kroah-Hartman
870cecb72c fix compiler warnings in XTrap/xtrapdiswp.c 2006-06-19 11:22:42 -07:00
Adam Jackson
a28652f9c3 Another round of loader sense-beating. Remove the (unused) server export
lists, a really bad hash table, the last vestiges of the other backends,
and some miscellaneous cleanups.  Good for dropping 300k from the size of
the built server on x86.
2006-06-19 00:57:18 -04:00
Adam Jackson
98a602fab1 Don't bother building RAC as a module, that's just absurd. 2006-06-18 23:54:04 -04:00
Eric Anholt
76aaf7eae7 Add a couple of (doxygen) comments I wrote while looking at modesetting. 2006-06-18 19:47:51 -07:00
Eric Anholt
6aaf0e5b58 Add options to disable EXA acceleration for Composite/UTS/DFS, and always print
out how much memory EXA is managing for offscreen pixmaps.
2006-06-18 19:47:51 -07:00
Eric Anholt
21ef7e17ef Add some missing .gitignore stuff for Mesa symlinks and other generated files. 2006-06-18 19:47:51 -07:00
Adam Jackson
71fbda8049 Xprint/ -> hw/xprint
XpConfig -> hw/xprint/config
2006-06-18 21:07:28 -04:00
Eric Anholt
868e2cab70 Add explicit dependencies (Xorg_DEPENDENCIES = ) on the internal libraries
(such as libcw.la) that we link into the server, causing it to be rebuild
automatically when they're updated.  Some system libraries are included, but
don't appear to cause any harm.  You would think this would be automatic...
2006-06-16 10:17:51 -07:00
Eric Anholt
53f74b6aa9 Bugzilla #5120, #7246: In CW's GC ops, validate the backing GC against the
backing drawable if the serial numbers differ.  Fixes crash in XAA which
occurred when the DDX bumped the serial number on the backing drawable and
expected it to get re-validated, and we didn't because the wrapped drawable
hadn't been bumped.
2006-06-16 10:14:30 -07:00
Ian Romanick
b90088321e Add arrayobj.c to the Makefile as well. 2006-06-12 15:22:31 -07:00
Ian Romanick
041ef23192 Add new Mesa files arrayobj.c and arrayobj.h. 2006-06-12 09:39:18 -07:00
Greg Kroah-Hartman
caad8b724b fix compiler warnings in record/set.c
(note this only fixed up the function definitions for the static functions
which can not cause any abi incompatibility)
2006-06-09 11:24:57 -07:00
Greg Kroah-Hartman
51489bb5ed more .gitignore updates 2006-06-09 10:59:47 -07:00