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
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
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
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
Adam Jackson
86ffb46358
Bug #5209 : Re-enable building APM and ACPI support. (Michel Dänzer)
2006-05-09 18:04:29 +00:00
Alan Coopersmith
b46d6a44fa
Make Xephyr build on Solaris:
...
Add #include <sys/file.h> on Solaris for FNONBLOCK/FASYNC definitions
hw/kdriver/linux/Makefile.am Move agp.c & agp.h to KDRIVE_HW_SOURCES since
they're not needed for Xephyr-only builds
Add -lrt to XEPHYR_LIBS if needed to get nanosleep().
2006-05-03 23:45:16 +00:00
Alan Coopersmith
1e8a594957
Fix Solaris build with Sun compilers to work when exa is built before
...
hw/xfree86/os-support/solaris (as it is by default now).
2006-05-02 01:37:25 +00:00
Adam Jackson
4ae1263669
Remove cfb16, no longer used.
2006-04-06 18:59:11 +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
Adam Jackson
c6b3b3354c
Bump to 1.1.99.1.
2006-04-02 22:51:42 +00:00
Adam Jackson
323fec2029
Reorder link order for Xdmx to fix new screensaver variable reference
...
properly; remove previous awful hack.
2006-04-02 00:46:20 +00:00
Adam Jackson
e5b1d38e14
Disable Xprint freetype support momentarily. Needs ttf2pt1.c, which exists
...
in the monolith but has an advertising clause in the license.
2006-04-01 23:53:33 +00:00
Daniel Stone
1e764feab5
Bug #5801 : Check for MTRR support under Linux. Minor refactoring of MTRR
...
checks for other OSes.
2006-04-01 21:20:31 +00:00
Daniel Stone
978c7b14a1
Make Xprint AC_ARG_ENABLEs and AC_ARG_WITHs unconditional also.
2006-04-01 21:02:40 +00:00
Daniel Stone
71a6f2ef6c
Unconditionally run XP_USE_FREETYPE AM_CONDITIONAL, not only in the Xprint
...
path.
2006-04-01 20:58:42 +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
Daniel Stone
4c317bbc12
Add full FreeType support for Xprint. (Drew Parsons)
2006-03-31 07:21:41 +00:00
Kristian Høgsberg
52d9ce7f4f
Fix another typo.
2006-03-28 21:45:14 +00:00
Kristian Høgsberg
7df64898ea
Fix a couple of typos.
2006-03-28 07:46:04 +00:00
Kristian Høgsberg
a06342eccc
Add --enable-glx-tls ./configure option to enable use of TLS for storing
...
current GL context. Use this option to let AIGLX load DRI drivers
compiled for TLS.
2006-03-28 02:57:07 +00:00
Adam Jackson
77531dfb9f
Silence some editorializing in the configure help text.
2006-03-28 01:22:01 +00:00
Daniel Stone
5be8a66d32
Fix remnants of previous busted _XkbStrCaseCmp commit.
2006-03-27 22:28:32 +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