xserver: Branch 'master' - 3 commits
David Nusinow
gravity at kemper.freedesktop.org
Mon May 28 18:59:49 PDT 2007
Xext/Makefile.am | 1 -
configure.ac | 4 ++++
hw/kdrive/linux/agp.c | 2 +-
hw/xfree86/common/compiler.h | 2 +-
hw/xfree86/os-support/linux/lnx_video.c | 2 +-
5 files changed, 7 insertions(+), 4 deletions(-)
New commits:
diff-tree ba0b7d47ab0c24d5a29228f8af583044060464bd (from 2267bf48b385c93243e26c3bb84ebb04c7fdb39f)
Author: David Nusinow <dnusinow at debian.org>
Date: Mon May 28 21:57:04 2007 -0400
Fix for GNU/kFreeBSD
diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c
index c2ae625..4fb0cb3 100644
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@@ -65,7 +65,7 @@ of the copyright holder.
#include <linux/agpgart.h>
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
#include <sys/ioctl.h>
#include <sys/agpio.h>
#endif
diff-tree 2267bf48b385c93243e26c3bb84ebb04c7fdb39f (from 857ddbb660a21cad1c16f4fb2dc8a904d6655304)
Author: Bastian Blank <waldi at debian.org>
Date: Mon May 28 21:55:05 2007 -0400
Fixes for s390
diff --git a/hw/xfree86/common/compiler.h b/hw/xfree86/common/compiler.h
index ea995ed..becd3da 100644
--- a/hw/xfree86/common/compiler.h
+++ b/hw/xfree86/common/compiler.h
@@ -1365,7 +1365,7 @@ do { \
# define write_mem_barrier() /* NOP */
# if !defined(__SUNPRO_C)
-# if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__)
+# if !defined(FAKEIT) && !defined(__mc68000__) && !defined(__arm__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__)
# ifdef GCCUSESGAS
/*
diff --git a/hw/xfree86/os-support/linux/lnx_video.c b/hw/xfree86/os-support/linux/lnx_video.c
index 4b58046..02a1310 100644
--- a/hw/xfree86/os-support/linux/lnx_video.c
+++ b/hw/xfree86/os-support/linux/lnx_video.c
@@ -567,7 +567,7 @@ xf86EnableIO(void)
#endif
}
close(fd);
-#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__)
+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__)
if (ioperm(0, 1024, 1) || iopl(3)) {
if (errno == ENODEV)
ErrorF("xf86EnableIOPorts: no I/O ports found\n");
diff-tree 857ddbb660a21cad1c16f4fb2dc8a904d6655304 (from 78d01d1008973899d931ef44b47d5f0b5f220b0d)
Author: Eugene Konev <ejka at imfi.kspu.ru>
Date: Mon May 28 21:53:02 2007 -0400
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.
diff --git a/Xext/Makefile.am b/Xext/Makefile.am
index 6ea3d74..d0d23b7 100644
--- a/Xext/Makefile.am
+++ b/Xext/Makefile.am
@@ -34,7 +34,6 @@ MODULE_SRCS = \
xcmisc.c
# Extra configuration files ship with some extensions
-SERVERCONFIGdir = $(libdir)/xserver
SERVERCONFIG_DATA =
# Optional sources included if extension enabled by configure.ac rules
diff --git a/configure.ac b/configure.ac
index 37199cf..7ff712f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -465,6 +465,9 @@ AC_ARG_WITH(xkb-output, AS_HELP_ST
AC_ARG_WITH(rgb-path, AS_HELP_STRING([--with-rgb-path=PATH], [Path to RGB database (default: ${datadir}/X11/rgb)]),
[ RGBPATH="$withval" ],
[ RGBPATH="${datadir}/X11/rgb" ])
+AC_ARG_WITH(serverconfig-path, AS_HELP_STRING([--with-serverconfig-path=PATH], [Path to server config (default: ${libdir}/xserver)]),
+ [ SERVERCONFIG="$withval" ],
+ [ SERVERCONFIG="${libdir}/xserver" ])
APPLE_APPLICATIONS_DIR="${bindir}/Applications"
AC_ARG_WITH(apple-applications-dir,AS_HELP_STRING([--with-apple-applications-dir=PATH], [Path to the Applications directory (default: ${bindir}/Applications)]),
[ APPLE_APPLICATIONS_DIR="${withval}" ].
@@ -938,6 +941,7 @@ VENDOR_MAN_VERSION="Version ${VENDOR_VER
AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
+AC_DEFINE_DIR(SERVERCONFIGdir, SERVERCONFIG, [Server config path])
AC_DEFINE_DIR(BASE_FONT_PATH, FONTDIR, [Default base font path])
AC_DEFINE_DIR(DRI_DRIVER_PATH, DRI_DRIVER_PATH, [Default DRI driver path])
AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
More information about the xorg-commit
mailing list