mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-28 22:57:37 +00:00
56 lines
1.9 KiB
Diff
56 lines
1.9 KiB
Diff
|
From 6fffcd5825454a7fe58ffbcfb219f007cf38e731 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
Date: Thu, 27 Aug 2009 03:43:15 +0000
|
||
|
|
Subject: xfree86: require xf86dgaproto 2.0.99.1.
|
||
|
|
|
||
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||
|
|
---
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index 1ee81f9..378ac66 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -1512,10 +1512,10 @@ if test "x$XORG" = xyes; then
|
||
|
|
XORG_OS_PCI=$XORG_OS
|
||
|
|
fi
|
||
|
|
if test "x$DGA" = xauto; then
|
||
|
|
- PKG_CHECK_MODULES(DGA, xf86dgaproto, [DGA=yes], [DGA=no])
|
||
|
|
+ PKG_CHECK_MODULES(DGA, [xf86dgaproto >= 2.0.99.1], [DGA=yes], [DGA=no])
|
||
|
|
fi
|
||
|
|
if test "x$DGA" = xyes; then
|
||
|
|
- XORG_MODULES="$XORG_MODULES xf86dgaproto"
|
||
|
|
+ XORG_MODULES="$XORG_MODULES [xf86dgaproto >= 2.0.99.1]"
|
||
|
|
PKG_CHECK_MODULES(DGA, xf86dgaproto)
|
||
|
|
AC_DEFINE(DGA, 1, [Support DGA extension])
|
||
|
|
AC_DEFINE(XFreeXDGA, 1, [Build XDGA support])
|
||
|
|
diff --git a/hw/xfree86/dixmods/extmod/modinit.h b/hw/xfree86/dixmods/extmod/modinit.h
|
||
|
|
index ad53408..2292175 100644
|
||
|
|
--- a/hw/xfree86/dixmods/extmod/modinit.h
|
||
|
|
+++ b/hw/xfree86/dixmods/extmod/modinit.h
|
||
|
|
@@ -37,8 +37,7 @@ extern void XFree86VidModeExtensionInit(INITARGS);
|
||
|
|
#ifdef XFreeXDGA
|
||
|
|
extern void XFree86DGAExtensionInit(INITARGS);
|
||
|
|
extern void XFree86DGARegister(INITARGS);
|
||
|
|
-#define _XF86DGA_SERVER_
|
||
|
|
-#include <X11/extensions/xf86dgastr.h>
|
||
|
|
+#include <X11/extensions/xf86dgaproto.h>
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifdef DPMSExtension
|
||
|
|
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
|
||
|
|
index 6286659..7579f7d 100644
|
||
|
|
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
|
||
|
|
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
|
||
|
|
@@ -22,9 +22,7 @@
|
||
|
|
#include "cursorstr.h"
|
||
|
|
#include "scrnintstr.h"
|
||
|
|
#include "servermd.h"
|
||
|
|
-#define _XF86DGA_SERVER_
|
||
|
|
-#include <X11/extensions/xf86dga.h>
|
||
|
|
-#include <X11/extensions/xf86dgastr.h>
|
||
|
|
+#include <X11/extensions/xf86dgaproto.h>
|
||
|
|
#include "swaprep.h"
|
||
|
|
#include "dgaproc.h"
|
||
|
|
#include "xf86dgaext.h"
|
||
|
|
--
|
||
|
|
cgit v0.8.2
|