xserver: Branch 'master' - 5 commits
Peter Hutterer
whot at kemper.freedesktop.org
Thu Sep 3 19:52:57 PDT 2009
configure.ac | 4 ++--
hw/xfree86/common/xf86Bus.c | 4 +++-
hw/xfree86/common/xf86DGA.c | 2 +-
hw/xfree86/common/xf86cmap.c | 3 +--
hw/xfree86/dixmods/extmod/modinit.h | 3 +--
hw/xfree86/dixmods/extmod/xf86vmode.c | 3 +--
hw/xfree86/vgahw/vgaCmap.c | 3 +--
os/backtrace.c | 2 ++
os/io.c | 2 +-
9 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 6fb01c8286c16968fd07e4a5b78da89cd8768d79
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Sep 4 10:57:33 2009 +1000
require xf86vidmodeproto 2.2.99.1 or newer.
diff --git a/configure.ac b/configure.ac
index 097e780..181a861 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1523,11 +1523,11 @@ if test "x$XORG" = xyes; then
fi
if test "x$XF86VIDMODE" = xauto; then
- PKG_CHECK_MODULES(XF86VIDMODE, xf86vidmodeproto, [XF86VIDMODE=yes], [XF86VIDMODE=no])
+ PKG_CHECK_MODULES(XF86VIDMODE, [xf86vidmodeproto >= 2.2.99.1], [XF86VIDMODE=yes], [XF86VIDMODE=no])
fi
if test "x$XF86VIDMODE" = xyes; then
XORG_MODULES="$XORG_MODULES xf86vidmodeproto"
- PKG_CHECK_MODULES(XF86VIDMODE, xf86vidmodeproto)
+ PKG_CHECK_MODULES(XF86VIDMODE, [xf86vidmodeproto >= 2.2.99.1])
AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension])
fi
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
index 2292175..6210526 100644
--- a/hw/xfree86/dixmods/extmod/modinit.h
+++ b/hw/xfree86/dixmods/extmod/modinit.h
@@ -30,8 +30,7 @@ extern void ScreenSaverExtensionInit (INITARGS);
#ifdef XF86VIDMODE
extern void XFree86VidModeExtensionInit(INITARGS);
-#define _XF86VIDMODE_SERVER_
-#include <X11/extensions/xf86vmstr.h>
+#include <X11/extensions/xf86vmproto.h>
#endif
#ifdef XFreeXDGA
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 2e82f33..4a288d7 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -41,8 +41,7 @@ from Kaleb S. KEITHLEY
#include "extnsionst.h"
#include "scrnintstr.h"
#include "servermd.h"
-#define _XF86VIDMODE_SERVER_
-#include <X11/extensions/xf86vmstr.h>
+#include <X11/extensions/xf86vmproto.h>
#include "swaprep.h"
#include "xf86.h"
#include "vidmodeproc.h"
commit 2122fedb2c058dc27f9df0e856d2193fabe725e2
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Sep 4 11:37:58 2009 +1000
os: silence bigreqsproto compiler warning
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/os/io.c b/os/io.c
index 53b37b7..64b64ae 100644
--- a/os/io.c
+++ b/os/io.c
@@ -105,7 +105,7 @@ static OsCommPtr AvailableInput = (OsCommPtr)NULL;
#define get_req_len(req,cli) ((cli)->swapped ? \
lswaps((req)->length) : (req)->length)
-#include <X11/extensions/bigreqstr.h>
+#include <X11/extensions/bigreqsproto.h>
#define get_big_req_len(req,cli) ((cli)->swapped ? \
lswapl(((xBigReq *)(req))->length) : \
commit 59e731ef66095723e74a16b2e5548aed627089ff
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Sep 4 11:06:37 2009 +1000
xfree86: silence some xf86dgaproto compiler warnings
We already require xf86dgaproto > 2.0.99 since 6fffcd582
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/common/xf86DGA.c b/hw/xfree86/common/xf86DGA.c
index 4509541..8328f58 100644
--- a/hw/xfree86/common/xf86DGA.c
+++ b/hw/xfree86/common/xf86DGA.c
@@ -35,7 +35,7 @@
#include "xf86str.h"
#include "xf86Priv.h"
#include "dgaproc.h"
-#include <X11/extensions/xf86dgastr.h>
+#include <X11/extensions/xf86dgaproto.h>
#include "colormapst.h"
#include "pixmapstr.h"
#include "inputstr.h"
diff --git a/hw/xfree86/common/xf86cmap.c b/hw/xfree86/common/xf86cmap.c
index 7990c74..36e6f96 100644
--- a/hw/xfree86/common/xf86cmap.c
+++ b/hw/xfree86/common/xf86cmap.c
@@ -52,8 +52,7 @@
#include "xf86Crtc.h"
#ifdef XFreeXDGA
-#define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dgastr.h>
+#include <X11/extensions/xf86dgaproto.h>
#include "dgaproc.h"
#endif
diff --git a/hw/xfree86/vgahw/vgaCmap.c b/hw/xfree86/vgahw/vgaCmap.c
index 095e480..5bd38b4 100644
--- a/hw/xfree86/vgahw/vgaCmap.c
+++ b/hw/xfree86/vgahw/vgaCmap.c
@@ -36,8 +36,7 @@
#include "xf86.h"
#include "vgaHW.h"
-#define _XF86DGA_SERVER_
-#include <X11/extensions/xf86dgastr.h>
+#include <X11/extensions/xf86dgaproto.h>
#include "dgaproc.h"
commit ead57a13531aa14033839112fa66e33e142f67da
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Sep 4 11:03:55 2009 +1000
xfree86: silence 'unused variable' compiler warning
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index e0d9804..f0a0723 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -521,8 +521,9 @@ xf86PostProbe(void)
void
xf86PostScreenInit(void)
{
- int i;
+#ifdef HAVE_PCI_DEVICE_VGAARB_INIT
int vga_count;
+#endif
if (doFramebufferMode) {
SetSIGIOForState(OPERATING);
return;
@@ -535,6 +536,7 @@ xf86PostScreenInit(void)
#ifdef HAVE_PCI_DEVICE_VGAARB_INIT
pci_device_vgaarb_get_info(NULL, &vga_count, NULL);
if (vga_count > 1 && xf86Screens) {
+ int i;
xf86Msg(X_INFO,"Number of VGA devices: %d: arbiter wrapping enabled\n", vga_count);
for (i = 0; i < xf86NumScreens; i++)
xf86VGAarbiterWrapFunctions(xf86Screens[i]->pScreen);
commit 21f04f008e6b1ab66a63de3de668b1f261a6928a
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri Sep 4 11:01:09 2009 +1000
os: don't redefine GNU_SOURCE
Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/os/backtrace.c b/os/backtrace.c
index a886688..a421140 100644
--- a/os/backtrace.c
+++ b/os/backtrace.c
@@ -29,7 +29,9 @@
#include "misc.h"
#ifdef HAVE_BACKTRACE
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE
+#endif
#include <dlfcn.h>
#include <execinfo.h>
More information about the xorg-commit
mailing list