Gentoo Archives: gentoo-commits

From: "Chi-Thanh Christopher Nguyen (chithanh)" <chithanh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-drivers/xf86-video-dummy/files: xf86-video-dummy-0.3.5-dga-support.patch
Date: Sun, 08 Jul 2012 15:14:08
Message-Id: 20120708151358.72A1220065@flycatcher.gentoo.org
1 chithanh 12/07/08 15:13:58
2
3 Added: xf86-video-dummy-0.3.5-dga-support.patch
4 Log:
5 Add patch to fix dga failure, bug #425322.
6
7 (Portage version: 2.2.0_alpha115/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch?rev=1.1&content-type=text/plain
14
15 Index: xf86-video-dummy-0.3.5-dga-support.patch
16 ===================================================================
17 From 02918fd53434a23a72fe878a90f4ec48ef0e0416 Mon Sep 17 00:00:00 2001
18 From: Jeremy Huddleston <jeremyhu@×××××.com>
19 Date: Mon, 09 Jan 2012 09:00:40 +0000
20 Subject: Don't use XFreeXDGA to determine DGA support
21
22 If our server supports DGA and we want to build the dummy driver without it,
23 XFreeXDGA will be defined by the server and will be picked up rather than
24 our configuration option. This change forces us to honor our configuration
25 hoice.
26
27 Signed-off-by: Jeremy Huddleston <jeremyhu@×××××.com>
28 ---
29 diff --git a/configure.ac b/configure.ac
30 index d92e22a..6861485 100644
31 --- a/configure.ac
32 +++ b/configure.ac
33 @@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
34
35 if test "x$DGA" = xyes; then
36 XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
37 - AC_DEFINE(XFreeXDGA, 1, [Support DGA extension])
38 + AC_DEFINE(USE_DGA, 1, [Support DGA extension])
39 fi
40 AC_SUBST([DGA])
41 AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
42 diff --git a/src/dummy_driver.c b/src/dummy_driver.c
43 index 041ca96..6533b27 100644
44 --- a/src/dummy_driver.c
45 +++ b/src/dummy_driver.c
46 @@ -45,7 +45,7 @@
47 #include <X11/Xproto.h>
48 #include "scrnintstr.h"
49 #include "servermd.h"
50 -#ifdef XFreeXDGA
51 +#ifdef USE_DGA
52 #define _XF86DGA_SERVER_
53 #include <X11/extensions/xf86dgaproto.h>
54 #endif
55 @@ -592,7 +592,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
56
57 xf86SetBlackWhitePixels(pScreen);
58
59 -#ifdef XFreeXDGA
60 +#ifdef USE_DGA
61 DUMMYDGAInit(pScreen);
62 #endif
63
64 --
65 cgit v0.9.0.2-2-gbebe