xserver: Branch 'master' - 4 commits
Tiago Vignatti
vignatti at kemper.freedesktop.org
Fri Jul 10 06:39:19 PDT 2009
configure.ac | 10 +++++++++-
hw/xfree86/Makefile.am | 16 ++++++++++++++--
hw/xfree86/common/xf86ShowOpts.c | 1 -
3 files changed, 23 insertions(+), 4 deletions(-)
New commits:
commit 2638e9899e57d9b25a2cade3247083a6e101dee2
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Fri Jul 10 16:09:08 2009 +0300
configure: introduce --{enable,disable}-int10-module
Not all chipsets need to rely on the int10 scheme to do its daily work.
Well, the ideal would be to remove all int10 module from the server. I'll try
to provide some patches "soon" for this. Something like:
http://cgit.freedesktop.org/~vignatti/libx86/
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden at nokia.com>
diff --git a/configure.ac b/configure.ac
index 07bb05a..a2e0080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -585,6 +585,7 @@ AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build
AC_ARG_ENABLE(xaa, AS_HELP_STRING([--enable-xaa], [Build XAA (default: enabled)]), [XAA=$enableval], [XAA=yes])
AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
AC_ARG_ENABLE(vbe, AS_HELP_STRING([--enable-vbe], [Build Xorg with VBE module (default: enabled)]), [VBE=$enableval], [VBE=yes])
+AC_ARG_ENABLE(int10-module, AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -1027,6 +1028,7 @@ AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
AM_CONDITIONAL(VBE, test "x$VBE" = xyes)
+AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 6154d7f..957cb17 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -24,9 +24,13 @@ if VBE
VBE_SUBDIR = vbe
endif
+if INT10MODULE
+INT10_SUBDIR = int10
+endif
+
DOC_SUBDIR = doc
-SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support parser \
+SUBDIRS = common ddc i2c x86emu $(INT10MODULE) fbdevhw os-support parser \
ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
xf8_16bpp loader dixmods exa modes \
$(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
commit 42d95a38535f382bfb2ddfaef93839ab9bbf584f
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Fri Jul 10 15:54:07 2009 +0300
configure: introduce --{enable,disable}-vbe
Not all drivers need this kind of access as well.
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden at nokia.com>
diff --git a/configure.ac b/configure.ac
index c81874b..07bb05a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -584,6 +584,7 @@ AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL
AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
AC_ARG_ENABLE(xaa, AS_HELP_STRING([--enable-xaa], [Build XAA (default: enabled)]), [XAA=$enableval], [XAA=yes])
AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
+AC_ARG_ENABLE(vbe, AS_HELP_STRING([--enable-vbe], [Build Xorg with VBE module (default: enabled)]), [VBE=$enableval], [VBE=yes])
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -1025,6 +1026,7 @@ XI_INC='-I$(top_srcdir)/Xi'
AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
+AM_CONDITIONAL(VBE, test "x$VBE" = xyes)
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index df311b4..6154d7f 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -20,10 +20,14 @@ if VGAHW
VGAHW_SUBDIR = vgahw
endif
+if VBE
+VBE_SUBDIR = vbe
+endif
+
DOC_SUBDIR = doc
SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support parser \
- ramdac shadowfb vbe $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
+ ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
xf8_16bpp loader dixmods exa modes \
$(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
commit 53d64930513fecaa417bb5a922966b45c9ff8679
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Fri Jul 10 15:38:51 2009 +0300
configure: introduce --{enable,disable}-vgahw
Not all drivers need this kind of access.
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden at nokia.com>
diff --git a/configure.ac b/configure.ac
index 65a17de..c81874b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -583,6 +583,7 @@ AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build D-BU
AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes])
AC_ARG_ENABLE(xaa, AS_HELP_STRING([--enable-xaa], [Build XAA (default: enabled)]), [XAA=$enableval], [XAA=yes])
+AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -1023,6 +1024,7 @@ XI_INC='-I$(top_srcdir)/Xi'
AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
+AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
@@ -1557,7 +1559,6 @@ if test "x$XORG" = xyes; then
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
- AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
@@ -1565,6 +1566,9 @@ if test "x$XORG" = xyes; then
AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])
+ if test "x$VGAHW" = xyes; then
+ AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
+ fi
driverdir="$moduledir/drivers"
AC_SUBST([moduledir])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index eb487f6..df311b4 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -16,10 +16,14 @@ if XAA
XAA_SUBDIR = xaa
endif
+if VGAHW
+VGAHW_SUBDIR = vgahw
+endif
+
DOC_SUBDIR = doc
SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support parser \
- ramdac shadowfb vbe vgahw $(XAA_SUBDIR) \
+ ramdac shadowfb vbe $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
xf8_16bpp loader dixmods exa modes \
$(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
commit aafcae79d17c1f802bc880d2142af7171fed75d8
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date: Fri Jul 10 14:56:31 2009 +0300
xfree86: remove unused vbe header file
Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden at nokia.com>
diff --git a/hw/xfree86/common/xf86ShowOpts.c b/hw/xfree86/common/xf86ShowOpts.c
index 622e261..04a9a8b 100644
--- a/hw/xfree86/common/xf86ShowOpts.c
+++ b/hw/xfree86/common/xf86ShowOpts.c
@@ -45,7 +45,6 @@
#include "xf86Parser.h"
#include "xf86tokens.h"
#include "Configint.h"
-#include "vbe.h"
#include "xf86DDC.h"
#if defined(__sparc__) && !defined(__OpenBSD__)
#include "xf86Bus.h"
More information about the xorg-commit
mailing list