Commit Graph

415 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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