andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
7,444 Commits 86 Branches 473 Tags 48 MiB
801f14d4b7
Commit Graph

645 Commits

Author SHA1 Message Date
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
Ben Byer
7381e9149e added an exclusion for setting XORG on darwin 2007-09-05 15:51:11 -07:00
Ben Byer
20c6677d1b configure.ac: exclude pci-access dependency from XDarwin 
XDarwin doesn't need any of this pci stuff since it doesn't talk directly to hardware,
so it doesn't make sense to require it when building on OSX/Darwin.
 2007-09-05 14:31:01 -07:00
Eric Anholt
47300ed2be 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.
 2007-09-05 12:43:28 -07:00
Dodji Seketeli
6c89d1237c Kdrive: unbreak kdrive linking 
* configure.ac: re-sort Kdrive libs so that symbols get properly resolved.
          Basically, all some libs are present in both $KDRIVE_LIBS and $XSERVER_LIBS,
          and some libs orders are not correct. So I made sure Kdrive servers don't have
          to link against $KDRIVE_LIBS  *and* $XSERVER_LIBS. They just have to link
          against $KDRIVE_LIBS now.
        * hw/kdrive/*/Makefile.am: update those makefile to reflect the change in configure.ac
 2007-09-05 17:46:49 +02:00
Eric Anholt
f7f79724fd Increase despair by fixing xprint build after my _DEPENDENCIES changes. 2007-09-04 16:08:13 -07:00
Eric Anholt
07630d897e Bug #7364: Require renderproto 0.9.3 on 64-bit, and fix build with it. 2007-08-31 15:16:01 -07:00
Eric Anholt
a02db0d500 Convert servers to using _DEPENDENCIES to ensure proper rebuilds. 
This cleans up server Makefile.ams a little bit, but also means that people
messing with configure.ac need to be careful with whether they put libraries
in the _LIBS or _SYS_LIBS targets.  Hopefully the comment in configure.ac will
clarify the issues.
 2007-08-31 13:09:45 -07:00
Eric Anholt
adf46b57ce Replace BSD custom PCI code with a stub implementation thanks to pciaccess. 
Note that pciaccess doesn't yet have Net/OpenBSD support, but the relevant
code should go there instead of disconnected code in the X Server.

While here, remove the now-disabled INCLUDE_XF86_NO_DOMAIN from the headers,
and un-disable xf8StdAccResFromOS for those OSes without domain support which
will need it.
 2007-08-28 10:13:27 -07:00
Eamon Walsh
4017d31902 devPrivates rework: since API is already broken, switch everything 
over to new system.

Need to update documentation and address some remaining vestiges of
old system such as CursorRec structure, fb "offman" structure, and
FontRec privates.
 2007-08-28 09:28:25 -04:00
Eamon Walsh
8554707326 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	include/miscstruct.h
	mi/mibstore.c
	mi/midispcur.c
	os/Makefile.am
 2007-08-28 07:25:21 -04:00
Keith Packard
7d54399cfd Add XSERVER_LIBPCIACCESS to xorg-server.h when using libpciaccess 2007-08-26 22:11:45 -07:00
Ian Romanick
8b6b40b727 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/generic.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/loader/xf86sym.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/Pci.h
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/int10/linux.c
 2007-08-23 18:19:17 -07:00
Søren Sandmann Pedersen
943dd6ad99 Revert "Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix"" since the pixman changes have been pushed now. 
This reverts commit 57f7f2a532.
 2007-08-23 12:15:03 -04:00
Eric Anholt
57f7f2a532 Revert "Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix" 
The corresponding pixman code hasn't been pushed, so revert until the code is
ready.

This reverts commit 53941c8e68.
 2007-08-22 09:02:03 -07:00
Søren Sandmann Pedersen
b6a7c0112c Merge branch 'master' of ssh+git://sandmann@git.freedesktop.org/git/xorg/xserver 2007-08-21 14:26:34 -04:00
Søren Sandmann Pedersen
53941c8e68 Require pixman 0.9.5; Use pixman_image_set_source_clipping() to fix 
bug 11620 (reported by Jens Stroebel.
 2007-08-21 14:26:14 -04:00
Alan Coopersmith
23fbd5292d Actually build Secure RPC authentication support (missed in modularization) 2007-08-17 15:29:47 -07:00
Alan Coopersmith
6cef7b9611 Correct XErrorDB path and make it configurable (used by DTrace support) 2007-08-15 16:44:49 -07:00
Alan Coopersmith
59961e47df xorgcfg needs PIXMAN_CFLAGS in order to build libc_wrapper.c 2007-08-10 16:08:41 -07:00
Daniel Stone
838e59c02e configure.ac: Add $CONFIG_LIB to server libraries 
Make sure all DDXes get $CONFIG_LIB.  Build-tested with Xvfb and Xdmx.
 2007-08-08 01:34:59 +03:00
Eric Anholt
fef4c7a6f1 Fix driver build after pixman changes. 2007-08-07 09:01:24 -07:00
Søren Sandmann Pedersen
aa3c6aaaab Require pixman-1 0.9.4, update pixman includes to new scheme 2007-08-06 19:00:59 -04:00
Eamon Walsh
acc9a42c92 Temporarily disable Security and SELinux extensions 
while changes to XACE are being made.
 2007-08-06 12:16:59 -04:00
Carl Worth
19b3b1fd8f Use strong hash (SHA1) for glyphs 
Using a cryptographically strong hash means that comparing the
hash alone is sufficient for determining glyph equality (no need
to compare the glyph bits directly). This will allow us to replace
system-memory copies of the glyph bits, (which we've only been
holding onto for comparisons), with Pixmaps.
 2007-08-02 22:49:56 -07:00
Eamon Walsh
e34fcd2bf4 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	dix/devices.c
	dix/property.c
	include/dix.h
 2007-08-02 14:27:03 -04:00
Julien Cristau
a04c95f444 configure.ac: Fix argument quoting for argv[] 
m4 quoting.  Yar boo sux.
 2007-08-01 21:05:04 +03:00
Daniel Stone
99a88826e5 configure.ac: Actually use -lrt in monotonic clock test 
If we need -lrt to use clock_gettime, then make sure we link with it.
 2007-08-01 21:05:04 +03:00
Daniel Stone
1c80e04f87 configure.ac: Disable D-Bus config API support by default 
This is problematic, so don't even bother with it unless someone wants it.
respeclaration is dead, long live HAL.
 2007-08-01 21:05:04 +03:00
Daniel Stone
ad7421fc76 Bump version to 1.3.99.1 for development 
This is not actually .1, just bumping for a different devel version.
 2007-08-01 08:30:00 +03:00
Daniel Stone
1150969b82 Convert all my license statements to the standard form 
Convert all my license statements to the standard, accepted form:
cf. <20070717142307.GD13478@fooishbar.org>
    http://lists.freedesktop.org/archives/xorg/2007-July/026451.html

keithp's license on configure.ac changed with his verbal permission.
 2007-08-01 01:53:31 +03:00
Daniel Stone
8658f5d923 Hotplug: Add HAL support 
Add support for HAL-based hotplugging, in which we just get the list of
input devices and properties from HAL.  Requires an FDI which is not yet
in mainline HAL.
 2007-08-01 01:53:31 +03:00
Daniel Stone
4d3379d418 Fonts: Fix builtin fonts 
Make sure the font path is always 'built-ins' when we use built-in fonts,
rather than having it as a fixed path for a while, then clobbering it
halfway through startup.
 2007-08-01 01:53:31 +03:00
Daniel Stone
1cdadc2f43 Hotplug: Separate D-Bus into core and hotplug API components 
Break up D-Bus into two components: a D-Bus core that can be used by any
part of the server (for the moment, just the D-Bus hotplug API, and the
forthcoming HAL hotplug API), and the old D-Bus hotplug API.
 2007-08-01 01:53:31 +03:00
Daniel Stone
06dd2748da configure.ac: Properly check XFree86 proto modules 
Not sure why these are conditionals, anyway.  This one really needs
revisiting, but at least causes configure, rather than the compilation,
to bomb out.
 2007-08-01 01:53:30 +03:00
Daniel Stone
fd10312b42 configure.ac: Fix KDrive VESA/fbdev conditionals 
Make sure we actually respect anything explicitly given on the configure
line, instead of just stomping it with what we detect.
 2007-08-01 01:53:30 +03:00
Hanno Boeck
0a4e931115 xnest: fix linking since dbus 
Fixes bug 8955
 2007-07-12 10:17:07 +10:00
Tiago Vignatti
a92dc6b529 Remove redundant linking in kdrive. Fix configure.ac variable name and clean 
it up a little.
 2007-07-05 02:28:14 -03:00
Keith Packard
866f092ca0 Make Composite manual redirect windows not clip their parent. 
This patch changes the semantics of manual redirect windows so that they no
longer affect the clip list of their parent. Doing this means the parent can
draw to the area covered by the child without using IncludeInferiors. More
importantly, this also means that the parent receives expose events when
that region is damaged by other actions.
 2007-07-03 14:29:11 -07:00
Tiago Vignatti
62f43d8b33 Relink properly all kdrive servers when changes happen. 2007-06-27 16:27:29 -03:00
Tiago Vignatti
3860996d56 Remove double-defined. 2007-06-27 16:27:29 -03:00
Ian Romanick
ab7a6d860d Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
 2007-06-18 16:51:13 -07:00
Søren Sandmann Pedersen
eb2d7fe02f Replace fbFillmmx() with pixman_fill() and remove fbmmx.[ch] 2007-06-11 22:43:01 -04:00
Søren Sandmann Pedersen
f52ae237d3 Require pixman 0.9.2 2007-06-11 22:02:39 -04:00
Eamon Walsh
e2a720c9a1 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	dix/dixutils.c
 2007-06-11 15:29:11 -04:00
Clark Rawlins
8d5f4368ea Really make sure BUILD_TIME doesn't have a leading zero. 
date +'%k%M%S' still gives a leading zero in the hour after midnight...

Add a leading 1 and remove it in xf86PrintBanner().
 2007-06-11 16:53:38 +02:00
Søren Sandmann Pedersen
54e023cec0 Don't pass regions to pixman_image_composite() anymore. 2007-06-11 09:43:15 -04:00
Michel Dänzer
5cbec267b6 Make sure BUILD_TIME doesn't have a leading zero. 
It causes the compiler to treat it as an octal constant instead of decimal as
intended, which could even cause a build failure in the cases of 08 and 09.

Thanks to Clark Rawlins for pointing out the problem.
 2007-06-11 12:38:41 +02:00
Adam Jackson
c1a49a9269 GNU is wrong and ` is not left-quote. 2007-06-10 22:14:57 -04:00
Dave Airlie
67a0a4da1a update xproto dependency to at least 7.0.9 2007-06-11 11:55:11 +10:00
Zephaniah E. Hull
0cbc3a4da2 Print the build time as well as the date if we can. 2007-06-04 02:03:44 -04:00
Drew Parsons
2f13b7c113 Update Xprint build for pixman. 
Xprt links libfb, which now uses pixman.  Update configure.ac to
require module $PIXMAN for XPRINT.
Also, use $(top_builddir) to reference libfb.la and other local
libraries, rather than using the relative reference ../..
 2007-05-30 03:07:30 +10: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
Eric Anholt
8f98be7db3 Fix bswap detection on BSD (mis-added '_' in function names). 2007-05-24 11:20:59 -07:00
Eamon Walsh
2a4aa63a23 Merge branch 'master' into XACE-SELINUX 
Conflicts:

	include/miscstruct.h
 2007-05-22 14:50:26 -04:00
Soren Sandmann Pedersen
8e56f5be4b Add dependency on pixman 0.9.0 2007-05-15 11:13:14 -04:00
Adam Jackson
20c5250e48 Use system copy of cbrt() if available. 
Also move the replacement inline into miarc.c, since that's the only user.
 2007-05-11 11:43:19 -04:00
Tilman Sauerbeck
bd0abb2844 Bug #10823: Fixed default OSNAME value. 
We try to get OSNAME from uname by default now.
 2007-05-02 17:20:48 +02:00
Peter Hutterer
c0346e57e6 Require inputproto 1.4.2. 
Requirement was introduced with c7e2ba0c9b.
 2007-04-26 12:03:28 +09:30
Eric Anholt
28bb34eec6 Belatedly bump XORG_VERSION for 7.2. 2007-04-18 13:48:28 -07:00
Eric Anholt
5d8e8a7f4b Remove libminimi build. 
It appears to have been a leftover of a previous incarnation of the build
system that didn't handle miinitext.c well.
 2007-04-18 13:22:26 -07:00
Eamon Walsh
cf962a849d Merge branch 'master' into XACE-SELINUX 
Conflicts:

	configure.ac
 2007-04-05 14:41:39 -04:00
George Sapountzis
5a804f2e97 configure: minor cosmetic, move GLX extension options together. 2007-04-05 19:14:31 +03:00
Eamon Walsh
99b220969f Merge branch 'master' into XACE-SELINUX 2007-03-28 12:54:04 -04:00
Ian Romanick
2c6d471088 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/dri/dri.c
 2007-03-28 08:08:04 -07:00
Eric Anholt
6ed08949af Move libcw setup to the only renderer requiring it (XAA). 
Additionally, protect libcw setup behind checks for Render, to avoid
segfaulting if Render isn't available (xnest).

The previous setup was an ABI-preserving dance, which is better nuked now.
Now, anything that needs libcw must explicitly initialize it, and
miDisableCompositeWrapper (previously only called by EXA and presumably binary
drivers) is gone.
 2007-03-27 17:31:28 -07:00
Eamon Walsh
0331c6a8fc Merge branch 'master' into XACE-SELINUX 2007-03-26 10:28:05 -04:00
Alan Coopersmith
b8df961843 Define XF86PM on Solaris x86 builds now that we have sun_apm.c 2007-03-19 18:03:26 -07:00
Eamon Walsh
23fc429aad Merge branch 'master' into XACE-SELINUX 2007-03-05 12:18:54 -05:00
Ben Byer
7f2b9f3790 autoconf fixes for XDarwin (created DARWIN_LIBS) 2007-03-03 19:27:53 -08:00
Matthias Hopf
b11dfac287 Legacy framebuffer support wasn't compiled if Xorg wasn't explicitly enabled. 2007-03-02 12:30:26 +01:00
Eamon Walsh
c16343ac2c Make mfb, cfb, and afb support configurable at build-time. 2007-02-27 14:14:47 -05:00
Ben Byer
4660eaaffb configure fixes for darwin 2007-02-18 14:09:51 -08:00
Daniel Stone
a88844eccb configure.ac: disable dmx per default 
Disable DMX until it gets ported to the new input API.
 2007-02-17 20:35:39 +02:00
Ben Byer
d287b76471 cleaned up some linking ugliness in hw/darwin/quartz 2007-02-17 03:47:42 -08:00
Ben Byer
81444486be autoconf goodness for XDarwin, courtesy of pogma 2007-02-17 02:23:11 -08:00
Ben Byer
cece060157 build fix for configure.ac / BUILD_DARWIN, oops 2007-02-17 01:00:13 -08:00
Keith Packard
d4eb4d0650 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-15 20:36:20 -08:00
Daniel Stone
8f6961d385 configure.ac: add xdarwin stubs 
Add stub AM_CONDITIONALs to at least fix the build.
 2007-02-15 19:08:46 +02:00
Daniel Stone
a3b62623b8 change versioning for new server version scheme 
See:
http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446
 2007-02-15 17:07:42 +02:00
Eamon Walsh
f452507ca9 Merge branch 'master' into my-XACE-SELINUX 2007-02-15 09:47:20 -05:00
Eamon Walsh
04632835b7 Merge branch 'master' into my-XACE-SELINUX 2007-02-15 09:27:05 -05:00
Ian Romanick
c4fe1bcce1 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-02-14 15:39:52 -08:00
Adam Jackson
d21c95f80b Hook up --with-builderstring for vendor build identification. 2007-02-12 17:22:39 -05:00
Ian Romanick
16eb7254f8 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-02-09 12:38:49 -08:00
Alan Hourihane
eb228e8d1e clean up more of the vbo fallout 2007-02-04 22:06:59 +00:00
Dave Airlie
d8e148ec84 update xserver for vbo code in mesa 2007-02-04 18:39:04 +11:00
Ian Romanick
a216de9b7f Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-01-25 10:17:32 -08:00
Alan Coopersmith
5abd50e37c Correct help lines for configure's --with-vendor-name flags 2007-01-24 18:54:38 -08:00
Ian Romanick
c279d5fdc5 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 2007-01-19 12:59:54 -08:00
Ian Romanick
079a6a55a5 Convert to new pci_device_cfg_write_u* interface. 2007-01-15 11:39:24 -08:00
Eric Anholt
7fccec91c4 Bug #9555: Always define _GNU_SOURCE in glibc environments. 
This keeps us from having to define _POSIX_C_SOURCE, _BSD_SOURCE, and
_XOPEN_SORUCE to get the C environment we want in different places.  It also
fixes the build on linux due to RTLD_DEFAULT having not been defined.
 2007-01-10 13:10:43 -08:00
Ian Romanick
da09964a93 Merge branch 'origin' into pci-rework 
Conflicts:

	hw/xfree86/int10/generic.c
 2007-01-09 15:27:34 -08:00
Michel Dänzer
359d20532b Require glproto >= 1.4.8 for GLX. 
It builds against 1.4.7 as well, but it hardcodes the GLX_EXT_tfp tokens that
were finalized in 1.4.8, so GLX_EXT_tfp breaks if the client side was built
against an older glproto. This will hopefully alert people to rebuild other
components (in particular Mesa) against the new glproto as well.
 2007-01-09 09:53:45 +01:00
Alan Coopersmith
88740c4855 Use PKG_CHECK_EXISTS(libdrm) to determine if DRI should be enabled on Solaris 2007-01-08 17:36:28 -08:00
Eric Anholt
0b73a7eb17 Add support for the DamagePost (XDamage 1.1) request. 
This makes damageproto >= 1.1 a requirement to build.
 2007-01-05 18:26:58 -08:00
Alan Coopersmith
2fd4626fa6 Make GLX byteswap macros more portable 
- Use autoconf tests instead of platform-specific #ifdef's to decide
  which macros to use.
- Provide fallbacks for platforms like Solaris that don't provide any
  of the existing known forms.
 2007-01-03 15:44:55 -08:00
Eamon Walsh
a81dbaae05 Merge branch 'master' into my-XACE-SELINUX 2006-12-19 16:11:19 -05:00
James Steven Supancic III
a5fcf1e5e7 Fix RENDER issues (bug #7555) and implement RENDER add/remove screen 
support (bug #8485).
 2006-12-16 12:02:38 -05:00
Eamon Walsh
5719afe6d3 Change symbol in libaudit library test. 2006-12-12 13:27:03 -05:00
Eamon Walsh
28e80cd65b Add SELinux extension configure-time support. 2006-12-12 13:27:02 -05:00
Ian Romanick
e1f73d2208 Merge branch 'master' of ssh+git://idr@git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86Configure.c
	hw/xfree86/common/xf86Helper.c
	hw/xfree86/common/xf86pciBus.c
	hw/xfree86/int10/helper_exec.c
	hw/xfree86/os-support/bus/Pci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/os-support/linux/lnx_pci.c
	hw/xfree86/scanpci/Makefile.am
	hw/xfree86/utils/pcitweak/Makefile.am
	hw/xfree86/utils/scanpci/Makefile.am
 2006-12-08 17:24:15 -08:00
Daniel Stone
edabf45425 configure.ac: add CONFIG_LIB to Xvfb 2006-12-06 23:24:24 +02:00
Daniel Stone
d17ec01e83 remove CID support (bug #5553) 
Remove CID from all our fontpaths.
(cherry picked from 69820a10e3 commit)
 2006-12-06 23:24:23 +02:00
Alan Coopersmith
a5d6499d66 Fix syntax error in configure check for SYSV_IPC that broke with Sun cc 2006-12-01 16:42:37 -08:00
Eric Anholt
5dbcd34a0a Register dependency on new RandR protocol. 2006-11-27 16:26:14 -08:00
Eric Anholt
b4b0d901d9 Merge branch 'randr-1.2' 
Conflicts:

	dix/events.c
	dix/getevents.c
	hw/xfree86/common/xf86Mode.c
	hw/xfree86/dri/Makefile.am
	hw/xfree86/os-support/drm/xf86drm.c
	hw/xfree86/os-support/xf86drm.h
 2006-11-27 15:43:15 -08:00
Aaron Plattner
64de3baf85 Add a -showDefaultLibPath option. 
A corollary to the previous change, this option prints $libdir.
 2006-11-22 14:46:51 -08:00
Jeremy C. Reed
2eab230d9b For NetBSD, define PCVT_SUPPORT (System has PCVT console). 
Noticed by Joerg Sonnenberger.  This fixes problem with console
switching.

This was in original imake NetBSD.cf.
 2006-11-14 16:37:18 -06:00
Adam Jackson
f80a8ae6e6 Disable Xprt server build by default. 2006-11-13 18:26:05 -05:00
George Sapountzis
5bfe7f4dfc DRI: call drmSetServerInfo() before drmOpen(). 
Also, remove some libdrm remnants.
 2006-11-13 01:54:32 +02:00
Dave Airlie
fd91630b73 make X server use system libdrm - this requires libdrm >= 2.3.0 
This patch blacklists the load "drm" line, moves some functions in dri module
links dri module against libdrm, and removes the X copy of libdrm
 2006-11-09 09:30:33 +11:00
Daniel Stone
b0a7443ca8 configure.ac: axe redundant SDL test 2006-11-08 15:30:03 +02:00
Keith Packard
028bbdc041 Merge master back to randr-1.2 2006-11-04 17:46:26 -08:00
Keith Packard
8b87ce1974 Allow X server to build against libdrm 2.1 2006-11-04 17:41:25 -08:00
Samuel Thibault
412e93349e kdrive: make building of Linux support conditional (bug #5613) 
Only try to build Linux support on Linux.  We should probably disable all
OS-dependent DDXes if we don't have a workable OS (and only build
Xephyr/Xfake), but that's future work.
 2006-11-04 19:08:23 +02:00
Alan Coopersmith
49a26681b2 Add DTrace probe points for X server <-> client communications 
See http://people.freedesktop.org/~alanc/dtrace/ for more details
 2006-11-03 12:54:43 -08:00
Keith Packard
543b397277 Merge branch 'origin' into randr-1.2 2006-11-02 19:00:35 -08:00
Daniel Stone
64139c1950 bump to 1.2.99.0 2006-11-02 03:22:09 +02:00
Daniel Stone
be291a6d97 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-11-02 03:15:25 +02:00
Alan Coopersmith
40f84793bc Propogate $LIBS for xtrans, clock_gettime, libm, etc. to libs used for each server 2006-11-01 14:34:46 -08:00
Daniel Stone
d7d931abe0 configure.ac: remove check for rate/period 
Keyboard stuff is now handled in the kbd driver.
 2006-11-01 23:48:58 +02:00
Thomas Hellstrom
06b6b971d0 Make sure we have 64-bit file-offsets in libdrm. 2006-10-29 15:22:37 +01:00
Thomas Hellstrom
92d04e746b Import libdrm functions for the drm memory manager. 2006-10-27 18:26:30 +02:00
Daniel Stone
004d00e668 GetTimeInMillis: simplify monotonic test 
We don't actually need to get the CPU clock ID, which means we don't need
the monotonic_usable test.  Since there's now only one branch, the
compiler will treat that as likely, so we don't need xproto 7.0.9 anymore.

The fallthrough to gettimeofday() is preserved.
 2006-10-26 01:10:08 +03:00
Daniel Stone
cdc8a4b7b2 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-10-26 00:28:30 +03:00
Daniel Stone
d285833290 GetTimeInMillis: spuport monotonic clock 
Add support for CLOCK_MONOTONIC from clock_gettime, and use that in
GetTimeInMillis() if available, falling back to the old gettimeofday()
implementation.

This is _slightly_ faster on some 64-bit architectures, and _slightly_
slower on others (though barely measurable).
 2006-10-25 23:57:00 +03:00
Keith Packard
59511974db Merge branch 'master' into randr-1.2 2006-10-24 17:26:20 -07:00
Ian Romanick
8b90913566 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86.h
	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/os-support/bus/linuxPci.c
	hw/xfree86/scanpci/extrapci.ids
	hw/xfree86/scanpci/pci.ids
	hw/xfree86/scanpci/pciid2c.pl
	hw/xfree86/scanpci/xf86PciStdIds.h
 2006-10-24 08:57:59 -07:00
Daniel Stone
29f28dd1a8 configure.ac: add XSERVER_LIBS to XNEST_LIBS 2006-10-23 02:52:52 +03:00
Joshua Baergen
c5dc997baf Create xorg.conf.example (Gentoo bug #138623). 2006-10-20 00:43:10 +03:00
Alan Coopersmith
d029c8f1b7 Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris 2006-10-20 00:43:10 +03:00
Adam Jackson
80642f37d4 Stop building xorgcfg by default. 2006-10-20 00:43:09 +03:00
Joshua Baergen
62d2409793 Create xorg.conf.example (Gentoo bug #138623). 2006-10-19 11:14:26 -07:00
Alan Coopersmith
357b37b382 Use getisax() instead of asm code to determine available x86 ISA extensions on Solaris 2006-10-18 18:11:06 -07:00
Adam Jackson
5eca750fe2 Stop building xorgcfg by default. 2006-10-17 14:53:28 -04:00
Daniel Stone
335b503c5e Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-10-13 18:10:45 +03:00
Alan Coopersmith
6776c0f0e9 Use bash on Solaris to run symlink-mesa.sh 
symlink-mesa.sh won't run with Solaris Bourne Shell (/bin/sh) so explicitly
run it with /usr/bin/bash instead
(cherry picked from cde6872886 commit)
 2006-10-09 17:25:10 -07:00
Daniel Stone
9e37de193f configure.ac: reactivate warnings when building with gcc 
We were inadvertently stomping XSERVER_CFLAGS after adding the warnings, so
move them after we do that.
 2006-10-08 16:32:15 +03:00
Alan Coopersmith
4c34224630 Merge branch 'XACE-modular' 2006-10-06 18:01:13 -07:00
Keith Packard
b4659faf9b Merge branch 'master' into randr-1.2 2006-10-04 14:46:04 -07:00
Daniel Stone
a5d639cd87 remove merge detritus 2006-09-27 16:15:27 +03:00
Daniel Stone
ad321fad4b Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-09-24 17:56:43 +03:00
David Nusinow
a10039a100 Allow the xfree86 ddx utils to be optionally built. Patch by Eugene Konev. 2006-09-21 23:58:32 -04:00
Keith Packard
2be1ac15ae Remove smashing of CFLAGS from server build. 
CFLAGS is a user variable, extracted from the environment at configure time
and settable by the user at build time. We must not override this variable.
 2006-09-18 12:11:18 -07:00
Daniel Stone
5e9d33fe87 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-09-07 15:43:31 +03: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
Daniel Stone
4524a2bf6f configure.ac: move tslib from KDRIVE_PURE_LIBS to KDRIVE_LIBS 
Yeah.  That was dumb.
 2006-08-29 23:49:26 +03:00
Daniel Stone
260c3f32b6 configure.ac: fix XSDL test 2006-08-29 23:18:12 +03:00
Daniel Stone
cff23616fe configure.ac: allow disabling of XSDL 2006-08-29 22:44:09 +03:00
Ian Romanick
21291d6ca7 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-08-25 09:34:21 -07:00
Daniel Stone
5fb8d947bb configure.ac: more thinkos 
Fix auto tests for vidmode and xf86dga.  I win at life.
 2006-08-24 23:16:43 +03:00
Daniel Stone
866ca1f929 configure.ac: fix XF86VidMode test 2006-08-24 15:46:44 +03:00
Alan Coopersmith
05541259bd Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into XACE-modular 2006-08-21 13:07:41 -07:00
Daniel Stone
a56b98bb04 dix: enable null root cursor 
Enable a blank root cursor, selectable with --enable-null-root-cursor at
configure time.
 2006-08-18 18:10:09 +03:00
Daniel Stone
d6433be3cc Merge branch 'master' into input-hotplug 2006-08-12 21:50:52 +03:00
Samuel Thibault
e641000b98 xfree86: add Hurd support (#5613) 
Add support for GNU/Hurd.
 2006-08-12 19:41:59 +03:00
Daniel Stone
5a3488ccac configure.ac: fix execinfo.h test (Debian #363218) 
Define HAVE_EXECINFO_H as well as HAVE_BACKTRACE, when we find execinfo.h.
 2006-08-12 19:25:06 +03: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
9525c2709e configure.ac: fix xephyr conditionals 
Fix Xephyr build conditions, allowing it to actually be disabled.
 2006-08-10 20:29:57 +03:00
Daniel Stone
6d8d4abaaa configure.ac: allow conditional building of XF86{DGA,Misc,VidMode} 
Allow conditional building of the above three extensions, defaulting to
auto.
 2006-08-10 20:28:06 +03:00
Daniel Stone
c85e64cba1 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-08-07 15:54:55 +03:00
Ian Romanick
69533fc04f Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/Makefile.am
	hw/xfree86/common/xf86AutoConfig.c
 2006-07-31 09:26:04 -07:00
Daniel Stone
ed0c807de9 bump to 1.1.99.3 2006-07-30 11:08:54 +03:00
Daniel Stone
87fe85f38b Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-30 10:51:34 +03:00
Adam Jackson
990a400905 Remove getconfig horrorshow. Replace with a static built-in rule list for now. 2006-07-26 19:03:39 -04:00
Ian Romanick
28ba8d5691 Gut anything having to do with the PciBusPtr (or PciBusRec) type. 
Bump required version of libpciaccess to 0.5.0 so that
pci_device_get_bridge_buses can be used.
 2006-07-25 15:38:09 -07:00
Ian Romanick
380b51d605 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86Init.c
	hw/xfree86/int10/pci.c
	hw/xfree86/scanpci/xf86PciData.h
	hw/xfree86/scanpci/xf86PciStdIds.h
	hw/xfree86/scanpci/xf86PciStr.h
	hw/xfree86/scanpci/xf86ScanPci.h
	hw/xfree86/utils/pcitweak/pcitweak.c
	hw/xfree86/utils/scanpci/scanpci.c

Re-removed most of the conflicting files.
 2006-07-25 11:30:04 -07:00
Daniel Stone
87a6346bf7 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 2006-07-21 19:36:25 -04:00
Daniel Stone
0486d3966d fix kbproto dependency 
Depend on kbproto >= 1.0.3, for unconditional definition of
XkbSA_XFree86Private.
 2006-07-21 19:35:04 -04:00
Ian Romanick
07ad92d2c4 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 
Conflicts:

	hw/xfree86/common/xf86DoScanPci.c
	hw/xfree86/common/xf86Init.c
	hw/xfree86/common/xf86pciBus.c
 2006-07-21 15:25:35 -07:00
Kristian Høgsberg
3eeb62e8f5 bug #890: completely remove deprecated keyboard driver 
Remove all remnants of the old built-in keyboard driver.
 2006-07-21 16:33:28 -04:00
Daniel Stone
ecfad74c48 add support for built-in fonts 
Use --enable-builtin-fonts to only use built-in fonts, and avoid loading
fonts.
 2006-07-21 15:19:52 -04:00
Daniel Stone
3a23e49901 make XInput mandatory 
Always build Xi, since GetPointerEvents/GetKeyboardEvents relies on it.
 2006-07-21 15:19:51 -04:00
Daniel Stone
02d0910511 new KDrive input world order 
Convert KDrive to GPE/GKE interface.
Add first-class drivers and enumerate every device separately through
Xi, instead of lamely attempting to aggregate them.
Add XKB support to the Linux keyboard driver.
Add 'thumb button' support to the tslib driver.
Rejig InitInput, so each DDX has to add a list of drivers it supports.
Support NewInputDeviceRequest, et al.
 2006-07-21 15:19:51 -04:00
Daniel Stone
02a9531156 add basic D-BUS configuration mechanism 
Also move LookupDeviceIntRec into the DIX, and add InputOption type, and
NewInputDeviceRequest prototype (DIX requests DDX to add a device).  Does not
link without an implemented NIDR.
 2006-07-21 15:19:49 -04:00
Daniel Stone
00b24f119f fix minor typo 2006-07-21 15:16:58 -04: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
Ian Romanick
12595a77d6 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-13 12:48:03 -07:00
Gustavo Pichorim Boiko
10f3e32726 Fix the configure check for the --{enable,disable}-dpms option 2006-07-10 16:37:53 -07:00
Tilman Sauerbeck
39b2f7b218 Bug #3042: Use autoconf to get the correct name of a struct member. 
This allows us to remove the kernel version ifdefs from the code, which
are ugly and broken.
 2006-07-08 19:55:53 +02:00
Keith Packard
f847f3c0a9 xorgcfg now needs libxkbui version 1.0.2 or better. 
Old versions of libxkbui use XkbStrCaseCmp which doesn't exist any longer;
the server fails to link with that version of the libkbui library, so
require the current version (1.0.2).
 2006-07-06 15:33:31 -07:00
Keith Packard
27ffd7e03c GL proto version 1.4.7 needed for texture-from-pixmap defines. 
GLX_TEXTURE_TARGET_EXT and GLX_TEXTURE_RECTANGLE_EXT are defined as a part
of the new texture from pixmap GL extension in gl proto version 1.4.7 and
are now used by the X server code.
 2006-07-06 14:43:10 -07:00
Ian Romanick
fd49a0dcc1 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-06 09:52:15 -07:00
Kristian Høgsberg
28b95fd9d1 Drop unused GL/include subtree. 
Woo, less Makefile's to generate.
 2006-07-06 03:25:38 -04:00
Ian Romanick
e66e7b48e1 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-07-05 15:21:36 -07:00
Eric Anholt
a838fb70c5 Bump server version to 7.1.99.2 for gradient and repeat fixes. 2006-07-03 19:24:01 +02:00
Ian Romanick
66cac9b174 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 2006-06-28 14:11:49 -07:00
Eric Anholt
adfe8e7437 Bump server release to 7.1.99.1. 
This will be important for a couple of cairo workaround tests.
 2006-06-27 21:49:00 +02:00
Ian Romanick
9d0a15dca5 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 
Conflicts:

	hw/xfree86/loader/xf86sym.c
 2006-06-22 16:21:10 -07:00
Ian Romanick
6c514ca14c Use XSERVER_LIBS instead of XORG_LIBS for -lpciaccess. The former is 
only for libraries that are built as part of the xserver build.
 2006-06-22 15:51:16 -07:00
Adam Jackson
bf17c6dede Drop libz from the server's link line, it was only needed for LBX. 2006-06-22 12:24:09 -04:00
Alan Coopersmith
3f19803e0b APPGROUP requires both X-ACE & XC-SECURITY now 2006-06-21 18:05:51 -07:00
Ian Romanick
aa131c51e0 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 2006-06-21 14:39:52 -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
481d4012e7 Don't add -ldl to XORG_LIBS if it's not needed for dlopen 2006-06-20 16:16:19 -07:00
Ian Romanick
75398cff82 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver 
Conflicts:

	hw/xfree86/loader/Makefile.am
	hw/xfree86/loader/xf86sym.c
 2006-06-20 15:49:47 -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
71fbda8049 Xprint/ -> hw/xprint 
XpConfig -> hw/xprint/config
 2006-06-18 21:07:28 -04:00
Ian Romanick
46f55f5dea Initial batch of changes for PCI rework. All future changes will be 
tracked individually.
 2006-06-07 14:09:02 -07:00
Daniel Stone
ddc6b99505 Bump to 1.1.99.2. 2006-06-03 11:24:33 +00:00
Daniel Stone
8e8c6faecd Add support for kFreeBSD systems. (Robert Millan, Aurelien Jarno) 2006-06-03 10:48:37 +00:00
Daniel Stone
a9ed5a8790 Kill LBX, too. 2006-06-01 22:06:41 +00:00
Daniel Stone
6d594ebc66 Ditch more alternate-loader braindamage. 2006-06-01 20:22:39 +00:00
Jeremy C. Reed
9477e5e0be On NetBSD, add -li386 for i386 and -lx86_64 for x86_64 to SYS_LIBS. (x86_64 
on NetBSD not tested.)
 2006-05-24 22:43:13 +00:00
Alan Coopersmith
eb696f72a0 Add AC_SUBST([SOLARIS_ASM_CFLAGS]) that I forgot when splitting them out of 
the XORG_CFLAGS.
 2006-05-23 16:17:09 +00:00
Adam Jackson
321dbed5f5 Bug #5209: Fix APM/ACPI support, again. (Michel Dänzer, Valery Inozemtsev) 2006-05-15 18:27:18 +00:00
Matthieu Herrb
dd38d3bd67 Don't use AM_CONDITIONAL inside shell conditionals. Bugzilla #6916. 2006-05-14 16:22:24 +00:00