1 |
remi 09/03/03 16:28:32 |
2 |
|
3 |
Modified: x-modular.eclass |
4 |
Log: |
5 |
update the DRI checking code to new USE flags in xorg-server 1.5.3 (fixes bug #252084) |
6 |
|
7 |
Revision Changes Path |
8 |
1.107 eclass/x-modular.eclass |
9 |
|
10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.107&view=markup |
11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?rev=1.107&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/x-modular.eclass?r1=1.106&r2=1.107 |
13 |
|
14 |
Index: x-modular.eclass |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v |
17 |
retrieving revision 1.106 |
18 |
retrieving revision 1.107 |
19 |
diff -u -r1.106 -r1.107 |
20 |
--- x-modular.eclass 3 Mar 2009 16:26:20 -0000 1.106 |
21 |
+++ x-modular.eclass 3 Mar 2009 16:28:32 -0000 1.107 |
22 |
@@ -1,6 +1,6 @@ |
23 |
# Copyright 1999-2005 Gentoo Foundation |
24 |
# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.106 2009/03/03 16:26:20 remi Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/x-modular.eclass,v 1.107 2009/03/03 16:28:32 remi Exp $ |
27 |
# |
28 |
# @ECLASS: x-modular.eclass |
29 |
# @MAINTAINER: |
30 |
@@ -192,11 +192,19 @@ |
31 |
x-modular_dri_check() { |
32 |
# (#120057) Enabling DRI in drivers requires that the server was built with |
33 |
# support for it |
34 |
+ # Starting with xorg-server 1.5.3, DRI support is always enabled unless |
35 |
+ # USE=minimal is set (see bug #252084) |
36 |
if [[ -n "${DRIVER}" ]]; then |
37 |
if has dri ${IUSE} && use dri; then |
38 |
einfo "Checking for direct rendering capabilities ..." |
39 |
- if ! built_with_use --missing true x11-base/xorg-server dri; then |
40 |
- die "You must build x11-base/xorg-server with USE=dri." |
41 |
+ if has_version '>=x11-base/xorg-server-1.5.3'; then |
42 |
+ if built_with_use x11-base/xorg-server minimal; then |
43 |
+ die "You must build x11-base/xorg-server with USE=-minimal." |
44 |
+ fi |
45 |
+ else |
46 |
+ if ! built_with_use x11-base/xorg-server dri; then |
47 |
+ die "You must build x11-base/xorg-server with USE=dri." |
48 |
+ fi |
49 |
fi |
50 |
fi |
51 |
fi |