Commit Graph

484 Commits

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